Changeset 1654 for sandbox/filemanager/tp/dompdf/include/frame.cls.php

Timestamp:

11/17/09 09:02:41 (15 years ago)

Author:

amuller

Message:

Ticket #597 - melhoria no modulo gerenciador de arquivos

File:

• sandbox/filemanager/tp/dompdf/include/frame.cls.php (modified) (8 diffs)

sandbox/filemanager/tp/dompdf/include/frame.cls.php

@@ -38 +38 @@
  */
 
-/* $Id: frame.cls.php,v 1.11 2006/07/07 21:31:03 benjcarson Exp $ */
+/* $Id: frame.cls.php 186 2009-10-19 22:42:06Z eclecticgeek@gmail.com $ */
 
 /**
@@ -69 +69 @@
   protected $_id;
 
+  /**
+   * Unique id counter
+   */
+  static protected $ID_COUNTER = 0;
+  
   /**
    * This frame's calculated style
@@ -167 +172 @@
     $this->_decorator = null;
 
-    $this->set_id( uniqid(rand()) );
+    $this->set_id( self::$ID_COUNTER++ );
   }
 
@@ -288 +293 @@
     $x = $this->_position["x"] +
       $this->_style->length_in_pt(array($this->_style->margin_left,
-                                $this->_style->border_left_width),
-                          $this->_containing_block["w"]);
+                                        $this->_style->border_left_width),
+                                  $this->_containing_block["w"]);
     $y = $this->_position["y"] +
       $this->_style->length_in_pt(array($this->_style->margin_top,
@@ -366 +371 @@
   
   function set_containing_block($x = null, $y = null, $w = null, $h = null) {
-    if ( is_array($x) ) 
-      extract($x);
+    if ( is_array($x) ){
+                foreach($x AS $key => $val){
+                        $$key = $val;
+                }
+    }
     
     if (is_numeric($x)) {
@@ -570 +578 @@
 
     // Skip empty text frames
-    if ( $this->_node->nodeName == "#text" &&
-         preg_replace("/\s/", "", $this->_node->data) === "" )
-      return "";
+//     if ( $this->_node->nodeName == "#text" &&
+//          preg_replace("/\s/", "", $this->_node->data) === "" )
+//       return "";
     
     
     $str = "<b>" . $this->_node->nodeName . ":</b><br/>";
-    $str .= (string)$this->_node . "<br/>";
+    //$str .= spl_object_hash($this->_node) . "<br/>";
     $str .= "Id: " .$this->get_id() . "<br/>";
     $str .= "Class: " .get_class($this) . "<br/>";
@@ -587 +595 @@
     if ( $this->_parent )
       $str .= "\nParent:" . $this->_parent->_node->nodeName .
-        " (" . (string)$this->_parent->_node . ") " .
+        " (" . spl_object_hash($this->_parent->_node) . ") " .
         "<br/>";
 
     if ( $this->_prev_sibling )
       $str .= "Prev: " . $this->_prev_sibling->_node->nodeName .
-        " (" . (string)$this->_prev_sibling->_node . ") " .
+        " (" . spl_object_hash($this->_prev_sibling->_node) . ") " .
         "<br/>";
 
     if ( $this->_next_sibling )
       $str .= "Next: " . $this->_next_sibling->_node->nodeName .
-        " (" . (string)$this->_next_sibling->_node . ") " .
+        " (" . spl_object_hash($this->_next_sibling->_node) . ") " .
         "<br/>";
 
@@ -619 +627 @@
           if ($frame instanceof Text_Frame_Decorator) {
             $str .= "\ntext: ";          
-            $str .= htmlspecialchars($frame->get_text());
+            $str .= "'". htmlspecialchars($frame->get_text()) ."'";
           } else {
-            $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . (string)$frame->get_node() . ")";
+            $str .= "\nBlock: " . $frame->get_node()->nodeName . " (" . spl_object_hash($frame->get_node()) . ")";
           }
         }