@@ -28,20 +28,20 @@ |
||
28 | 28 | 'alt*' => 'Text', |
29 | 29 | // According to the spec, it's Length, but percents can |
30 | 30 | // be abused, so we allow only Pixels. |
31 | - 'height' => 'Pixels#' . $max, |
|
32 | - 'width' => 'Pixels#' . $max, |
|
31 | + 'height' => 'Pixels#'.$max, |
|
32 | + 'width' => 'Pixels#'.$max, |
|
33 | 33 | 'longdesc' => 'URI', |
34 | 34 | 'src*' => new HTMLPurifier_AttrDef_URI(true), // embedded |
35 | 35 | ) |
36 | 36 | ); |
37 | 37 | if ($max === null || $config->get('HTML.Trusted')) { |
38 | - $img->attr['height'] = |
|
39 | - $img->attr['width'] = 'Length'; |
|
38 | + $img->attr[ 'height' ] = |
|
39 | + $img->attr[ 'width' ] = 'Length'; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | // kind of strange, but splitting things up would be inefficient |
43 | - $img->attr_transform_pre[] = |
|
44 | - $img->attr_transform_post[] = |
|
43 | + $img->attr_transform_pre[ ] = |
|
44 | + $img->attr_transform_post[ ] = |
|
45 | 45 | new HTMLPurifier_AttrTransform_ImgRequired(); |
46 | 46 | } |
47 | 47 | } |
@@ -15,9 +15,9 @@ |
||
15 | 15 | $elements = array('a', 'applet', 'form', 'frame', 'iframe', 'img', 'map'); |
16 | 16 | foreach ($elements as $name) { |
17 | 17 | $element = $this->addBlankElement($name); |
18 | - $element->attr['name'] = 'CDATA'; |
|
18 | + $element->attr[ 'name' ] = 'CDATA'; |
|
19 | 19 | if (!$config->get('HTML.Attr.Name.UseCDATA')) { |
20 | - $element->attr_transform_post[] = new HTMLPurifier_AttrTransform_NameSync(); |
|
20 | + $element->attr_transform_post[ ] = new HTMLPurifier_AttrTransform_NameSync(); |
|
21 | 21 | } |
22 | 22 | } |
23 | 23 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | 'value' => 'CDATA', |
66 | 66 | ) |
67 | 67 | ); |
68 | - $input->attr_transform_post[] = new HTMLPurifier_AttrTransform_Input(); |
|
68 | + $input->attr_transform_post[ ] = new HTMLPurifier_AttrTransform_Input(); |
|
69 | 69 | |
70 | 70 | $this->addElement( |
71 | 71 | 'select', |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | 'tabindex' => 'Number', |
113 | 113 | ) |
114 | 114 | ); |
115 | - $textarea->attr_transform_pre[] = new HTMLPurifier_AttrTransform_Textarea(); |
|
115 | + $textarea->attr_transform_pre[ ] = new HTMLPurifier_AttrTransform_Textarea(); |
|
116 | 116 | |
117 | 117 | $button = $this->addElement( |
118 | 118 | 'button', |
@@ -19,14 +19,14 @@ |
||
19 | 19 | public function makeFixes() |
20 | 20 | { |
21 | 21 | $r = array(); |
22 | - $r['table@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
23 | - $r['td@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
24 | - $r['th@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
25 | - $r['tr@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
26 | - $r['thead@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
27 | - $r['tfoot@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
28 | - $r['tbody@background'] = new HTMLPurifier_AttrTransform_Background(); |
|
29 | - $r['table@height'] = new HTMLPurifier_AttrTransform_Length('height'); |
|
22 | + $r[ 'table@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
23 | + $r[ 'td@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
24 | + $r[ 'th@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
25 | + $r[ 'tr@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
26 | + $r[ 'thead@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
27 | + $r[ 'tfoot@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
28 | + $r[ 'tbody@background' ] = new HTMLPurifier_AttrTransform_Background(); |
|
29 | + $r[ 'table@height' ] = new HTMLPurifier_AttrTransform_Length('height'); |
|
30 | 30 | return $r; |
31 | 31 | } |
32 | 32 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | public function makeFixes() |
19 | 19 | { |
20 | 20 | $r = array(); |
21 | - $r['@lang'] = new HTMLPurifier_AttrTransform_Lang(); |
|
21 | + $r[ '@lang' ] = new HTMLPurifier_AttrTransform_Lang(); |
|
22 | 22 | return $r; |
23 | 23 | } |
24 | 24 | } |
@@ -24,8 +24,8 @@ |
||
24 | 24 | // @name for img, a ----------------------------------------------- |
25 | 25 | // Technically, it's allowed even on strict, so we allow authors to use |
26 | 26 | // it. However, it's deprecated in future versions of XHTML. |
27 | - $r['img@name'] = |
|
28 | - $r['a@name'] = new HTMLPurifier_AttrTransform_Name(); |
|
27 | + $r[ 'img@name' ] = |
|
28 | + $r[ 'a@name' ] = new HTMLPurifier_AttrTransform_Name(); |
|
29 | 29 | return $r; |
30 | 30 | } |
31 | 31 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | public function makeFixes() |
19 | 19 | { |
20 | 20 | $r = parent::makeFixes(); |
21 | - $r['blockquote#content_model_type'] = 'strictblockquote'; |
|
21 | + $r[ 'blockquote#content_model_type' ] = 'strictblockquote'; |
|
22 | 22 | return $r; |
23 | 23 | } |
24 | 24 |
@@ -12,17 +12,17 @@ discard block |
||
12 | 12 | |
13 | 13 | // == deprecated tag transforms =================================== |
14 | 14 | |
15 | - $r['font'] = new HTMLPurifier_TagTransform_Font(); |
|
16 | - $r['menu'] = new HTMLPurifier_TagTransform_Simple('ul'); |
|
17 | - $r['dir'] = new HTMLPurifier_TagTransform_Simple('ul'); |
|
18 | - $r['center'] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;'); |
|
19 | - $r['u'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;'); |
|
20 | - $r['s'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;'); |
|
21 | - $r['strike'] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;'); |
|
15 | + $r[ 'font' ] = new HTMLPurifier_TagTransform_Font(); |
|
16 | + $r[ 'menu' ] = new HTMLPurifier_TagTransform_Simple('ul'); |
|
17 | + $r[ 'dir' ] = new HTMLPurifier_TagTransform_Simple('ul'); |
|
18 | + $r[ 'center' ] = new HTMLPurifier_TagTransform_Simple('div', 'text-align:center;'); |
|
19 | + $r[ 'u' ] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:underline;'); |
|
20 | + $r[ 's' ] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;'); |
|
21 | + $r[ 'strike' ] = new HTMLPurifier_TagTransform_Simple('span', 'text-decoration:line-through;'); |
|
22 | 22 | |
23 | 23 | // == deprecated attribute transforms ============================= |
24 | 24 | |
25 | - $r['caption@align'] = |
|
25 | + $r[ 'caption@align' ] = |
|
26 | 26 | new HTMLPurifier_AttrTransform_EnumToCSS( |
27 | 27 | 'align', |
28 | 28 | array( |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | ); |
39 | 39 | |
40 | 40 | // @align for img ------------------------------------------------- |
41 | - $r['img@align'] = |
|
41 | + $r[ 'img@align' ] = |
|
42 | 42 | new HTMLPurifier_AttrTransform_EnumToCSS( |
43 | 43 | 'align', |
44 | 44 | array( |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | ); |
52 | 52 | |
53 | 53 | // @align for table ----------------------------------------------- |
54 | - $r['table@align'] = |
|
54 | + $r[ 'table@align' ] = |
|
55 | 55 | new HTMLPurifier_AttrTransform_EnumToCSS( |
56 | 56 | 'align', |
57 | 57 | array( |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | ); |
63 | 63 | |
64 | 64 | // @align for hr ----------------------------------------------- |
65 | - $r['hr@align'] = |
|
65 | + $r[ 'hr@align' ] = |
|
66 | 66 | new HTMLPurifier_AttrTransform_EnumToCSS( |
67 | 67 | 'align', |
68 | 68 | array( |
@@ -81,30 +81,30 @@ discard block |
||
81 | 81 | $align_lookup = array(); |
82 | 82 | $align_values = array('left', 'right', 'center', 'justify'); |
83 | 83 | foreach ($align_values as $v) { |
84 | - $align_lookup[$v] = "text-align:$v;"; |
|
84 | + $align_lookup[ $v ] = "text-align:$v;"; |
|
85 | 85 | } |
86 | 86 | // }}} |
87 | - $r['h1@align'] = |
|
88 | - $r['h2@align'] = |
|
89 | - $r['h3@align'] = |
|
90 | - $r['h4@align'] = |
|
91 | - $r['h5@align'] = |
|
92 | - $r['h6@align'] = |
|
93 | - $r['p@align'] = |
|
94 | - $r['div@align'] = |
|
87 | + $r[ 'h1@align' ] = |
|
88 | + $r[ 'h2@align' ] = |
|
89 | + $r[ 'h3@align' ] = |
|
90 | + $r[ 'h4@align' ] = |
|
91 | + $r[ 'h5@align' ] = |
|
92 | + $r[ 'h6@align' ] = |
|
93 | + $r[ 'p@align' ] = |
|
94 | + $r[ 'div@align' ] = |
|
95 | 95 | new HTMLPurifier_AttrTransform_EnumToCSS('align', $align_lookup); |
96 | 96 | |
97 | 97 | // @bgcolor for table, tr, td, th --------------------------------- |
98 | - $r['table@bgcolor'] = |
|
99 | - $r['td@bgcolor'] = |
|
100 | - $r['th@bgcolor'] = |
|
98 | + $r[ 'table@bgcolor' ] = |
|
99 | + $r[ 'td@bgcolor' ] = |
|
100 | + $r[ 'th@bgcolor' ] = |
|
101 | 101 | new HTMLPurifier_AttrTransform_BgColor(); |
102 | 102 | |
103 | 103 | // @border for img ------------------------------------------------ |
104 | - $r['img@border'] = new HTMLPurifier_AttrTransform_Border(); |
|
104 | + $r[ 'img@border' ] = new HTMLPurifier_AttrTransform_Border(); |
|
105 | 105 | |
106 | 106 | // @clear for br -------------------------------------------------- |
107 | - $r['br@clear'] = |
|
107 | + $r[ 'br@clear' ] = |
|
108 | 108 | new HTMLPurifier_AttrTransform_EnumToCSS( |
109 | 109 | 'clear', |
110 | 110 | array( |
@@ -116,32 +116,32 @@ discard block |
||
116 | 116 | ); |
117 | 117 | |
118 | 118 | // @height for td, th --------------------------------------------- |
119 | - $r['td@height'] = |
|
120 | - $r['th@height'] = |
|
119 | + $r[ 'td@height' ] = |
|
120 | + $r[ 'th@height' ] = |
|
121 | 121 | new HTMLPurifier_AttrTransform_Length('height'); |
122 | 122 | |
123 | 123 | // @hspace for img ------------------------------------------------ |
124 | - $r['img@hspace'] = new HTMLPurifier_AttrTransform_ImgSpace('hspace'); |
|
124 | + $r[ 'img@hspace' ] = new HTMLPurifier_AttrTransform_ImgSpace('hspace'); |
|
125 | 125 | |
126 | 126 | // @noshade for hr ------------------------------------------------ |
127 | 127 | // this transformation is not precise but often good enough. |
128 | 128 | // different browsers use different styles to designate noshade |
129 | - $r['hr@noshade'] = |
|
129 | + $r[ 'hr@noshade' ] = |
|
130 | 130 | new HTMLPurifier_AttrTransform_BoolToCSS( |
131 | 131 | 'noshade', |
132 | 132 | 'color:#808080;background-color:#808080;border:0;' |
133 | 133 | ); |
134 | 134 | |
135 | 135 | // @nowrap for td, th --------------------------------------------- |
136 | - $r['td@nowrap'] = |
|
137 | - $r['th@nowrap'] = |
|
136 | + $r[ 'td@nowrap' ] = |
|
137 | + $r[ 'th@nowrap' ] = |
|
138 | 138 | new HTMLPurifier_AttrTransform_BoolToCSS( |
139 | 139 | 'nowrap', |
140 | 140 | 'white-space:nowrap;' |
141 | 141 | ); |
142 | 142 | |
143 | 143 | // @size for hr -------------------------------------------------- |
144 | - $r['hr@size'] = new HTMLPurifier_AttrTransform_Length('size', 'height'); |
|
144 | + $r[ 'hr@size' ] = new HTMLPurifier_AttrTransform_Length('size', 'height'); |
|
145 | 145 | |
146 | 146 | // @type for li, ol, ul ------------------------------------------- |
147 | 147 | // {{{ |
@@ -160,17 +160,17 @@ discard block |
||
160 | 160 | $li_types = $ul_types + $ol_types; |
161 | 161 | // }}} |
162 | 162 | |
163 | - $r['ul@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types); |
|
164 | - $r['ol@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true); |
|
165 | - $r['li@type'] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true); |
|
163 | + $r[ 'ul@type' ] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ul_types); |
|
164 | + $r[ 'ol@type' ] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $ol_types, true); |
|
165 | + $r[ 'li@type' ] = new HTMLPurifier_AttrTransform_EnumToCSS('type', $li_types, true); |
|
166 | 166 | |
167 | 167 | // @vspace for img ------------------------------------------------ |
168 | - $r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace'); |
|
168 | + $r[ 'img@vspace' ] = new HTMLPurifier_AttrTransform_ImgSpace('vspace'); |
|
169 | 169 | |
170 | 170 | // @width for hr, td, th ------------------------------------------ |
171 | - $r['td@width'] = |
|
172 | - $r['th@width'] = |
|
173 | - $r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width'); |
|
171 | + $r[ 'td@width' ] = |
|
172 | + $r[ 'th@width' ] = |
|
173 | + $r[ 'hr@width' ] = new HTMLPurifier_AttrTransform_Length('width'); |
|
174 | 174 | |
175 | 175 | return $r; |
176 | 176 | } |
@@ -32,8 +32,8 @@ |
||
32 | 32 | 'src*' => new HTMLPurifier_AttrDef_Enum(array_keys($allowed)) |
33 | 33 | ) |
34 | 34 | ); |
35 | - $script->attr_transform_pre[] = |
|
36 | - $script->attr_transform_post[] = new HTMLPurifier_AttrTransform_ScriptRequired(); |
|
35 | + $script->attr_transform_pre[ ] = |
|
36 | + $script->attr_transform_post[ ] = new HTMLPurifier_AttrTransform_ScriptRequired(); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 |