chamilo / chamilo-lms

main/inc/lib/phpdocx/pdf/include/functions.inc.php

Switch Indentation +10 added lines, -10 removed lines

@@ -273,20 +273,20 @@
   $ret = "";
   switch (mb_strlen($num)) {
 
-  case 4:
-    $ret .= $thou[$num[3]];
+      case 4:
+        $ret .= $thou[$num[3]];
 
-  case 3:
-    $ret .= $hund[$num[2]];
+      case 3:
+        $ret .= $hund[$num[2]];
 
-  case 2:
-    $ret .= $tens[$num[1]];
+      case 2:
+        $ret .= $tens[$num[1]];
 
-  case 1:
-    $ret .= $ones[$num[0]];
+      case 1:
+        $ret .= $ones[$num[0]];
 
-  default:
-    break;
+      default:
+        break;
   }
   return $ret;
 

main/inc/lib/phpdocx/pdf/include/block_frame_decorator.cls.php

Switch Indentation +19 added lines, -19 removed lines

@@ -266,32 +266,32 @@
 
     switch ($type) {
 
-    default:
-    case "decimal":
-      return $this->_counters[$id];
+        default:
+        case "decimal":
+          return $this->_counters[$id];
 
-    case "decimal-leading-zero":
-      return str_pad($this->_counters[$id], 2, "0");
+        case "decimal-leading-zero":
+          return str_pad($this->_counters[$id], 2, "0");
 
-    case "lower-roman":
-      return dec2roman($this->_counters[$id]);
+        case "lower-roman":
+          return dec2roman($this->_counters[$id]);
 
-    case "upper-roman":
-      return mb_strtoupper(dec2roman($this->_counters[$id]));
+        case "upper-roman":
+          return mb_strtoupper(dec2roman($this->_counters[$id]));
 
-    case "lower-latin":
-    case "lower-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('a') - 1);
+        case "lower-latin":
+        case "lower-alpha":
+          return chr( ($this->_counters[$id] % 26) + ord('a') - 1);
 
-    case "upper-latin":
-    case "upper-alpha":
-      return chr( ($this->_counters[$id] % 26) + ord('A') - 1);
+        case "upper-latin":
+        case "upper-alpha":
+          return chr( ($this->_counters[$id] % 26) + ord('A') - 1);
 
-    case "lower-greek":
-      return chr($this->_counters[$id] + 944);
+        case "lower-greek":
+          return chr($this->_counters[$id] + 944);
 
-    case "upper-greek":
-      return chr($this->_counters[$id] + 912);
+        case "upper-greek":
+          return chr($this->_counters[$id] + 912);
     }
   }
 }

main/inc/lib/phpdocx/pdf/include/style.cls.php

Switch Indentation +201 added lines, -201 removed lines

@@ -592,130 +592,130 @@ 
     // Handle colour names
     switch ($colour) {
 
-    case "maroon":
-      $r = 0x80;
-      break;
-
-    case "red":
-      $r = 0xff;
-      break;
-
-    case "orange":
-      $r = 0xff;
-      $g = 0xa5;
-      break;
-
-    case "yellow":
-      $r = 0xff;
-      $g = 0xff;
-      break;
-
-    case "olive":
-      $r = 0x80;
-      $g = 0x80;
-      break;
-
-    case "purple":
-      $r = 0x80;
-      $b = 0x80;
-      break;
-
-    case "fuchsia":
-      $r = 0xff;
-      $b = 0xff;
-      break;
-
-    case "white":
-      $r = $g = $b = 0xff;
-      break;
-
-    case "lime":
-      $g = 0xff;
-      break;
-
-    case "green":
-      $g = 0x80;
-      break;
-
-    case "navy":
-      $b = 0x80;
-      break;
-
-    case "blue":
-      $b = 0xff;
-      break;
-
-    case "aqua":
-      $g = 0xff;
-      $b = 0xff;
-      break;
-
-    case "teal":
-      $g = 0x80;
-      $b = 0x80;
-      break;
-
-    case "black":
-      break;
-
-    case "sliver":
-      $r = $g = $b = 0xc0;
-      break;
-
-    case "gray":
-    case "grey":
-      $r = $g = $b = 0x80;
-      break;
-
-    case "transparent":
-      return "transparent";
+        case "maroon":
+          $r = 0x80;
+          break;
+
+        case "red":
+          $r = 0xff;
+          break;
+
+        case "orange":
+          $r = 0xff;
+          $g = 0xa5;
+          break;
+
+        case "yellow":
+          $r = 0xff;
+          $g = 0xff;
+          break;
+
+        case "olive":
+          $r = 0x80;
+          $g = 0x80;
+          break;
+
+        case "purple":
+          $r = 0x80;
+          $b = 0x80;
+          break;
+
+        case "fuchsia":
+          $r = 0xff;
+          $b = 0xff;
+          break;
+
+        case "white":
+          $r = $g = $b = 0xff;
+          break;
+
+        case "lime":
+          $g = 0xff;
+          break;
+
+        case "green":
+          $g = 0x80;
+          break;
+
+        case "navy":
+          $b = 0x80;
+          break;
+
+        case "blue":
+          $b = 0xff;
+          break;
+
+        case "aqua":
+          $g = 0xff;
+          $b = 0xff;
+          break;
+
+        case "teal":
+          $g = 0x80;
+          $b = 0x80;
+          break;
+
+        case "black":
+          break;
+
+        case "sliver":
+          $r = $g = $b = 0xc0;
+          break;
+
+        case "gray":
+        case "grey":
+          $r = $g = $b = 0x80;
+          break;
+
+        case "transparent":
+          return "transparent";
       
-    default:
-      if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
-        // #rgb format
-        $r = hexdec($colour[1] . $colour[1]);
-        $g = hexdec($colour[2] . $colour[2]);
-        $b = hexdec($colour[3] . $colour[3]);
-
-      } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
-        // #rrggbb format
-        $r = hexdec(mb_substr($colour, 1, 2));
-        $g = hexdec(mb_substr($colour, 3, 2));
-        $b = hexdec(mb_substr($colour, 5, 2));
-
-      } else if ( mb_strpos($colour, "rgb") !== false ) {
-        // rgb( r,g,b ) format
-        $i = mb_strpos($colour, "(");
-        $j = mb_strpos($colour, ")");
+        default:
+          if ( mb_strlen($colour) == 4 && $colour[0] === "#" ) {
+            // #rgb format
+            $r = hexdec($colour[1] . $colour[1]);
+            $g = hexdec($colour[2] . $colour[2]);
+            $b = hexdec($colour[3] . $colour[3]);
+
+          } else if ( mb_strlen($colour) == 7 && $colour[0] === "#" ) {
+            // #rrggbb format
+            $r = hexdec(mb_substr($colour, 1, 2));
+            $g = hexdec(mb_substr($colour, 3, 2));
+            $b = hexdec(mb_substr($colour, 5, 2));
+
+          } else if ( mb_strpos($colour, "rgb") !== false ) {
+            // rgb( r,g,b ) format
+            $i = mb_strpos($colour, "(");
+            $j = mb_strpos($colour, ")");
         
-        // Bad colour value
-        if ($i === false || $j === false)
-          return null;
+            // Bad colour value
+            if ($i === false || $j === false)
+              return null;
 
-        $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
+            $triplet = explode(",", mb_substr($colour, $i+1, $j-$i-1));
 
-        if (count($triplet) != 3)
-          return null;
+            if (count($triplet) != 3)
+              return null;
         
-        foreach (array_keys($triplet) as $c) {
-          $triplet[$c] = trim($triplet[$c]);
+            foreach (array_keys($triplet) as $c) {
+              $triplet[$c] = trim($triplet[$c]);
           
-          if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
-            $triplet[$c] = round($triplet[$c] * 0.255);
-        }
+              if ( $triplet[$c]{mb_strlen($triplet[$c]) - 1} === "%" )
+                $triplet[$c] = round($triplet[$c] * 0.255);
+            }
 
-        list($r, $g, $b) = $triplet;
+            list($r, $g, $b) = $triplet;
 
-      } else {
-        // Who knows?
-        return null;
-      }
+          } else {
+            // Who knows?
+            return null;
+          }
       
-      // Clip to 0 - 1
-      $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
-      $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
-      $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
-      break;
+          // Clip to 0 - 1
+          $r = $r < 0 ? 0 : ($r > 255 ? 255 : $r);
+          $g = $g < 0 ? 0 : ($g > 255 ? 255 : $g);
+          $b = $b < 0 ? 0 : ($b > 255 ? 255 : $b);
+          break;
       
     }
     
@@ -941,38 +941,38 @@ 
     
     switch ($fs) {
       
-    case "xx-small":
-      $fs = 3/5 * $this->_parent_font_size;
-      break;
-
-    case "x-small":
-      $fs = 3/4 * $this->_parent_font_size;
-      break;
-
-    case "smaller":
-    case "small":
-      $fs = 8/9 * $this->_parent_font_size;
-      break;
-
-    case "medium":
-      $fs = $this->_parent_font_size;
-      break;
-
-    case "larger":
-    case "large":
-      $fs = 6/5 * $this->_parent_font_size;
-      break;
-
-    case "x-large":
-      $fs = 3/2 * $this->_parent_font_size;
-      break;
-
-    case "xx-large":
-      $fs = 2/1 * $this->_parent_font_size;
-      break;
-
-    default:
-      break;
+        case "xx-small":
+          $fs = 3/5 * $this->_parent_font_size;
+          break;
+
+        case "x-small":
+          $fs = 3/4 * $this->_parent_font_size;
+          break;
+
+        case "smaller":
+        case "small":
+          $fs = 8/9 * $this->_parent_font_size;
+          break;
+
+        case "medium":
+          $fs = $this->_parent_font_size;
+          break;
+
+        case "larger":
+        case "large":
+          $fs = 6/5 * $this->_parent_font_size;
+          break;
+
+        case "x-large":
+          $fs = 3/2 * $this->_parent_font_size;
+          break;
+
+        case "xx-large":
+          $fs = 2/1 * $this->_parent_font_size;
+          break;
+
+        default:
+          break;
     }
 
     // Ensure relative sizes resolve to something
@@ -1058,61 +1058,61 @@ 
 
     switch ($tmp[0]) {
 
-    case "left":
-      $x = "0%";
-      break;
+        case "left":
+          $x = "0%";
+          break;
 
-    case "right":
-      $x = "100%";
-      break;
+        case "right":
+          $x = "100%";
+          break;
 
-    case "top":
-      $y = "0%";
-      break;
+        case "top":
+          $y = "0%";
+          break;
 
-    case "bottom":
-      $y = "100%";
-      break;
+        case "bottom":
+          $y = "100%";
+          break;
 
-    case "center":
-      $x = "50%";
-      $y = "50%";
-      break;
+        case "center":
+          $x = "50%";
+          $y = "50%";
+          break;
 
-    default:
-      $x = $tmp[0];
-      break;
+        default:
+          $x = $tmp[0];
+          break;
     }
 
     if ( isset($tmp[1]) ) {
 
       switch ($tmp[1]) {
-      case "left":
-        $x = "0%";
-        break;
+          case "left":
+            $x = "0%";
+            break;
         
-      case "right":
-        $x = "100%";
-        break;
+          case "right":
+            $x = "100%";
+            break;
         
-      case "top":
-        $y = "0%";
-        break;
+          case "top":
+            $y = "0%";
+            break;
         
-      case "bottom":
-        $y = "100%";
-        break;
+          case "bottom":
+            $y = "100%";
+            break;
         
-      case "center":
-        if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
-          $y = "50%";
-        else
-          $x = "50%";
-        break;
+          case "center":
+            if ( $tmp[0] === "left" || $tmp[0] === "right" || $tmp[0] === "center" )
+              $y = "50%";
+            else
+              $x = "50%";
+            break;
         
-      default:
-        $y = $tmp[1];
-        break;
+          default:
+            $y = $tmp[1];
+            break;
       }
 
     } else {
@@ -1384,20 +1384,20 @@ 
   protected function _set_style_type($style,$type,$val,$important) {
     $arr = explode(" ", $val);
     switch (count($arr)) {
-    case 1:
-      $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
-      break;
-    case 2:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
-      break;
-    case 3:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
-      break;
-    case 4:
-      $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
-      break;
-    default:
-      break;
+        case 1:
+          $this->_set_style_sides_type($style,$arr[0],$arr[0],$arr[0],$arr[0],$type,$important);
+          break;
+        case 2:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[0],$arr[1],$type,$important);
+          break;
+        case 3:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[1],$arr[2],$type,$important);
+          break;
+        case 4:
+          $this->_set_style_sides_type($style,$arr[0],$arr[1],$arr[2],$arr[3],$type,$important);
+          break;
+        default:
+          break;
     }
     //see __set and __get, on all assignments clear cache!
 	$this->_prop_cache[$style.$type] = null;

main/inc/lib/phpdocx/pdf/lib/class.pdf.php

Switch Indentation +1218 added lines, -1218 removed lines

@@ -354,30 +354,30 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'destination', 'info'=>array());
-      $tmp =  '';
-      switch  ($options['type']) {
-      case  'XYZ':
-      case  'FitR':
-        $tmp =   ' '.$options['p3'].$tmp;
-      case  'FitH':
-      case  'FitV':
-      case  'FitBH':
-      case  'FitBV':
-        $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'];
-      }
+        case  'new':
+          $this->objects[$id] = array('t'=>'destination', 'info'=>array());
+          $tmp =  '';
+          switch  ($options['type']) {
+              case  'XYZ':
+              case  'FitR':
+                $tmp =   ' '.$options['p3'].$tmp;
+              case  'FitH':
+              case  'FitV':
+              case  'FitBH':
+              case  'FitBV':
+                $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'];
+          }
       break;
 
-    case  'out':
-      $tmp =  $o['info'];
-      $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
-      return  $res;
+        case  'out':
+          $tmp =  $o['info'];
+          $res = "\n".$id." 0 obj\n".'['.$tmp['page'].' 0 R /'.$tmp['string']."]\nendobj";
+          return  $res;
     }
   }
 
@@ -391,33 +391,33 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
-      break;
-
-    case  'add':
-      foreach($options as  $k=>$v) {
-        switch  ($k) {
-        case  'HideToolbar':
-        case  'HideMenubar':
-        case  'HideWindowUI':
-        case  'FitWindow':
-        case  'CenterWindow':
-        case  'NonFullScreenPageMode':
-        case  'Direction':
-          $o['info'][$k] = $v;
+        case  'new':
+          $this->objects[$id] = array('t'=>'viewerPreferences', 'info'=>array());
           break;
-        }
+
+        case  'add':
+          foreach($options as  $k=>$v) {
+            switch  ($k) {
+                case  'HideToolbar':
+                case  'HideMenubar':
+                case  'HideWindowUI':
+                case  'FitWindow':
+                case  'CenterWindow':
+                case  'NonFullScreenPageMode':
+                case  'Direction':
+                  $o['info'][$k] = $v;
+                  break;
+            }
       }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\n";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.= "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\n";
+          return  $res;
     }
   }
 
@@ -431,55 +431,55 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
-      $this->catalogId = $id;
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'catalog', 'info'=>array());
+          $this->catalogId = $id;
+          break;
 
-    case  'outlines':
-    case  'pages':
-    case  'openHere':
-    case  'javascript':
-      $o['info'][$action] = $options;
-      break;
+        case  'outlines':
+        case  'pages':
+        case  'openHere':
+        case  'javascript':
+          $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;
-      }
+        case  'viewerPreferences':
+          if  (!isset($o['info']['viewerPreferences'])) {
+            $this->numObj++;
+            $this->o_viewerPreferences($this->numObj, 'new');
+            $o['info']['viewerPreferences'] = $this->numObj;
+          }
 
-      $vp =  $o['info']['viewerPreferences'];
-      $this->o_viewerPreferences($vp, 'add', $options);
+          $vp =  $o['info']['viewerPreferences'];
+          $this->o_viewerPreferences($vp, 'add', $options);
 
-      break;
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< /Type /Catalog';
 
-      foreach($o['info'] as  $k=>$v) {
-        switch ($k) {
-        case  'outlines':
-          $res.= "\n".'/Outlines '.$v.' 0 R';
-          break;
+          foreach($o['info'] as  $k=>$v) {
+            switch ($k) {
+                case  'outlines':
+                  $res.= "\n".'/Outlines '.$v.' 0 R';
+                  break;
           
-        case  'pages':
-          $res.= "\n".'/Pages '.$v.' 0 R';
-          break;
+                case  'pages':
+                  $res.= "\n".'/Pages '.$v.' 0 R';
+                  break;
 
-        case  'viewerPreferences':
-          $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
-          break;
+                case  'viewerPreferences':
+                  $res.= "\n".'/ViewerPreferences '.$v.' 0 R';
+                  break;
 
-        case  'openHere':
-          $res.= "\n".'/OpenAction '.$v.' 0 R';
-          break;
+                case  'openHere':
+                  $res.= "\n".'/OpenAction '.$v.' 0 R';
+                  break;
 
-        case  'javascript':
-          $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
-          break;
-        }
+                case  'javascript':
+                  $res.= "\n".'/Names <</JavaScript '.$v.' 0 R>>';
+                  break;
+            }
       }
 
       $res.= " >>\nendobj";
@@ -497,37 +497,37 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'pages', 'info'=>array());
-      $this->o_catalog($this->catalogId, 'pages', $id);
-      break;
+        case  'new':
+          $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;
-      } 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']) {
-
-            // then there is a match
-            // make a space
-            switch  ($options['pos']) {
-            case  'before':
-              $k =  $i;
-              break;
+        case  'page':
+          if  (!is_array($options)) {
+            // then it will just be the id of the new page
+            $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']) {
+
+                // then there is a match
+                // make a space
+                switch  ($options['pos']) {
+                    case  'before':
+                      $k =  $i;
+                      break;
 
-            case  'after':
-              $k = $i+1;
-              break;
+                    case  'after':
+                      $k = $i+1;
+                      break;
 
-            default:
-              $k = -1;
-              break;
-            }
+                    default:
+                      $k = -1;
+                      break;
+                }
 
             if  ($k >= 0) {
               for  ($j = count($o['info']['pages']) -1;$j >= $k;$j--) {
@@ -541,82 +541,82 @@ 
       }
       break;
 
-    case  'procset':
-      $o['info']['procset'] = $options;
-      break;
+        case  'procset':
+          $o['info']['procset'] = $options;
+          break;
 
-    case  'mediaBox':
-      $o['info']['mediaBox'] = $options;
-      // which should be an array of 4 numbers
-      break;
+        case  'mediaBox':
+          $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']);
-      break;
+        case  'font':
+          $o['info']['fonts'][] = array('objNum'=>$options['objNum'], 'fontNum'=>$options['fontNum']);
+          break;
 
-    case  'extGState':
-      $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
-      break;
+        case  'extGState':
+          $o['info']['extGStates'][] =  array('objNum' => $options['objNum'],  'stateNum' => $options['stateNum']);
+          break;
 
-    case  'xObject':
-      $o['info']['xObjects'][] = array('objNum'=>$options['objNum'], 'label'=>$options['label']);
-      break;
+        case  'xObject':
+          $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\n/Kids [";
-        foreach($o['info']['pages'] as  $k=>$v) {
-          $res.= $v." 0 R\n";
-        }
+        case  'out':
+          if  (count($o['info']['pages'])) {
+            $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Kids [";
+            foreach($o['info']['pages'] as  $k=>$v) {
+              $res.= $v." 0 R\n";
+            }
 
-        $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
+            $res.= "]\n/Count ".count($this->objects[$id]['info']['pages']);
 
-        if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
-              isset($o['info']['procset']) ||
-              (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
-          $res.= "\n/Resources <<";
+            if  ( (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) ||
+                  isset($o['info']['procset']) ||
+                  (isset($o['info']['extGStates']) &&  count($o['info']['extGStates']))) {
+              $res.= "\n/Resources <<";
 
-          if  (isset($o['info']['procset'])) {
-            $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
-          }
+              if  (isset($o['info']['procset'])) {
+                $res.= "\n/ProcSet ".$o['info']['procset']." 0 R";
+              }
 
-          if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
-            $res.= "\n/Font << ";
-            foreach($o['info']['fonts'] as  $finfo) {
-              $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
-            }
-            $res.= "\n>>";
-          }
+              if  (isset($o['info']['fonts']) &&  count($o['info']['fonts'])) {
+                $res.= "\n/Font << ";
+                foreach($o['info']['fonts'] as  $finfo) {
+                  $res.= "\n/F".$finfo['fontNum']." ".$finfo['objNum']." 0 R";
+                }
+                $res.= "\n>>";
+              }
 
-          if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
-            $res.= "\n/XObject << ";
-            foreach($o['info']['xObjects'] as  $finfo) {
-              $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
-            }
-            $res.= "\n>>";
-          }
+              if  (isset($o['info']['xObjects']) &&  count($o['info']['xObjects'])) {
+                $res.= "\n/XObject << ";
+                foreach($o['info']['xObjects'] as  $finfo) {
+                  $res.= "\n/".$finfo['label']." ".$finfo['objNum']." 0 R";
+                }
+                $res.= "\n>>";
+              }
 
-          if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
-            $res.=  "\n/ExtGState << ";
-            foreach ($o['info']['extGStates'] as  $gstate) {
-              $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+              if  ( isset($o['info']['extGStates']) &&  count($o['info']['extGStates'])) {
+                $res.=  "\n/ExtGState << ";
+                foreach ($o['info']['extGStates'] as  $gstate) {
+                  $res.=  "\n/GS" . $gstate['stateNum'] . " " . $gstate['objNum'] . " 0 R";
+                }
+                $res.=  "\n>>";
+              }
+
+              $res.= "\n>>";
+              if  (isset($o['info']['mediaBox'])) {
+                $tmp = $o['info']['mediaBox'];
+                $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+              }
             }
-            $res.=  "\n>>";
-          }
 
-          $res.= "\n>>";
-          if  (isset($o['info']['mediaBox'])) {
-            $tmp = $o['info']['mediaBox'];
-            $res.= "\n/MediaBox [".sprintf('%.3F', $tmp[0]) .' '.sprintf('%.3F', $tmp[1]) .' '.sprintf('%.3F', $tmp[2]) .' '.sprintf('%.3F', $tmp[3]) .']';
+            $res.= "\n >>\nendobj";
+          } else {
+            $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
           }
-        }
 
-        $res.= "\n >>\nendobj";
-      } else {
-        $res = "\n".$id." 0 obj\n<< /Type /Pages\n/Count 0\n>>\nendobj";
-      }
-
-      return  $res;
+          return  $res;
     }
   }
 
@@ -630,28 +630,28 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
-      $this->o_catalog($this->catalogId, 'outlines', $id);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'outlines', 'info'=>array('outlines'=>array()));
+          $this->o_catalog($this->catalogId, 'outlines', $id);
+          break;
 
-    case  'outline':
-      $o['info']['outlines'][] = $options;
-      break;
+        case  'outline':
+          $o['info']['outlines'][] = $options;
+          break;
 
-    case  'out':
-      if  (count($o['info']['outlines'])) {
-        $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
-        foreach($o['info']['outlines'] as  $k=>$v) {
-          $res.= $v." 0 R ";
-        }
+        case  'out':
+          if  (count($o['info']['outlines'])) {
+            $res = "\n".$id." 0 obj\n<< /Type /Outlines /Kids [";
+            foreach($o['info']['outlines'] as  $k=>$v) {
+              $res.= $v." 0 R ";
+            }
 
-        $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
-      } else {
-        $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
-      }
+            $res.= "] /Count ".count($o['info']['outlines']) ." >>\nendobj";
+          } else {
+            $res = "\n".$id." 0 obj\n<< /Type /Outlines /Count 0 >>\nendobj";
+          }
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -665,33 +665,33 @@ 
     }
 
     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;
-
-      // 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;
-      } else  if  (isset($options['encoding'])) {
-        // we can specify encoding here
-        switch ($options['encoding']) {
-        case  'WinAnsiEncoding':
-        case  'MacRomanEncoding':
-        case  'MacExpertEncoding':
-          $this->objects[$id]['info']['encoding'] =  $options['encoding'];
-          break;
-
-        case  'none':
-          break;
+        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;
 
-        default:
-          $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
-          break;
-        }
+          // 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;
+          } else  if  (isset($options['encoding'])) {
+            // we can specify encoding here
+            switch ($options['encoding']) {
+                case  'WinAnsiEncoding':
+                case  'MacRomanEncoding':
+                case  'MacExpertEncoding':
+                  $this->objects[$id]['info']['encoding'] =  $options['encoding'];
+                  break;
+
+                case  'none':
+                  break;
+
+                default:
+                  $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
+                  break;
+            }
       } else {
         $this->objects[$id]['info']['encoding'] =  'WinAnsiEncoding';
       }
@@ -744,21 +744,21 @@ 
       $this->o_pages($this->currentNode, 'font', array('fontNum' => $fontNum, 'objNum' => $id));
       break;
 
-    case  'add':
-      foreach ($options as  $k => $v) {
-        switch  ($k) {
-        case  'BaseFont':
-          $o['info']['name'] =  $v;
-          break;
-        case  'FirstChar':
-        case  'LastChar':
-        case  'Widths':
-        case  'FontDescriptor':
-        case  'SubType':
-          $this->addMessage('o_font '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
-        }
+        case  'add':
+          foreach ($options as  $k => $v) {
+            switch  ($k) {
+                case  'BaseFont':
+                  $o['info']['name'] =  $v;
+                  break;
+                case  'FirstChar':
+                case  'LastChar':
+                case  'Widths':
+                case  'FontDescriptor':
+                case  'SubType':
+                  $this->addMessage('o_font '.$k." : ".$v);
+                  $o['info'][$k] =  $v;
+                  break;
+            }
       }
 
       // pass values down to descendent font
@@ -767,60 +767,60 @@ 
       }
       break;
 
-    case  'out':
-      if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
-        // For Unicode fonts, we need to incorporate font data into
-        // sub-sections that are linked from the primary font section.
-        // Look at o_fontGIDtoCID and o_fontDescendentCID functions
-        // for more informaiton.
-        //
-        // All of this code is adapted from the excellent changes made to
-        // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
-
-        $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
-        $res.=  "/BaseFont /".$o['info']['name']."\n";
-
-        // The horizontal identity mapping for 2-byte CIDs; may be used
-        // with CIDFonts using any Registry, Ordering, and Supplement values.
-        $res.=  "/Encoding /Identity-H\n";
-        $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
-        $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
-        $res.=  ">>\n";
-        $res.=  "endobj";
-      } else {
-      $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
-      $res.=  "/Name /F".$o['info']['fontNum']."\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-
-      if  (isset($o['info']['encodingDictionary'])) {
-        // then place a reference to the dictionary
-        $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
-      } else  if  (isset($o['info']['encoding'])) {
-        // use the specified encoding
-        $res.=  "/Encoding /".$o['info']['encoding']."\n";
-      }
+        case  'out':
+          if ($this->fonts[$this->objects[$id]['info']['fontFileName']]['isUnicode']) {
+            // For Unicode fonts, we need to incorporate font data into
+            // sub-sections that are linked from the primary font section.
+            // Look at o_fontGIDtoCID and o_fontDescendentCID functions
+            // for more informaiton.
+            //
+            // All of this code is adapted from the excellent changes made to
+            // transform FPDF to TCPDF (http://tcpdf.sourceforge.net/)
+
+            $res =  "\n".$id." 0 obj\n<</Type /Font\n/Subtype /Type0\n";
+            $res.=  "/BaseFont /".$o['info']['name']."\n";
+
+            // The horizontal identity mapping for 2-byte CIDs; may be used
+            // with CIDFonts using any Registry, Ordering, and Supplement values.
+            $res.=  "/Encoding /Identity-H\n";
+            $res.=  "/DescendantFonts [".$o['info']['cidFont']." 0 R]\n";
+            $res.=  "/ToUnicode ".$o['info']['toUnicode']." 0 R\n";
+            $res.=  ">>\n";
+            $res.=  "endobj";
+          } else {
+          $res =  "\n".$id." 0 obj\n<< /Type /Font\n/Subtype /".$o['info']['SubType']."\n";
+          $res.=  "/Name /F".$o['info']['fontNum']."\n";
+          $res.=  "/BaseFont /".$o['info']['name']."\n";
+
+          if  (isset($o['info']['encodingDictionary'])) {
+            // then place a reference to the dictionary
+            $res.=  "/Encoding ".$o['info']['encodingDictionary']." 0 R\n";
+          } else  if  (isset($o['info']['encoding'])) {
+            // use the specified encoding
+            $res.=  "/Encoding /".$o['info']['encoding']."\n";
+          }
 
-      if  (isset($o['info']['FirstChar'])) {
-        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-      }
+          if  (isset($o['info']['FirstChar'])) {
+            $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+          }
 
-      if  (isset($o['info']['LastChar'])) {
-        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-      }
+          if  (isset($o['info']['LastChar'])) {
+            $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+          }
 
-      if  (isset($o['info']['Widths'])) {
-        $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
-      }
+          if  (isset($o['info']['Widths'])) {
+            $res.=  "/Widths ".$o['info']['Widths']." 0 R\n";
+          }
 
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+          if  (isset($o['info']['FontDescriptor'])) {
+            $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+          }
 
-        $res.=  ">>\n";
-        $res.=  "endobj";
-      }
+            $res.=  ">>\n";
+            $res.=  "endobj";
+          }
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -834,46 +834,46 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'fontDescriptor', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
-      foreach ($o['info'] as  $label => $value) {
-        switch  ($label) {
-        case  'Ascent':
-        case  'CapHeight':
-        case  'Descent':
-        case  'Flags':
-        case  'ItalicAngle':
-        case  'StemV':
-        case  'AvgWidth':
-        case  'Leading':
-        case  'MaxWidth':
-        case  'MissingWidth':
-        case  'StemH':
-        case  'XHeight':
-        case  'CharSet':
-          if  (mb_strlen($value, '8bit')) {
-            $res.= '/'.$label.' '.$value."\n";
-          }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /FontDescriptor\n";
+          foreach ($o['info'] as  $label => $value) {
+            switch  ($label) {
+                case  'Ascent':
+                case  'CapHeight':
+                case  'Descent':
+                case  'Flags':
+                case  'ItalicAngle':
+                case  'StemV':
+                case  'AvgWidth':
+                case  'Leading':
+                case  'MaxWidth':
+                case  'MissingWidth':
+                case  'StemH':
+                case  'XHeight':
+                case  'CharSet':
+                  if  (mb_strlen($value, '8bit')) {
+                    $res.= '/'.$label.' '.$value."\n";
+                  }
 
-          break;
-        case  'FontFile':
-        case  'FontFile2':
-        case  'FontFile3':
-          $res.= '/'.$label.' '.$value." 0 R\n";
-          break;
+                  break;
+                case  'FontFile':
+                case  'FontFile2':
+                case  'FontFile3':
+                  $res.= '/'.$label.' '.$value." 0 R\n";
+                  break;
 
-        case  'FontBBox':
-          $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
-          break;
+                case  'FontBBox':
+                  $res.= '/'.$label.' ['.$value[0].' '.$value[1].' '.$value[2].' '.$value[3]."]\n";
+                  break;
 
-        case  'FontName':
-          $res.= '/'.$label.' /'.$value."\n";
-          break;
-        }
+                case  'FontName':
+                  $res.= '/'.$label.' /'.$value."\n";
+                  break;
+            }
       }
 
       $res.= ">>\nendobj";
@@ -892,38 +892,38 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      // the options array should contain 'differences' and maybe 'encoding'
-      $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
-      break;
+        case  'new':
+          // the options array should contain 'differences' and maybe 'encoding'
+          $this->objects[$id] = array('t'=>'fontEncoding', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
-      if  (!isset($o['info']['encoding'])) {
-        $o['info']['encoding'] = 'WinAnsiEncoding';
-      }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Encoding\n";
+          if  (!isset($o['info']['encoding'])) {
+            $o['info']['encoding'] = 'WinAnsiEncoding';
+          }
 
-      if  ($o['info']['encoding'] !== 'none') {
-        $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
-      }
+          if  ($o['info']['encoding'] !== 'none') {
+            $res.= "/BaseEncoding /".$o['info']['encoding']."\n";
+          }
 
-      $res.= "/Differences \n[";
+          $res.= "/Differences \n[";
 
-      $onum = -100;
+          $onum = -100;
 
-      foreach($o['info']['differences'] as  $num=>$label) {
-        if  ($num != $onum+1) {
-          // we cannot make use of consecutive numbering
-          $res.=  "\n".$num." /".$label;
-        } else {
-          $res.=  " /".$label;
-        }
+          foreach($o['info']['differences'] as  $num=>$label) {
+            if  ($num != $onum+1) {
+              // we cannot make use of consecutive numbering
+              $res.=  "\n".$num." /".$label;
+            } else {
+              $res.=  " /".$label;
+            }
 
-        $onum = $num;
-      }
+            $onum = $num;
+          }
 
-      $res.= "\n]\n>>\nendobj";
-      return  $res;
+          $res.= "\n]\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -937,82 +937,82 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
-
-      // we need a CID system info section
-      $cidSystemInfoId = ++$this->numObj;
-      $this->o_contents($cidSystemInfoId, 'new', 'raw');
-      $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
-      $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
-      $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
-      $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
-      $res.=  ">>";
-      $this->objects[$cidSystemInfoId]['c'] = $res;
-
-      // and a CID to GID map
-      $cidToGidMapId = ++$this->numObj;
-      $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
-      $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
-      break;
-
-    case  'add':
-      foreach ($options as  $k => $v) {
-        switch  ($k) {
-        case  'BaseFont':
-          $o['info']['name'] =  $v;
+        case  'new':
+          $this->objects[$id] =  array('t'=>'fontDescendentCID', 'info'=>$options);
+
+          // we need a CID system info section
+          $cidSystemInfoId = ++$this->numObj;
+          $this->o_contents($cidSystemInfoId, 'new', 'raw');
+          $this->objects[$id]['info']['cidSystemInfo'] = $cidSystemInfoId;
+          $res=   "<</Registry (Adobe)\n"; // A string identifying an issuer of character collections
+          $res.=  "/Ordering (UCS)\n"; // A string that uniquely names a character collection issued by a specific registry
+          $res.=  "/Supplement 0\n"; // The supplement number of the character collection.
+          $res.=  ">>";
+          $this->objects[$cidSystemInfoId]['c'] = $res;
+
+          // and a CID to GID map
+          $cidToGidMapId = ++$this->numObj;
+          $this->o_fontGIDtoCIDMap($cidToGidMapId, 'new', $options);
+          $this->objects[$id]['info']['cidToGidMap'] = $cidToGidMapId;
           break;
 
-        case  'FirstChar':
-        case  'LastChar':
-        case  'MissingWidth':
-        case  'FontDescriptor':
-        case  'SubType':
-          $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
-          $o['info'][$k] =  $v;
-          break;
-        }
+        case  'add':
+          foreach ($options as  $k => $v) {
+            switch  ($k) {
+                case  'BaseFont':
+                  $o['info']['name'] =  $v;
+                  break;
+
+                case  'FirstChar':
+                case  'LastChar':
+                case  'MissingWidth':
+                case  'FontDescriptor':
+                case  'SubType':
+                  $this->addMessage('o_fontDescendentCID '.$k." : ".$v);
+                  $o['info'][$k] =  $v;
+                  break;
+            }
       }
 
       // pass values down to cid to gid map
       $this->o_fontGIDtoCIDMap($o['info']['cidToGidMap'], 'add', $options);
       break;
 
-    case  'out':
-      $res =  "\n".$id." 0 obj\n";
-      $res.=  "<</Type /Font\n";
-      $res.=  "/Subtype /CIDFontType2\n";
-      $res.=  "/BaseFont /".$o['info']['name']."\n";
-      $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
-//      if  (isset($o['info']['FirstChar'])) {
-//        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
-//      }
-
-//      if  (isset($o['info']['LastChar'])) {
-//        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
-//      }
-      if  (isset($o['info']['FontDescriptor'])) {
-        $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
-      }
+        case  'out':
+          $res =  "\n".$id." 0 obj\n";
+          $res.=  "<</Type /Font\n";
+          $res.=  "/Subtype /CIDFontType2\n";
+          $res.=  "/BaseFont /".$o['info']['name']."\n";
+          $res.=  "/CIDSystemInfo ".$o['info']['cidSystemInfo']." 0 R\n";
+    //      if  (isset($o['info']['FirstChar'])) {
+    //        $res.=  "/FirstChar ".$o['info']['FirstChar']."\n";
+    //      }
+
+    //      if  (isset($o['info']['LastChar'])) {
+    //        $res.=  "/LastChar ".$o['info']['LastChar']."\n";
+    //      }
+          if  (isset($o['info']['FontDescriptor'])) {
+            $res.=  "/FontDescriptor ".$o['info']['FontDescriptor']." 0 R\n";
+          }
 
-      if  (isset($o['info']['MissingWidth'])) {
-        $res.=  "/DW ".$o['info']['MissingWidth']."\n";
-      }
+          if  (isset($o['info']['MissingWidth'])) {
+            $res.=  "/DW ".$o['info']['MissingWidth']."\n";
+          }
 
-      if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
-        $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
-        $w = '';
-        foreach ($cid_widths as $cid => $width) {
-          $w .= $cid.' ['.$width.'] ';
-        }
-        $res.=  "/W [".$w."]\n";
-      }
+          if  (isset($o['info']['fontFileName']) && isset($this->fonts[$o['info']['fontFileName']]['CIDWidths'])) {
+            $cid_widths = &$this->fonts[$o['info']['fontFileName']]['CIDWidths'];
+            $w = '';
+            foreach ($cid_widths as $cid => $width) {
+              $w .= $cid.' ['.$width.'] ';
+            }
+            $res.=  "/W [".$w."]\n";
+          }
 
-      $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
-      $res.=  ">>\n";
-      $res.=  "endobj";
+          $res.=  "/CIDToGIDMap ".$o['info']['cidToGidMap']." 0 R\n";
+          $res.=  ">>\n";
+          $res.=  "endobj";
 
-      return  $res;
+          return  $res;
     }
   }
   
@@ -1026,35 +1026,35 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
-      break;
+        case  'new':
+          $this->objects[$id] =  array('t'=>'fontGIDtoCIDMap', 'info'=>$options);
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n";
-      $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
-      $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
-                    $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
+        case  'out':
+          $res = "\n".$id." 0 obj\n";
+          $tmp = $this->fonts[$o['info']['fontFileName']]['CIDtoGID'] = base64_decode($this->fonts[$o['info']['fontFileName']]['CIDtoGID']);
+          $compressed = isset($this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed']) &&
+                        $this->fonts[$o['info']['fontFileName']]['CIDtoGID_Compressed'];
 
-      if  (!$compressed && isset($o['raw'])) {
-        $res.= $tmp;
-      } else {
-        $res.=  "<<";
+          if  (!$compressed && isset($o['raw'])) {
+            $res.= $tmp;
+          } else {
+            $res.=  "<<";
 
-        if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $compressed = true;
-          $tmp =  gzcompress($tmp,  6);
-        }
-        if ($compressed) {
-          $res.= "\n/Filter /FlateDecode";
-        }
+            if  (!$compressed && function_exists('gzcompress') &&  $this->options['compression']) {
+              // then implement ZLIB based compression on this content stream
+              $compressed = true;
+              $tmp =  gzcompress($tmp,  6);
+            }
+            if ($compressed) {
+              $res.= "\n/Filter /FlateDecode";
+            }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
-      }
+            $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream";
+          }
 
-      $res.= "\nendobj";
-      return  $res;
+          $res.= "\nendobj";
+          return  $res;
     }
   }
   
@@ -1068,31 +1068,31 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
-      $this->o_pages($this->currentNode, 'procset', $id);
-      $this->procsetObjectId = $id;
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'procset', 'info'=>array('PDF'=>1, 'Text'=>1));
+          $this->o_pages($this->currentNode, 'procset', $id);
+          $this->procsetObjectId = $id;
+          break;
 
-    case  'add':
-      // this is to add new items to the procset list, despite the fact that this is considered
-      // obselete, the items are required for printing to some postscript printers
-      switch  ($options) {
-      case  'ImageB':
-      case  'ImageC':
-      case  'ImageI':
-        $o['info'][$options] = 1;
-        break;
-      }
+        case  'add':
+          // this is to add new items to the procset list, despite the fact that this is considered
+          // obselete, the items are required for printing to some postscript printers
+          switch  ($options) {
+              case  'ImageB':
+              case  'ImageC':
+              case  'ImageI':
+                $o['info'][$options] = 1;
+                break;
+          }
       break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n[";
-      foreach ($o['info'] as  $label=>$val) {
-        $res.= '/'.$label.' ';
-      }
-      $res.= "]\nendobj";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n[";
+          foreach ($o['info'] as  $label=>$val) {
+            $res.= '/'.$label.' ';
+          }
+          $res.= "]\nendobj";
+          return  $res;
     }
   }
 
@@ -1106,45 +1106,45 @@ 
     }
 
     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));
-      break;
-    case  'Title':
-    case  'Author':
-    case  'Subject':
-    case  'Keywords':
-    case  'Creator':
-    case  'Producer':
-    case  'CreationDate':
-    case  'ModDate':
-    case  'Trapped':
-      $o['info'][$action] = $options;
-      break;
+        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));
+          break;
+        case  'Title':
+        case  'Author':
+        case  'Subject':
+        case  'Keywords':
+        case  'Creator':
+        case  'Producer':
+        case  'CreationDate':
+        case  'ModDate':
+        case  'Trapped':
+          $o['info'][$action] = $options;
+          break;
 
-    case  'out':
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-      }
+        case  'out':
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+          }
 
-      $res = "\n".$id." 0 obj\n<<\n";
-      foreach ($o['info'] as  $k=>$v) {
-        $res.= '/'.$k.' (';
-        // dates must be outputted as-is, without Unicode transformations
-        $raw = ($k === 'CreationDate' || $k === 'ModDate');
-        $c = $v;
+          $res = "\n".$id." 0 obj\n<<\n";
+          foreach ($o['info'] as  $k=>$v) {
+            $res.= '/'.$k.' (';
+            // dates must be outputted as-is, without Unicode transformations
+            $raw = ($k === 'CreationDate' || $k === 'ModDate');
+            $c = $v;
 
-        if  ($this->encrypted) {
-          $c = $this->ARC4($c);
-        }
+            if  ($this->encrypted) {
+              $c = $this->ARC4($c);
+            }
 
-        $res.= ($raw) ? $c : $this->filterText($c);
-        $res.= ")\n";
-      }
+            $res.= ($raw) ? $c : $this->filterText($c);
+            $res.= ")\n";
+          }
 
-      $res.= ">>\nendobj";
-      return  $res;
+          $res.= ">>\nendobj";
+          return  $res;
     }
   }
 
@@ -1158,38 +1158,38 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      if  (is_array($options)) {
-        $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');
-      }
-      break;
-
-    case  'out':
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-      }
+        case  'new':
+          if  (is_array($options)) {
+            $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');
+          }
+          break;
 
-      $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.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
-        break;
+        case  'out':
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+          }
 
-      case  'URI':
-        $res.= "\n/S /URI\n/URI (";
-        if  ($this->encrypted) {
-          $res.= $this->filterText($this->ARC4($o['info']));
-        } else {
-          $res.= $this->filterText($o['info']);
-        }
+          $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.= "\n/S /GoTo\n/D ".$this->destinations[(string)$o['info']['label']]." 0 R";
+                break;
+
+              case  'URI':
+                $res.= "\n/S /URI\n/URI (";
+                if  ($this->encrypted) {
+                  $res.= $this->filterText($this->ARC4($o['info']));
+                } else {
+                  $res.= $this->filterText($o['info']);
+                }
 
-        $res.= ")";
-        break;
-      }
+                $res.= ")";
+                break;
+          }
 
       $res.= "\n>>\nendobj";
       return  $res;
@@ -1207,39 +1207,39 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      // add the annotation to the current page
-      $pageId =  $this->currentPage;
-      $this->o_page($pageId, 'annot', $id);
-
-      // 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->numObj++;
-        $this->o_action($this->numObj, 'new', $options['url']);
-        $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->numObj++;
-        $this->o_action($this->numObj, 'new', array('type'=>'ilink', 'label'=>$label));
-        $this->objects[$id]['info']['actionId'] = $this->numObj;
-        break;
-      }
+        case  'new':
+          // add the annotation to the current page
+          $pageId =  $this->currentPage;
+          $this->o_page($pageId, 'annot', $id);
+
+          // 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->numObj++;
+                $this->o_action($this->numObj, 'new', $options['url']);
+                $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->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\n<< /Type /Annot";
-      switch ($o['info']['type']) {
-      case  'link':
-      case  'ilink':
-        $res.=  "\n/Subtype /Link";
-        break;
-      }
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Annot";
+          switch ($o['info']['type']) {
+              case  'link':
+              case  'ilink':
+                $res.=  "\n/Subtype /Link";
+                break;
+          }
       $res.= "\n/A ".$o['info']['actionId']." 0 R";
       $res.= "\n/Border [0 0 0]";
       $res.= "\n/H /I";
@@ -1265,77 +1265,77 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $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 should contain 'rid','pos'=[before|after]
-        $options['id'] = $id;
-        $this->o_pages($this->currentNode, 'page', $options);
-      } else {
-        $this->o_pages($this->currentNode, 'page', $id);
-      }
+        case  'new':
+          $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 should contain 'rid','pos'=[before|after]
+            $options['id'] = $id;
+            $this->o_pages($this->currentNode, 'page', $options);
+          } else {
+            $this->o_pages($this->currentNode, 'page', $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;
-
-      $match =  ($this->numPages%2 ?  'odd' :  'even');
-      foreach($this->addLooseObjects as  $oId=>$target) {
-        if  ($target === 'all' || $match === $target) {
-          $this->objects[$id]['info']['contents'][] = $oId;
-        }
-      }
-      break;
+          $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;
+
+          $match =  ($this->numPages%2 ?  'odd' :  'even');
+          foreach($this->addLooseObjects as  $oId=>$target) {
+            if  ($target === 'all' || $match === $target) {
+              $this->objects[$id]['info']['contents'][] = $oId;
+            }
+          }
+          break;
 
-    case  'content':
-      $o['info']['contents'][] = $options;
-      break;
+        case  'content':
+          $o['info']['contents'][] = $options;
+          break;
 
-    case  'annot':
-      // add an annotation to this page
-      if  (!isset($o['info']['annot'])) {
-        $o['info']['annot'] = array();
-      }
+        case  'annot':
+          // add an annotation to this page
+          if  (!isset($o['info']['annot'])) {
+            $o['info']['annot'] = array();
+          }
 
-      // $options should contain the id of the annotation dictionary
-      $o['info']['annot'][] = $options;
-      break;
+          // $options should contain the id of the annotation dictionary
+          $o['info']['annot'][] = $options;
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n<< /Type /Page";
-      $res.= "\n/Parent ".$o['info']['parent']." 0 R";
+        case  'out':
+          $res = "\n".$id." 0 obj\n<< /Type /Page";
+          $res.= "\n/Parent ".$o['info']['parent']." 0 R";
 
-      if  (isset($o['info']['annot'])) {
-        $res.= "\n/Annots [";
-        foreach($o['info']['annot'] as  $aId) {
-          $res.= " ".$aId." 0 R";
-        }
-        $res.= " ]";
-      }
+          if  (isset($o['info']['annot'])) {
+            $res.= "\n/Annots [";
+            foreach($o['info']['annot'] as  $aId) {
+              $res.= " ".$aId." 0 R";
+            }
+            $res.= " ]";
+          }
 
-      $count =  count($o['info']['contents']);
-      if  ($count == 1) {
-        $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
-      } else  if  ($count>1) {
-        $res.= "\n/Contents [\n";
-
-        // reverse the page contents so added objects are below normal content
-        //foreach (array_reverse($o['info']['contents']) as  $cId) {
-        // Back to normal now that I've got transparency working --Benj
-        foreach ($o['info']['contents'] as  $cId) {
-          $res.= $cId." 0 R\n";
-        }
-        $res.= "]";
-      }
+          $count =  count($o['info']['contents']);
+          if  ($count == 1) {
+            $res.= "\n/Contents ".$o['info']['contents'][0]." 0 R";
+          } else  if  ($count>1) {
+            $res.= "\n/Contents [\n";
+
+            // reverse the page contents so added objects are below normal content
+            //foreach (array_reverse($o['info']['contents']) as  $cId) {
+            // Back to normal now that I've got transparency working --Benj
+            foreach ($o['info']['contents'] as  $cId) {
+              $res.= $cId." 0 R\n";
+            }
+            $res.= "]";
+          }
 
-      $res.= "\n>>\nendobj";
-      return  $res;
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1349,51 +1349,51 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
-      if  (mb_strlen($options, '8bit') &&  intval($options)) {
-        // then this contents is the primary for a page
-        $this->objects[$id]['onPage'] = $options;
-      } else  if  ($options === 'raw') {
-        // then this page contains some other type of system object
-        $this->objects[$id]['raw'] = 1;
-      }
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'contents', 'c'=>'', 'info'=>array());
+          if  (mb_strlen($options, '8bit') &&  intval($options)) {
+            // then this contents is the primary for a page
+            $this->objects[$id]['onPage'] = $options;
+          } else  if  ($options === 'raw') {
+            // then this page contains some other type of system object
+            $this->objects[$id]['raw'] = 1;
+          }
+          break;
 
-    case  'add':
-      // add more options to the decleration
-      foreach ($options as  $k=>$v) {
-        $o['info'][$k] = $v;
-      }
+        case  'add':
+          // add more options to the decleration
+          foreach ($options as  $k=>$v) {
+            $o['info'][$k] = $v;
+          }
 
-    case  'out':
-      $tmp = $o['c'];
-      $res =  "\n".$id." 0 obj\n";
+        case  'out':
+          $tmp = $o['c'];
+          $res =  "\n".$id." 0 obj\n";
 
-      if  (isset($this->objects[$id]['raw'])) {
-        $res.= $tmp;
-      } else {
-        $res.=  "<<";
-        if  (function_exists('gzcompress') &&  $this->options['compression']) {
-          // then implement ZLIB based compression on this content stream
-          $res.= " /Filter /FlateDecode";
-          $tmp =  gzcompress($tmp,  6);
-        }
+          if  (isset($this->objects[$id]['raw'])) {
+            $res.= $tmp;
+          } else {
+            $res.=  "<<";
+            if  (function_exists('gzcompress') &&  $this->options['compression']) {
+              // then implement ZLIB based compression on this content stream
+              $res.= " /Filter /FlateDecode";
+              $tmp =  gzcompress($tmp,  6);
+            }
 
-        if  ($this->encrypted) {
-          $this->encryptInit($id);
-          $tmp =  $this->ARC4($tmp);
-        }
+            if  ($this->encrypted) {
+              $this->encryptInit($id);
+              $tmp =  $this->ARC4($tmp);
+            }
 
-        foreach($o['info'] as  $k=>$v) {
-          $res.=  "\n/".$k.' '.$v;
-        }
+            foreach($o['info'] as  $k=>$v) {
+              $res.=  "\n/".$k.' '.$v;
+            }
 
-        $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
-      }
+            $res.= "\n/Length ".mb_strlen($tmp, '8bit') ." >>\nstream\n".$tmp."\nendstream";
+          }
 
-      $res.= "\nendobj";
-      return  $res;
+          $res.= "\nendobj";
+          return  $res;
     }
   }
 
@@ -1403,19 +1403,19 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
-        'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
-      ));
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'embedjs', 'info'=>array(
+            'Names' => '[(EmbeddedJS) '.($id+1).' 0 R]'
+          ));
+          break;
 
-    case  'out':
-      $res .= "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res .= "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.=  "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
   
@@ -1425,20 +1425,20 @@ 
     }
 
     switch  ($action) {
-    case  'new':
-      $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
-        'S' => '/JavaScript',
-        'JS' => '('.$this->filterText($code).')',
-      ));
-      break;
+        case  'new':
+          $this->objects[$id] = array('t'=>'javascript', 'info'=>array(
+            'S' => '/JavaScript',
+            'JS' => '('.$this->filterText($code).')',
+          ));
+          break;
 
-    case  'out':
-      $res = "\n".$id." 0 obj\n".'<< ';
-      foreach($o['info'] as  $k=>$v) {
-        $res.=  "\n/".$k.' '.$v;
-      }
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res = "\n".$id." 0 obj\n".'<< ';
+          foreach($o['info'] as  $k=>$v) {
+            $res.=  "\n/".$k.' '.$v;
+          }
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1451,28 +1451,28 @@ 
     }
 
     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') {
-        if  (!isset($options['channels'])) {
-          $options['channels'] = 3;
-        }
+        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') {
+            if  (!isset($options['channels'])) {
+              $options['channels'] = 3;
+            }
 
-        switch ($options['channels']) {
-        case  1:
-          $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
-          break;
+            switch ($options['channels']) {
+                case  1:
+                  $this->objects[$id]['info']['ColorSpace'] = '/DeviceGray';
+                  break;
 
-        default:
-          $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
-          break;
-        }
+                default:
+                  $this->objects[$id]['info']['ColorSpace'] = '/DeviceRGB';
+                  break;
+            }
 
         $this->objects[$id]['info']['Filter'] = '/DCTDecode';
         $this->objects[$id]['info']['BitsPerComponent'] = 8;
@@ -1490,39 +1490,39 @@ 
           $this->objects[$id]['info']['ColorSpace'] =  $tmp;
           if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
-            case  'indexed':
-              $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
-
-            case 'color-key':
-              $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
-                ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              pre_r($tmp);
-              break;
+                case  'indexed':
+                  $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                  $this->objects[$id]['info']['Mask'] =  $tmp;
+                  break;
+
+                case 'color-key':
+                  $tmp = ' [ '.
+                    $options['transparency']['r'] . ' ' . $options['transparency']['r'] .
+                    $options['transparency']['g'] . ' ' . $options['transparency']['g'] .
+                    $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                    ' ] ';
+                  $this->objects[$id]['info']['Mask'] = $tmp;
+                  pre_r($tmp);
+                  break;
               
             }
           }
         } else {
           if  (isset($options['transparency'])) {
             switch ($options['transparency']['type']) {
-            case  'indexed':
-              $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
-              $this->objects[$id]['info']['Mask'] =  $tmp;
-              break;
-
-            case 'color-key':
-              $tmp = ' [ '.
-                $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
-                $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
-                $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
-                ' ] ';
-              $this->objects[$id]['info']['Mask'] = $tmp;
-              break;              
+                case  'indexed':
+                  $tmp = ' [ '.$options['transparency']['data'].' '.$options['transparency']['data'].'] ';
+                  $this->objects[$id]['info']['Mask'] =  $tmp;
+                  break;
+
+                case 'color-key':
+                  $tmp = ' [ '.
+                    $options['transparency']['r'] . ' ' . $options['transparency']['r'] . ' ' .
+                    $options['transparency']['g'] . ' ' . $options['transparency']['g'] . ' ' .
+                    $options['transparency']['b'] . ' ' . $options['transparency']['b'] .
+                    ' ] ';
+                  $this->objects[$id]['info']['Mask'] = $tmp;
+                  break;              
             }
           }
           $this->objects[$id]['info']['ColorSpace'] = '/'.$options['color'];
@@ -1539,22 +1539,22 @@ 
       $this->o_procset($this->procsetObjectId, 'add', 'ImageC');
       break;
 
-    case  'out':
-      $tmp = &$o['data'];
-      $res =  "\n".$id." 0 obj\n<<";
+        case  'out':
+          $tmp = &$o['data'];
+          $res =  "\n".$id." 0 obj\n<<";
 
-      foreach($o['info'] as  $k=>$v) {
-        $res.= "\n/".$k.' '.$v;
-      }
+          foreach($o['info'] as  $k=>$v) {
+            $res.= "\n/".$k.' '.$v;
+          }
 
-      if  ($this->encrypted) {
-        $this->encryptInit($id);
-        $tmp =  $this->ARC4($tmp);
-      }
+          if  ($this->encrypted) {
+            $this->encryptInit($id);
+            $tmp =  $this->ARC4($tmp);
+          }
 
-      $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
+          $res.= "\n/Length ".mb_strlen($tmp, '8bit') .">>\nstream\n".$tmp."\nendstream\nendobj";
 
-      return  $res;
+          return  $res;
     }
   }
 
@@ -1575,29 +1575,29 @@ 
     }
 
     switch  ($action) {
-    case  "new":
-      $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
+        case  "new":
+          $this->objects[$id] =  array('t' => 'extGState',  'info' => $options);
 
-      // Tell the pages about the new resource
-      $this->numStates++;
-      $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
-      break;
+          // Tell the pages about the new resource
+          $this->numStates++;
+          $this->o_pages($this->currentNode,  'extGState',  array("objNum" => $id,  "stateNum" => $this->numStates));
+          break;
 
-    case  "out":
-      $res =
-        "\n" . $id . " 0 obj\n".
-        "<< /Type /ExtGState\n";
+        case  "out":
+          $res =
+            "\n" . $id . " 0 obj\n".
+            "<< /Type /ExtGState\n";
 
-      foreach ($o["info"] as  $parameter => $value) {
-        if  ( !in_array($parameter,  $valid_params))
-          continue;
-        $res.=  "/$parameter $value\n";
-      }
+          foreach ($o["info"] as  $parameter => $value) {
+            if  ( !in_array($parameter,  $valid_params))
+              continue;
+            $res.=  "/$parameter $value\n";
+          }
 
-      $res.=
-        ">>\n".
-        "endobj";
-      return  $res;
+          $res.=
+            ">>\n".
+            "endobj";
+          return  $res;
     }
   }
 
@@ -1611,63 +1611,63 @@ 
     }
 
     switch ($action) {
-    case  'new':
-      // make the new object
-      $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
-      $this->arc4_objnum = $id;
-
-      // figure out the additional paramaters required
-      $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
-      $len =  mb_strlen($options['owner'], '8bit');
-
-      if  ($len>32) {
-        $owner =  substr($options['owner'], 0, 32);
-      } else  if  ($len<32) {
-        $owner =  $options['owner'].substr($pad, 0, 32-$len);
-      } else {
-        $owner =  $options['owner'];
-      }
+        case  'new':
+          // make the new object
+          $this->objects[$id] = array('t'=>'encryption', 'info'=>$options);
+          $this->arc4_objnum = $id;
+
+          // figure out the additional paramaters required
+          $pad =  chr(0x28) .chr(0xBF) .chr(0x4E) .chr(0x5E) .chr(0x4E) .chr(0x75) .chr(0x8A) .chr(0x41) .chr(0x64) .chr(0x00) .chr(0x4E) .chr(0x56) .chr(0xFF) .chr(0xFA) .chr(0x01) .chr(0x08) .chr(0x2E) .chr(0x2E) .chr(0x00) .chr(0xB6) .chr(0xD0) .chr(0x68) .chr(0x3E) .chr(0x80) .chr(0x2F) .chr(0x0C) .chr(0xA9) .chr(0xFE) .chr(0x64) .chr(0x53) .chr(0x69) .chr(0x7A);
+          $len =  mb_strlen($options['owner'], '8bit');
+
+          if  ($len>32) {
+            $owner =  substr($options['owner'], 0, 32);
+          } else  if  ($len<32) {
+            $owner =  $options['owner'].substr($pad, 0, 32-$len);
+          } else {
+            $owner =  $options['owner'];
+          }
 
-      $len =  mb_strlen($options['user'], '8bit');
-      if  ($len>32) {
-        $user =  substr($options['user'], 0, 32);
-      } else  if  ($len<32) {
-        $user =  $options['user'].substr($pad, 0, 32-$len);
-      } else {
-        $user =  $options['user'];
-      }
+          $len =  mb_strlen($options['user'], '8bit');
+          if  ($len>32) {
+            $user =  substr($options['user'], 0, 32);
+          } else  if  ($len<32) {
+            $user =  $options['user'].substr($pad, 0, 32-$len);
+          } else {
+            $user =  $options['user'];
+          }
 
-      $tmp =  $this->md5_16($owner);
-      $okey =  substr($tmp, 0, 5);
-      $this->ARC4_init($okey);
-      $ovalue = $this->ARC4($user);
-      $this->objects[$id]['info']['O'] = $ovalue;
-
-      // now make the u value, phew.
-      $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
-
-      $ukey =  substr($tmp, 0, 5);
-      $this->ARC4_init($ukey);
-      $this->encryptionKey =  $ukey;
-      $this->encrypted = 1;
-      $uvalue = $this->ARC4($pad);
-      $this->objects[$id]['info']['U'] = $uvalue;
-      $this->encryptionKey = $ukey;
-      // initialize the arc4 array
-      break;
+          $tmp =  $this->md5_16($owner);
+          $okey =  substr($tmp, 0, 5);
+          $this->ARC4_init($okey);
+          $ovalue = $this->ARC4($user);
+          $this->objects[$id]['info']['O'] = $ovalue;
+
+          // now make the u value, phew.
+          $tmp =  $this->md5_16($user.$ovalue.chr($options['p']) .chr(255) .chr(255) .chr(255) .$this->fileIdentifier);
+
+          $ukey =  substr($tmp, 0, 5);
+          $this->ARC4_init($ukey);
+          $this->encryptionKey =  $ukey;
+          $this->encrypted = 1;
+          $uvalue = $this->ARC4($pad);
+          $this->objects[$id]['info']['U'] = $uvalue;
+          $this->encryptionKey = $ukey;
+          // initialize the arc4 array
+          break;
 
-    case  'out':
-      $res =  "\n".$id." 0 obj\n<<";
-      $res.= "\n/Filter /Standard";
-      $res.= "\n/V 1";
-      $res.= "\n/R 2";
-      $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
-      $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
-      // and the p-value needs to be converted to account for the twos-complement approach
-      $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
-      $res.= "\n/P ".($o['info']['p']);
-      $res.= "\n>>\nendobj";
-      return  $res;
+        case  'out':
+          $res =  "\n".$id." 0 obj\n<<";
+          $res.= "\n/Filter /Standard";
+          $res.= "\n/V 1";
+          $res.= "\n/R 2";
+          $res.= "\n/O (".$this->filterText($o['info']['O']) .')';
+          $res.= "\n/U (".$this->filterText($o['info']['U']) .')';
+          // and the p-value needs to be converted to account for the twos-complement approach
+          $o['info']['p'] =  (($o['info']['p']^255) +1) *-1;
+          $res.= "\n/P ".($o['info']['p']);
+          $res.= "\n>>\nendobj";
+          return  $res;
     }
   }
 
@@ -1999,112 +1999,112 @@ 
           // then there must be some keyword
           $key =  substr($row, 0, $pos);
           switch  ($key) {
-          case  'FontName':
-          case  'FullName':
-          case  'FamilyName':
-          case  'Weight':
-          case  'ItalicAngle':
-          case  'IsFixedPitch':
-          case  'CharacterSet':
-          case  'UnderlinePosition':
-          case  'UnderlineThickness':
-          case  'Version':
-          case  'EncodingScheme':
-          case  'CapHeight':
-          case  'XHeight':
-          case  'Ascender':
-          case  'Descender':
-          case  'StdHW':
-          case  'StdVW':
-          case  'StartCharMetrics':
-          case  'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font.  Otherwise it's too big.
-            $data[$key] = trim(substr($row, $pos));
-            break;
-
-          case  'FontBBox':
-            $data[$key] = explode(' ', trim(substr($row, $pos)));
-            break;
-
-          case  'C': // Found in AFM files
-            //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
-            $bits = explode(';', trim($row));
-            $dtmp = array();
-
-            foreach($bits as  $bit) {
-              $bits2 =  explode(' ', trim($bit));
-              if  (mb_strlen($bits2[0], '8bit')) {
-                if  (count($bits2) >2) {
-                  $dtmp[$bits2[0]] = array();
-                  for  ($i = 1;$i<count($bits2);$i++) {
-                    $dtmp[$bits2[0]][] = $bits2[$i];
+              case  'FontName':
+              case  'FullName':
+              case  'FamilyName':
+              case  'Weight':
+              case  'ItalicAngle':
+              case  'IsFixedPitch':
+              case  'CharacterSet':
+              case  'UnderlinePosition':
+              case  'UnderlineThickness':
+              case  'Version':
+              case  'EncodingScheme':
+              case  'CapHeight':
+              case  'XHeight':
+              case  'Ascender':
+              case  'Descender':
+              case  'StdHW':
+              case  'StdVW':
+              case  'StartCharMetrics':
+              case  'FontHeightOffset': // OAR - Added so we can offset the height calculation of a Windows font.  Otherwise it's too big.
+                $data[$key] = trim(substr($row, $pos));
+                break;
+
+              case  'FontBBox':
+                $data[$key] = explode(' ', trim(substr($row, $pos)));
+                break;
+
+              case  'C': // Found in AFM files
+                //C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ;
+                $bits = explode(';', trim($row));
+                $dtmp = array();
+
+                foreach($bits as  $bit) {
+                  $bits2 =  explode(' ', trim($bit));
+                  if  (mb_strlen($bits2[0], '8bit')) {
+                    if  (count($bits2) >2) {
+                      $dtmp[$bits2[0]] = array();
+                      for  ($i = 1;$i<count($bits2);$i++) {
+                        $dtmp[$bits2[0]][] = $bits2[$i];
+                      }
+                    } else  if  (count($bits2) == 2) {
+                      $dtmp[$bits2[0]] = $bits2[1];
+                    }
                   }
-                } else  if  (count($bits2) == 2) {
-                  $dtmp[$bits2[0]] = $bits2[1];
                 }
-              }
-            }
 
-            $cc = (int)$dtmp['C'];
-            if  ($cc >= 0) {
-              $data['C'][$dtmp['C']] = $dtmp;
-              $data['C'][$dtmp['N']] = $dtmp;
-            } else {
-              $data['C'][$dtmp['N']] = $dtmp;
-            }
+                $cc = (int)$dtmp['C'];
+                if  ($cc >= 0) {
+                  $data['C'][$dtmp['C']] = $dtmp;
+                  $data['C'][$dtmp['N']] = $dtmp;
+                } else {
+                  $data['C'][$dtmp['N']] = $dtmp;
+                }
 
-            if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-              $data['MissingWidth'] = $width;
-            }
+                if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                  $data['MissingWidth'] = $width;
+                }
             
-            break;
-
-          case  'U': // Found in UFM files
-            if ($data['isUnicode']) {
-              // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
-              $bits = explode(';', trim($row));
-              $dtmp = array();
-
-              foreach($bits as  $bit) {
-                $bits2 =  explode(' ', trim($bit));
-                if  (mb_strlen($bits2[0], '8bit')) {
-                  if  (count($bits2) >2) {
-                    $dtmp[$bits2[0]] = array();
-                    for  ($i = 1;$i<count($bits2);$i++) {
-                      $dtmp[$bits2[0]][] = $bits2[$i];
+                break;
+
+              case  'U': // Found in UFM files
+                if ($data['isUnicode']) {
+                  // U 827 ; WX 0 ; N squaresubnosp ; G 675 ;
+                  $bits = explode(';', trim($row));
+                  $dtmp = array();
+
+                  foreach($bits as  $bit) {
+                    $bits2 =  explode(' ', trim($bit));
+                    if  (mb_strlen($bits2[0], '8bit')) {
+                      if  (count($bits2) >2) {
+                        $dtmp[$bits2[0]] = array();
+                        for  ($i = 1;$i<count($bits2);$i++) {
+                          $dtmp[$bits2[0]][] = $bits2[$i];
+                        }
+                      } else  if  (count($bits2) == 2) {
+                        $dtmp[$bits2[0]] = $bits2[1];
+                      }
                     }
-                  } else  if  (count($bits2) == 2) {
-                    $dtmp[$bits2[0]] = $bits2[1];
                   }
-                }
-              }
 
-              $cc = (int)$dtmp['U'];
-              $glyph = $dtmp['G'];
-              $width = $dtmp['WX'];
-              if  ($cc >= 0) {
-                // Set values in CID to GID map
-                if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
-                  $cidtogid[$cc*2] = chr($glyph >> 8);
-                  $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
-                }
+                  $cc = (int)$dtmp['U'];
+                  $glyph = $dtmp['G'];
+                  $width = $dtmp['WX'];
+                  if  ($cc >= 0) {
+                    // Set values in CID to GID map
+                    if ($cc >= 0 && $cc < 0xFFFF && $glyph) {
+                      $cidtogid[$cc*2] = chr($glyph >> 8);
+                      $cidtogid[$cc*2 + 1] = chr($glyph & 0xFF);
+                    }
 
-                $data['C'][$dtmp['U']] = $dtmp;
-                $data['C'][$dtmp['N']] = $dtmp;
-              } else {
-                $data['C'][$dtmp['N']] = $dtmp;
-              }
+                    $data['C'][$dtmp['U']] = $dtmp;
+                    $data['C'][$dtmp['N']] = $dtmp;
+                  } else {
+                    $data['C'][$dtmp['N']] = $dtmp;
+                  }
               
-              if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
-                $data['MissingWidth'] = $width;
-              }
-            }
-            break;
+                  if  (!isset($data['MissingWidth']) && $cc == -1 && $dtmp['N'] === '.notdef') {
+                    $data['MissingWidth'] = $width;
+                  }
+                }
+                break;
 
-          case  'KPX':
-            //KPX Adieresis yacute -40
-            $bits = explode(' ', trim($row));
-            $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
-            break;
+              case  'KPX':
+                //KPX Adieresis yacute -40
+                $bits = explode(' ', trim($row));
+                $data['KPX'][$bits[1]][$bits[2]] = $bits[3];
+                break;
           }
         }
       }
@@ -3108,163 +3108,163 @@ 
     if  ($text[$j] === '<') {
       $j++;
       switch ($text[$j]) {
-      case  '/':
-        $j++;
-        if  (mb_strlen($text) <=  $j) {
-          return  $directive;
-        }
+          case  '/':
+            $j++;
+            if  (mb_strlen($text) <=  $j) {
+              return  $directive;
+            }
 
-        switch ($text[$j]) {
-        case  'b':
-        case  'i':
-          $j++;
-          if  ($text[$j] === '>') {
-            $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
+            switch ($text[$j]) {
+                case  'b':
+                case  'i':
+                  $j++;
+                  if  ($text[$j] === '>') {
+                    $p =  mb_strrpos($this->currentTextState, $text[$j-1]);
 
-            if  ($p !==  false) {
-              // then there is one to remove
-              $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
-            }
+                    if  ($p !==  false) {
+                      // then there is one to remove
+                      $this->currentTextState =  mb_substr($this->currentTextState, 0, $p) .substr($this->currentTextState, $p+1);
+                    }
 
-            $directive =  $j-$i+1;
-          }
-          break;
+                    $directive =  $j-$i+1;
+                  }
+                  break;
+
+                case  'c':
+                  // this this might be a callback function
+                  $j++;
+                  $k =  mb_strpos($text, '>', $j);
+
+                  if  ($k !==  false &&  $text[$j] === ':') {
+                    // then this will be treated as a callback directive
+                    $directive =  $k-$i+1;
+                    $f =  0;
+                    // split the remainder on colons to get the function name and the paramater
+                    $tmp =  mb_substr($text, $j+1, $k-$j-1);
+                    $b1 =  mb_strpos($tmp, ':');
+
+                    if  ($b1 !==  false) {
+                      $func =  mb_substr($tmp, 0, $b1);
+                      $parm =  mb_substr($tmp, $b1+1);
+                    } else {
+                      $func =  $tmp;
+                      $parm =  '';
+                    }
 
-        case  'c':
-          // this this might be a callback function
-          $j++;
-          $k =  mb_strpos($text, '>', $j);
-
-          if  ($k !==  false &&  $text[$j] === ':') {
-            // then this will be treated as a callback directive
-            $directive =  $k-$i+1;
-            $f =  0;
-            // split the remainder on colons to get the function name and the paramater
-            $tmp =  mb_substr($text, $j+1, $k-$j-1);
-            $b1 =  mb_strpos($tmp, ':');
-
-            if  ($b1 !==  false) {
-              $func =  mb_substr($tmp, 0, $b1);
-              $parm =  mb_substr($tmp, $b1+1);
-            } else {
-              $func =  $tmp;
-              $parm =  '';
-            }
+                    if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+                      $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->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_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];
+                        $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
+                          foreach($ret as  $rk => $rv) {
+                            switch ($rk) {
+                                case  'x':
+                                case  'y':
+                                  $$rk =  $rv;
+                                  break;
+                            }
+                      }
+                    }
 
-            if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-              $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->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_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];
-                $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
-                  foreach($ret as  $rk => $rv) {
-                    switch ($rk) {
-                    case  'x':
-                    case  'y':
-                      $$rk =  $rv;
-                      break;
+                    // 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;
                     }
                   }
                 }
-
-                // 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;
-                }
               }
-            }
-          }
-          break;
+              break;
         }
         break;
 
-      case  'b':
-      case  'i':
-        $j++;
-        if  ($text[$j] === '>') {
-          $this->currentTextState.=  $text[$j-1];
-          $directive =  $j-$i+1;
-        }
-        break;
+          case  'b':
+          case  'i':
+            $j++;
+            if  ($text[$j] === '>') {
+              $this->currentTextState.=  $text[$j-1];
+              $directive =  $j-$i+1;
+            }
+            break;
 
-      case  'C':
-        $noClose =  1;
-      case  'c':
-        // this this might be a callback function
-        $j++;
-        $k =  mb_strpos($text, '>', $j);
+          case  'C':
+            $noClose =  1;
+          case  'c':
+            // this this might be a callback function
+            $j++;
+            $k =  mb_strpos($text, '>', $j);
 
-        if  ($k !==  false &&  $text[$j] ===  ':') {
-          // then this will be treated as a callback directive
-          $directive =  $k-$i+1;
+            if  ($k !==  false &&  $text[$j] ===  ':') {
+              // then this will be treated as a callback directive
+              $directive =  $k-$i+1;
 
-          $f =  0;
+              $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 =  mb_substr($text, $j+1, $k-$j-1);
-          $b1 =  mb_strpos($tmp, ':');
+              // split the remainder on colons to get the function name and the paramater
+              //          $bits = explode(':',substr($text,$j+1,$k-$j-1));
+              $tmp =  mb_substr($text, $j+1, $k-$j-1);
+              $b1 =  mb_strpos($tmp, ':');
 
-          if  ($b1 !==  false) {
-            $func =  mb_substr($tmp, 0, $b1);
-            $parm =  mb_substr($tmp, $b1+1);
-          } else {
-            $func =  $tmp;
-            $parm =  '';
-          }
-
-          if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
-            $directive =  0;
-          } else {
-            // only call the function if this is the final call, ie, the one actually doing printing, not measurement
-            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
-              // also add the text height and descender
-              $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
-
-              $info =  array(
-                'x' => $tmp[0], 
-                'y' => $tmp[1], 
-                'angle' => $angle, 
-                'status' => 'start', 
-                'p' => $parm, 
-                'f' => $func, 
-                'height' => $this->getFontHeight($size), 
-                'descender' => $this->getFontDescender($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;
+              if  ($b1 !==  false) {
+                $func =  mb_substr($tmp, 0, $b1);
+                $parm =  mb_substr($tmp, $b1+1);
+              } else {
+                $func =  $tmp;
+                $parm =  '';
               }
 
-              $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
-                foreach($ret as  $rk => $rv) {
-                  switch ($rk) {
-                  case  'x':
-                  case  'y':
-                    $$rk =  $rv;
-                    break;
+              if  (!isset($func) ||  !mb_strlen(trim($func), '8bit')) {
+                $directive =  0;
+              } else {
+                // only call the function if this is the final call, ie, the one actually doing printing, not measurement
+                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
+                  // also add the text height and descender
+                  $tmp =  $this->PRVTgetTextPosition($x, $y, $angle, $size, $wordSpaceAdjust, mb_substr($text, 0, $i));
+
+                  $info =  array(
+                    'x' => $tmp[0], 
+                    'y' => $tmp[1], 
+                    'angle' => $angle, 
+                    'status' => 'start', 
+                    'p' => $parm, 
+                    'f' => $func, 
+                    'height' => $this->getFontHeight($size), 
+                    'descender' => $this->getFontDescender($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;
                   }
+
+                  $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
+                    foreach($ret as  $rk => $rv) {
+                      switch ($rk) {
+                          case  'x':
+                          case  'y':
+                            $$rk =  $rv;
+                            break;
+                      }
                 }
               }
             }
@@ -3471,29 +3471,29 @@ 
    */
   function  PRVTadjustWrapText($text, $actual, $width, &$x, &$adjust, $justification) {
     switch  ($justification) {
-    case  'left':
-      return;
+        case  'left':
+          return;
 
-    case  'right':
-      $x+=  $width-$actual;
-      break;
+        case  'right':
+          $x+=  $width-$actual;
+          break;
 
-    case  'center':
-    case  'centre':
-      $x+=  ($width-$actual) /2;
-      break;
+        case  'center':
+        case  'centre':
+          $x+=  ($width-$actual) /2;
+          break;
 
-    case  'full':
-      // count the number of words
-      $words =  explode(' ', $text);
-      $nspaces =  count($words) -1;
+        case  'full':
+          // count the number of words
+          $words =  explode(' ', $text);
+          $nspaces =  count($words) -1;
 
-      if  ($nspaces>0) {
-        $adjust =  ($width-$actual) /$nspaces;
-      } else {
-        $adjust =  0;
-      }
-      break;
+          if  ($nspaces>0) {
+            $adjust =  ($width-$actual) /$nspaces;
+          } else {
+            $adjust =  0;
+          }
+          break;
     }
   }
 
@@ -3766,48 +3766,48 @@ 
     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';
-
-      case  'add':
-        if  (isset($this->objects[$this->currentContents]['onPage'])) {
-          // then the destination contents is the primary for the page
-          // (though this object is actually added to that page)
-          $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
-        }
-        break;
+          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';
+
+          case  'add':
+            if  (isset($this->objects[$this->currentContents]['onPage'])) {
+              // then the destination contents is the primary for the page
+              // (though this object is actually added to that page)
+              $this->o_page($this->objects[$this->currentContents]['onPage'], 'content', $id);
+            }
+            break;
 
-      case  'even':
-        $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  'even':
+            $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->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->addObject($id);
+              // hacky huh :)
+            }
+            break;
 
-      case  'next':
-        $this->addLooseObjects[$id] =  'all';
-        break;
+          case  'next':
+            $this->addLooseObjects[$id] =  'all';
+            break;
 
-      case  'nexteven':
-        $this->addLooseObjects[$id] =  'even';
-        break;
+          case  'nexteven':
+            $this->addLooseObjects[$id] =  'even';
+            break;
 
-      case  'nextodd':
-        $this->addLooseObjects[$id] =  'odd';
-        break;
+          case  'nextodd':
+            $this->addLooseObjects[$id] =  'odd';
+            break;
       }
     }
   }
@@ -4025,105 +4025,105 @@ 
         $chunkType =  mb_substr($data, $p+4, 4, '8bit');
         //      echo $chunkType.' - '.$chunkLen.'<br>';
         switch ($chunkType) {
-        case  'IHDR':
-          // this is where all the file information comes from
-          $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
-          $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
-          $info['bitDepth'] =  ord($data[$p+16]);
-          $info['colorType'] =  ord($data[$p+17]);
-          $info['compressionMethod'] =  ord($data[$p+18]);
-          $info['filterMethod'] =  ord($data[$p+19]);
-          $info['interlaceMethod'] =  ord($data[$p+20]);
-
-          //print_r($info);
-          $haveHeader =  1;
-          if  ($info['compressionMethod'] !=  0) {
-            $error =  1;
-
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
-
-            $errormsg =  'unsupported compression method';
-          }
+            case  'IHDR':
+              // this is where all the file information comes from
+              $info['width'] =  $this->PRVT_getBytes($data, $p+8, 4);
+              $info['height'] =  $this->PRVT_getBytes($data, $p+12, 4);
+              $info['bitDepth'] =  ord($data[$p+16]);
+              $info['colorType'] =  ord($data[$p+17]);
+              $info['compressionMethod'] =  ord($data[$p+18]);
+              $info['filterMethod'] =  ord($data[$p+19]);
+              $info['interlaceMethod'] =  ord($data[$p+20]);
+
+              //print_r($info);
+              $haveHeader =  1;
+              if  ($info['compressionMethod'] !=  0) {
+                $error =  1;
+
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported compression method '.$file.']';
+
+                $errormsg =  'unsupported compression method';
+              }
 
-          if  ($info['filterMethod'] !=  0) {
-            $error =  1;
+              if  ($info['filterMethod'] !=  0) {
+                $error =  1;
 
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported filter method '.$file.']';
 
-            $errormsg =  'unsupported filter method';
-          }
-          break;
+                $errormsg =  'unsupported filter method';
+              }
+              break;
 
-        case  'PLTE':
-          $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            case  'PLTE':
+              $pdata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+              break;
 
-        case  'IDAT':
-          $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
-          break;
+            case  'IDAT':
+              $idata.=  mb_substr($data, $p+8, $chunkLen, '8bit');
+              break;
 
-        case  'tRNS':
-          //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
-          //print "tRNS found, color type = ".$info['colorType']."\n";
-          $transparency =  array();
+            case  'tRNS':
+              //this chunk can only occur once and it must occur after the PLTE chunk and before IDAT chunk
+              //print "tRNS found, color type = ".$info['colorType']."\n";
+              $transparency =  array();
 
-          if  ($info['colorType'] ==  3) {
-            // indexed color, rbg
-            /* corresponding to entries in the plte chunk
+              if  ($info['colorType'] ==  3) {
+                // indexed color, rbg
+                /* corresponding to entries in the plte chunk
              Alpha for palette index 0: 1 byte
              Alpha for palette index 1: 1 byte
              ...etc...
             */
-            // 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)
-            $transparency['type'] =  'indexed';
-            $numPalette =  mb_strlen($pdata, '8bit')/3;
-            $trans =  0;
-
-            for  ($i =  $chunkLen;$i >=  0;$i--) {
-              if  (ord($data[$p+8+$i]) ==  0) {
-                $trans =  $i;
-              }
-            }
+                // 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)
+                $transparency['type'] =  'indexed';
+                $numPalette =  mb_strlen($pdata, '8bit')/3;
+                $trans =  0;
+
+                for  ($i =  $chunkLen;$i >=  0;$i--) {
+                  if  (ord($data[$p+8+$i]) ==  0) {
+                    $trans =  $i;
+                  }
+                }
 
-            $transparency['data'] =  $trans;
-          } elseif ($info['colorType'] ==  0) {
-            // grayscale
-            /* corresponding to entries in the plte chunk
+                $transparency['data'] =  $trans;
+              } elseif ($info['colorType'] ==  0) {
+                // grayscale
+                /* corresponding to entries in the plte chunk
              Gray: 2 bytes, range 0 .. (2^bitdepth)-1
             */
-            //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
-            $transparency['type'] =  'indexed';
+                //            $transparency['grayscale'] = $this->PRVT_getBytes($data,$p+8,2); // g = grayscale
+                $transparency['type'] =  'indexed';
 
-            $transparency['data'] =  ord($data[$p+8+1]);
-          } elseif ($info['colorType'] ==  2) {
-            // truecolor
-            /* corresponding to entries in the plte chunk
+                $transparency['data'] =  ord($data[$p+8+1]);
+              } elseif ($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
             */
-            $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
-            // r from truecolor
-            $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
-            // g from truecolor
-            $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
-            // b from truecolor
-
-            $transparency['type'] = 'color-key';
+                $transparency['r'] =  $this->PRVT_getBytes($data, $p+8, 2);
+                // r from truecolor
+                $transparency['g'] =  $this->PRVT_getBytes($data, $p+10, 2);
+                // g from truecolor
+                $transparency['b'] =  $this->PRVT_getBytes($data, $p+12, 2);
+                // b from truecolor
+
+                $transparency['type'] = 'color-key';
             
-          } else {
-            //unsupported transparency type
-            //debugpng
-            if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
-          }
-          // KS End new code
-          break;
+              } else {
+                //unsupported transparency type
+                //debugpng
+                if (DEBUGPNG) print '[addPngFromFile unsupported transparency type '.$file.']';
+              }
+              // KS End new code
+              break;
 
-        default:
-          break;
+            default:
+              break;
         }
 
         $p+=  $chunkLen+12;
@@ -4168,20 +4168,20 @@ 
         $errormsg =  'transparancey alpha channel not supported, transparency only supported for palette images.';
       } else {
         switch  ($info['colorType']) {
-        case  3:
-          $color =  'DeviceRGB';
-          $ncolor =  1;
-          break;
+            case  3:
+              $color =  'DeviceRGB';
+              $ncolor =  1;
+              break;
 
-        case  2:
-          $color =  'DeviceRGB';
-          $ncolor =  3;
-          break;
+            case  2:
+              $color =  'DeviceRGB';
+              $ncolor =  3;
+              break;
 
-        case  0:
-          $color =  'DeviceGray';
-          $ncolor =  1;
-          break;
+            case  0:
+              $color =  'DeviceGray';
+              $ncolor =  1;
+              break;
         }
       }
     }
@@ -4469,48 +4469,48 @@ 
    */
   function  transaction($action) {
     switch  ($action) {
-    case  'start':
-      // store all the data away into the checkpoint variable
-      $data =  get_object_vars($this);
-      $this->checkpoint =  $data;
-      unset($data);
-      break;
+        case  'start':
+          // store all the data away into the checkpoint variable
+          $data =  get_object_vars($this);
+          $this->checkpoint =  $data;
+          unset($data);
+          break;
 
-    case  'commit':
-      if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
-        $tmp =  $this->checkpoint['checkpoint'];
-        $this->checkpoint =  $tmp;
-        unset($tmp);
-      } else {
-        $this->checkpoint =  '';
-      }
-      break;
+        case  'commit':
+          if  (is_array($this->checkpoint) &&  isset($this->checkpoint['checkpoint'])) {
+            $tmp =  $this->checkpoint['checkpoint'];
+            $this->checkpoint =  $tmp;
+            unset($tmp);
+          } else {
+            $this->checkpoint =  '';
+          }
+          break;
 
-    case  'rewind':
-      // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
-      if  (is_array($this->checkpoint)) {
-        // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
+        case  'rewind':
+          // do not destroy the current checkpoint, but move us back to the state then, so that we can try again
+          if  (is_array($this->checkpoint)) {
+            // can only abort if were inside a checkpoint
+            $tmp =  $this->checkpoint;
 
-        foreach ($tmp as  $k => $v) {
-          if  ($k !==  'checkpoint') {
-            $this->$k =  $v;
+            foreach ($tmp as  $k => $v) {
+              if  ($k !==  'checkpoint') {
+                $this->$k =  $v;
+              }
+            }
+            unset($tmp);
           }
-        }
-        unset($tmp);
-      }
-      break;
+          break;
 
-    case  'abort':
-      if  (is_array($this->checkpoint)) {
-        // can only abort if were inside a checkpoint
-        $tmp =  $this->checkpoint;
-        foreach ($tmp as  $k => $v) {
-          $this->$k =  $v;
-        }
-        unset($tmp);
-      }
-      break;
+        case  'abort':
+          if  (is_array($this->checkpoint)) {
+            // can only abort if were inside a checkpoint
+            $tmp =  $this->checkpoint;
+            foreach ($tmp as  $k => $v) {
+              $this->$k =  $v;
+            }
+            unset($tmp);
+          }
+          break;
     }
   }
 }

main/inc/lib/phpdocx/lib/log4php/helpers/LoggerPatternParser.php

Switch Indentation +13 added lines, -13 removed lines

@@ -186,19 +186,19 @@
 				case self::CONVERTER_STATE:
 						$this->currentLiteral .= $c;
 						switch($c) {
-						case '-':
-							$this->formattingInfo->leftAlign = true;
-							break;
-						case '.':
-							$this->state = self::DOT_STATE;
-								break;
-						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-								$this->formattingInfo->min = ord($c) - ord('0');
-								$this->state = self::MIN_STATE;
-							} else {
-								$this->finalizeConverter($c);
-							}
+						    case '-':
+							    $this->formattingInfo->leftAlign = true;
+							    break;
+						    case '.':
+							    $this->state = self::DOT_STATE;
+								    break;
+						    default:
+							    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+								    $this->formattingInfo->min = ord($c) - ord('0');
+								    $this->state = self::MIN_STATE;
+							    } else {
+								    $this->finalizeConverter($c);
+							    }
 						} // switch
 					break;
 				case self::MIN_STATE:

main/auth/courses.php

Switch Indentation +135 added lines, -135 removed lines

@@ -171,28 +171,52 @@ 
 }
 
 switch ($action) {
-    case 'subscribe_user_with_password':
-        $courses_controller->subscribe_user(
-            isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
-            isset($_POST['search_term']) ? $_POST['search_term'] : '',
-            isset($_POST['category_code']) ? $_POST['category_code'] : ''
-        );
-        break;
-    case 'createcoursecategory':
-        $courses_controller->categories_list($action);
-        break;
-    case 'deletecoursecategory':
-        $courses_controller->courses_list($action);
-        break;
-    case 'sortmycourses':
-        $courses_controller->courses_list($action);
-        break;
-    case 'subscribe':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
+        case 'subscribe_user_with_password':
+            $courses_controller->subscribe_user(
+                isset($_POST['subscribe_user_with_password']) ? $_POST['subscribe_user_with_password'] : '',
+                isset($_POST['search_term']) ? $_POST['search_term'] : '',
+                isset($_POST['category_code']) ? $_POST['category_code'] : ''
+            );
+            break;
+        case 'createcoursecategory':
+            $courses_controller->categories_list($action);
+            break;
+        case 'deletecoursecategory':
+            $courses_controller->courses_list($action);
+            break;
+        case 'sortmycourses':
+            $courses_controller->courses_list($action);
+            break;
+        case 'subscribe':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            if (!CoursesAndSessionsCatalog::is(CATALOG_SESSIONS)) {
+                $courses_controller->courses_categories(
+                    $action,
+                    $categoryCode,
+                    null,
+                    null,
+                    null,
+                    $limit
+                );
+            } else {
+                header('Location: ' . api_get_self());
+            }
+            break;
+        case 'display_random_courses':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->courses_categories($action);
+            break;
+        case 'display_courses':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
             $courses_controller->courses_categories(
                 $action,
                 $categoryCode,
@@ -201,126 +225,102 @@ 
                 null,
                 $limit
             );
-        } else {
-            header('Location: ' . api_get_self());
-        }
-        break;
-    case 'display_random_courses':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->courses_categories($action);
-        break;
-    case 'display_courses':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->courses_categories(
-            $action,
-            $categoryCode,
-            null,
-            null,
-            null,
-            $limit
-        );
-        break;
-    case 'display_sessions':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionsList($action, $nameTools, $limit);
-        break;
-    case 'subscribe_to_session':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $userId = api_get_user_id();
-        $confirmed = isset($_GET['confirm']);
-        $sessionId = intval($_GET['session_id']);
-
-        if (empty($userId)) {
-            api_not_allowed();
-            exit;
-        }
-
-        if (!$confirmed) {
-            $template = new Template(null, false, false, false, false, false);
-            $template->assign('session_id', $sessionId);
-
-            $layout = $template->get_template('auth/confirm_session_subscription.tpl');
-
-            echo $template->fetch($layout);
-            exit;
-        }
-
-        $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
-        if ($registrationAllowed === 'true') {
-            $entityManager = Database::getManager();
-            $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
-
-            $sequences = $repository->getRequirements(
-                $sessionId,
-                SequenceResource::SESSION_TYPE
-            );
+            break;
+        case 'display_sessions':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionsList($action, $nameTools, $limit);
+            break;
+        case 'subscribe_to_session':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $userId = api_get_user_id();
+            $confirmed = isset($_GET['confirm']);
+            $sessionId = intval($_GET['session_id']);
 
-            if (count($sequences) > 0) {
-                $requirementsData = SequenceResourceManager::checkRequirementsForUser(
-                    $sequences,
-                    SequenceResource::SESSION_TYPE,
-                    $userId
+            if (empty($userId)) {
+                api_not_allowed();
+                exit;
+            }
+
+            if (!$confirmed) {
+                $template = new Template(null, false, false, false, false, false);
+                $template->assign('session_id', $sessionId);
+
+                $layout = $template->get_template('auth/confirm_session_subscription.tpl');
+
+                echo $template->fetch($layout);
+                exit;
+            }
+
+            $registrationAllowed = api_get_setting('catalog_allow_session_auto_subscription');
+            if ($registrationAllowed === 'true') {
+                $entityManager = Database::getManager();
+                $repository = $entityManager->getRepository('ChamiloCoreBundle:SequenceResource');
+
+                $sequences = $repository->getRequirements(
+                    $sessionId,
+                    SequenceResource::SESSION_TYPE
                 );
 
-                $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
+                if (count($sequences) > 0) {
+                    $requirementsData = SequenceResourceManager::checkRequirementsForUser(
+                        $sequences,
+                        SequenceResource::SESSION_TYPE,
+                        $userId
+                    );
+
+                    $continueWithSubscription = SequenceResourceManager::checkSequenceAreCompleted($requirementsData);
 
-                if (!$continueWithSubscription) {
-                    header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
-                    exit;
+                    if (!$continueWithSubscription) {
+                        header('Location: ' .  api_get_path(WEB_CODE_PATH) . 'auth/courses.php');
+                        exit;
+                    }
                 }
-            }
 
-            SessionManager::suscribe_users_to_session(
-                $_GET['session_id'],
-                array($userId),
-                SESSION_VISIBLE_READ_ONLY,
-                false
-            );
+                SessionManager::suscribe_users_to_session(
+                    $_GET['session_id'],
+                    array($userId),
+                    SESSION_VISIBLE_READ_ONLY,
+                    false
+                );
 
-            $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
-            $count = count($coursesList);
-            $url = '';
-
-            if ($count <= 0) {
-                // no course in session -> return to catalog
-                $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
-            } elseif ($count == 1) {
-                // only one course, so redirect directly to this course
-                foreach ($coursesList as $course) {
-                    $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                $coursesList = SessionManager::get_course_list_by_session_id($_GET['session_id']);
+                $count = count($coursesList);
+                $url = '';
+
+                if ($count <= 0) {
+                    // no course in session -> return to catalog
+                    $url = api_get_path(WEB_CODE_PATH) . 'auth/courses.php';
+                } elseif ($count == 1) {
+                    // only one course, so redirect directly to this course
+                    foreach ($coursesList as $course) {
+                        $url = api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . intval($_GET['session_id']);
+                    }
+                } else {
+                    $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
                 }
-            } else {
-                $url = api_get_path(WEB_CODE_PATH) . 'session/index.php?session_id=' . intval($_GET['session_id']);
+                header('Location: ' . $url);
+                exit;
             }
-            header('Location: ' . $url);
-            exit;
-        }
-        //else show error message?
-        break;
-    case 'search_tag':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionsListByCoursesTag($limit);
-        break;
-    case 'search_session':
-        if (!$user_can_view_page) {
-            api_not_allowed(true);
-        }
-
-        $courses_controller->sessionListBySearch($limit);
-        break;
+            //else show error message?
+            break;
+        case 'search_tag':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionsListByCoursesTag($limit);
+            break;
+        case 'search_session':
+            if (!$user_can_view_page) {
+                api_not_allowed(true);
+            }
+
+            $courses_controller->sessionListBySearch($limit);
+            break;
 }