MDL-22537 new html purifier backported to stable, unfortunately PHP5 only

lib/htmlpurifier/HTMLPurifier/AttrDef/HTML/Pixels.php

@@ -1,21 +1,19 @@
 <?php
 
-require_once 'HTMLPurifier/AttrDef.php';
-
 /**
  * Validates an integer representation of pixels according to the HTML spec.
  */
 class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
 {
-    
-    var $max;
-    
-    function HTMLPurifier_AttrDef_HTML_Pixels($max = null) {
+
+    protected $max;
+
+    public function __construct($max = null) {
         $this->max = $max;
     }
-    
-    function validate($string, $config, &$context) {
-        
+
+    public function validate($string, $config, $context) {
+
         $string = trim($string);
         if ($string === '0') return $string;
         if ($string === '')  return false;
@@ -25,25 +23,26 @@ class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
         }
         if (!is_numeric($string)) return false;
         $int = (int) $string;
-        
+
         if ($int < 0) return '0';
-        
+
         // upper-bound value, extremely high values can
         // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
         // WARNING, above link WILL crash you if you're using Windows
-        
+
         if ($this->max !== null && $int > $this->max) return (string) $this->max;
-        
+
         return (string) $int;
-        
+
     }
-    
-    function make($string) {
+
+    public function make($string) {
         if ($string === '') $max = null;
         else $max = (int) $string;
         $class = get_class($this);
         return new $class($max);
     }
-    
+
 }
 
+// vim: et sw=4 sts=4