Changeset 6057 for trunk/filemanager

Timestamp:

04/27/12 09:17:30 (12 years ago)

Author:

marcosw

Message:

Ticket #2398 - Compatibilizacao com PHP-5.3 em alguns módulos do expresso

Location:

trunk/filemanager/tp/dompdf

Files:

• dompdf.php (modified) (1 diff)
• include/block_frame_decorator.cls.php (modified) (1 diff)
• include/dompdf.cls.php (modified) (1 diff)
• include/stylesheet.cls.php (modified) (2 diffs)
• include/text_frame_reflower.cls.php (modified) (3 diffs)

trunk/filemanager/tp/dompdf/dompdf.php

@@ -229 +229 @@
 
   if ( isset($opts['t']) ) {
-    $arr = split(',',$opts['t']);
+    $arr = preg_split('/,/',$opts['t']);
     $types = array();
     foreach ($arr as $type)

trunk/filemanager/tp/dompdf/include/block_frame_decorator.cls.php

@@ -186 +186 @@
 
     if ( $frame->get_node()->nodeName == "#text")
-      $this->_lines[$this->_cl]["wc"] += count(preg_split("/\s+/", $frame->get_text()));
+      $this->_lines[$this->_cl]["wc"] += count(preg_split('/\s+/', $frame->get_text()));
 
     $this->_lines[$this->_cl]["w"] += $w;

trunk/filemanager/tp/dompdf/include/dompdf.cls.php

@@ -363 +363 @@
         //Check if the css file is for an accepted media type
         //media not given then always valid
-        $formedialist = preg_split("/[\s\n,]/", $link->getAttribute("media"),-1, PREG_SPLIT_NO_EMPTY);
+        $formedialist = preg_split('/[\s\n,]/', $link->getAttribute("media"),-1, PREG_SPLIT_NO_EMPTY);
         if ( count($formedialist) > 0 ) {
           $accept = false;

trunk/filemanager/tp/dompdf/include/stylesheet.cls.php

@@ -357 +357 @@
 
     // Parse the selector
-    //$s = preg_split("/([ :>.#+])/", $selector, -1, PREG_SPLIT_DELIM_CAPTURE);
+    //$s = preg_split('/([ :>.#+])/', $selector, -1, PREG_SPLIT_DELIM_CAPTURE);
 
     $delimiters = array(" ", ">", ".", "#", "+", ":", "[");
@@ -883 +883 @@
    */
   private function _parse_import($url) {
-    $arr = preg_split("/[\s\n,]/", $url,-1, PREG_SPLIT_NO_EMPTY);
+    $arr = preg_split('/[\s\n,]/', $url,-1, PREG_SPLIT_NO_EMPTY);
     $url = array_shift($arr);
     $accept = false;

trunk/filemanager/tp/dompdf/include/text_frame_reflower.cls.php

@@ -363 +363 @@
       // faster than doing a single-pass character by character scan.  Heh,
       // yes I took the time to bench it ;)
-      $words = array_flip(preg_split("/[\s-]+/u",$str, -1, PREG_SPLIT_DELIM_CAPTURE));
+      $words = array_flip(preg_split('/[\s-]+/u',$str, -1, PREG_SPLIT_DELIM_CAPTURE));
       array_walk($words, create_function('&$val,$str',
                                          '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
@@ -371 +371 @@
 
     case "pre":
-      $lines = array_flip(preg_split("/\n/u", $str));
+      $lines = array_flip(preg_split('/\n/u', $str));
       array_walk($lines, create_function('&$val,$str',
                                          '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));
@@ -398 +398 @@
     case "pre-wrap":
       // Find the longest word (i.e. minimum length)
-      $lines = array_flip(preg_split("/\n/", $text));
+      $lines = array_flip(preg_split('/\n/', $text));
       array_walk($lines, create_function('&$val,$str',
                                          '$val = Font_Metrics::get_text_width($str, "'.$font.'", '.$size.', '.$spacing.');'));