xpressengine /
xe-core
@@ -18,197 +18,197 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | class Html2Text {
|
| 20 | 20 | |
| 21 | - // Private fields |
|
| 21 | + // Private fields |
|
| 22 | 22 | |
| 23 | - var $iCurrentLine = ""; |
|
| 24 | - var $iCurrentWord = ""; |
|
| 25 | - var $iCurrentWordArray; |
|
| 26 | - var $iCurrentWordIndex; |
|
| 27 | - var $iInScript; |
|
| 28 | - var $iListLevel = 0; |
|
| 29 | - var $iHtmlText; |
|
| 30 | - var $iMaxColumns; |
|
| 31 | - var $iHtmlParser; |
|
| 23 | + var $iCurrentLine = ""; |
|
| 24 | + var $iCurrentWord = ""; |
|
| 25 | + var $iCurrentWordArray; |
|
| 26 | + var $iCurrentWordIndex; |
|
| 27 | + var $iInScript; |
|
| 28 | + var $iListLevel = 0; |
|
| 29 | + var $iHtmlText; |
|
| 30 | + var $iMaxColumns; |
|
| 31 | + var $iHtmlParser; |
|
| 32 | 32 | |
| 33 | - // Constants |
|
| 33 | + // Constants |
|
| 34 | 34 | |
| 35 | - var $TOKEN_BR = 0; |
|
| 36 | - var $TOKEN_P = 1; |
|
| 37 | - var $TOKEN_LI = 2; |
|
| 38 | - var $TOKEN_AFTERLI = 3; |
|
| 39 | - var $TOKEN_UL = 4; |
|
| 40 | - var $TOKEN_ENDUL = 5; |
|
| 35 | + var $TOKEN_BR = 0; |
|
| 36 | + var $TOKEN_P = 1; |
|
| 37 | + var $TOKEN_LI = 2; |
|
| 38 | + var $TOKEN_AFTERLI = 3; |
|
| 39 | + var $TOKEN_UL = 4; |
|
| 40 | + var $TOKEN_ENDUL = 5; |
|
| 41 | 41 | |
| 42 | - function Html2Text ($aHtmlText, $aMaxColumns) {
|
|
| 43 | - $this->iHtmlText = $aHtmlText; |
|
| 44 | - $this->iMaxColumns = $aMaxColumns; |
|
| 45 | - } |
|
| 42 | + function Html2Text ($aHtmlText, $aMaxColumns) {
|
|
| 43 | + $this->iHtmlText = $aHtmlText; |
|
| 44 | + $this->iMaxColumns = $aMaxColumns; |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - function convert() {
|
|
| 48 | - $this->iHtmlParser = new HtmlParser($this->iHtmlText); |
|
| 49 | - $wholeText = ""; |
|
| 50 | - while (($line = $this->getLine()) !== false) {
|
|
| 51 | - $wholeText .= ($line . "\r\n"); |
|
| 52 | - } |
|
| 53 | - return $wholeText; |
|
| 54 | - } |
|
| 47 | + function convert() {
|
|
| 48 | + $this->iHtmlParser = new HtmlParser($this->iHtmlText); |
|
| 49 | + $wholeText = ""; |
|
| 50 | + while (($line = $this->getLine()) !== false) {
|
|
| 51 | + $wholeText .= ($line . "\r\n"); |
|
| 52 | + } |
|
| 53 | + return $wholeText; |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - function getLine() {
|
|
| 57 | - while (true) {
|
|
| 58 | - if (!$this->addWordToLine($this->iCurrentWord)) {
|
|
| 59 | - $retvalue = $this->iCurrentLine; |
|
| 60 | - $this->iCurrentLine = ""; |
|
| 61 | - return $retvalue; |
|
| 62 | - } |
|
| 63 | - $word = $this->getWord(); |
|
| 64 | - if ($word === false) {
|
|
| 65 | - if ($this->iCurrentLine == "") {
|
|
| 66 | - break; |
|
| 67 | - } |
|
| 68 | - $retvalue = $this->iCurrentLine; |
|
| 69 | - $this->iCurrentLine = ""; |
|
| 70 | - $this->iInText = false; |
|
| 71 | - $this->iCurrentWord = ""; |
|
| 72 | - return $retvalue; |
|
| 73 | - } |
|
| 74 | - } |
|
| 75 | - return false; |
|
| 76 | - } |
|
| 56 | + function getLine() {
|
|
| 57 | + while (true) {
|
|
| 58 | + if (!$this->addWordToLine($this->iCurrentWord)) {
|
|
| 59 | + $retvalue = $this->iCurrentLine; |
|
| 60 | + $this->iCurrentLine = ""; |
|
| 61 | + return $retvalue; |
|
| 62 | + } |
|
| 63 | + $word = $this->getWord(); |
|
| 64 | + if ($word === false) {
|
|
| 65 | + if ($this->iCurrentLine == "") {
|
|
| 66 | + break; |
|
| 67 | + } |
|
| 68 | + $retvalue = $this->iCurrentLine; |
|
| 69 | + $this->iCurrentLine = ""; |
|
| 70 | + $this->iInText = false; |
|
| 71 | + $this->iCurrentWord = ""; |
|
| 72 | + return $retvalue; |
|
| 73 | + } |
|
| 74 | + } |
|
| 75 | + return false; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - function addWordToLine ($word) {
|
|
| 79 | - if ($this->iInScript) {
|
|
| 80 | - return true; |
|
| 81 | - } |
|
| 82 | - $prevLine = $this->iCurrentLine; |
|
| 83 | - if ($word === $this->TOKEN_BR) {
|
|
| 84 | - $this->iCurrentWord = ""; |
|
| 85 | - return false; |
|
| 86 | - } |
|
| 87 | - if ($word === $this->TOKEN_P) {
|
|
| 88 | - $this->iCurrentWord = $this->TOKEN_BR; |
|
| 89 | - return false; |
|
| 90 | - } |
|
| 91 | - if ($word === $this->TOKEN_UL) {
|
|
| 92 | - $this->iCurrentWord = $this->TOKEN_BR; |
|
| 93 | - return false; |
|
| 94 | - } |
|
| 95 | - if ($word === $this->TOKEN_ENDUL) {
|
|
| 96 | - $this->iCurrentWord = $this->TOKEN_BR; |
|
| 97 | - return false; |
|
| 98 | - } |
|
| 99 | - if ($word === $this->TOKEN_LI) {
|
|
| 100 | - $this->iCurrentWord = $this->TOKEN_AFTERLI; |
|
| 101 | - return false; |
|
| 102 | - } |
|
| 103 | - $toAdd = $word; |
|
| 104 | - if ($word === $this->TOKEN_AFTERLI) {
|
|
| 105 | - $toAdd = ""; |
|
| 106 | - } |
|
| 107 | - if ($prevLine != "") {
|
|
| 108 | - $prevLine .= " "; |
|
| 109 | - } |
|
| 110 | - else {
|
|
| 111 | - $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI); |
|
| 112 | - } |
|
| 113 | - $candidateLine = $prevLine . $toAdd; |
|
| 114 | - if (strlen ($candidateLine) > $this->iMaxColumns && $prevLine != "") {
|
|
| 115 | - return false; |
|
| 116 | - } |
|
| 117 | - $this->iCurrentLine = $candidateLine; |
|
| 118 | - return true; |
|
| 119 | - } |
|
| 78 | + function addWordToLine ($word) {
|
|
| 79 | + if ($this->iInScript) {
|
|
| 80 | + return true; |
|
| 81 | + } |
|
| 82 | + $prevLine = $this->iCurrentLine; |
|
| 83 | + if ($word === $this->TOKEN_BR) {
|
|
| 84 | + $this->iCurrentWord = ""; |
|
| 85 | + return false; |
|
| 86 | + } |
|
| 87 | + if ($word === $this->TOKEN_P) {
|
|
| 88 | + $this->iCurrentWord = $this->TOKEN_BR; |
|
| 89 | + return false; |
|
| 90 | + } |
|
| 91 | + if ($word === $this->TOKEN_UL) {
|
|
| 92 | + $this->iCurrentWord = $this->TOKEN_BR; |
|
| 93 | + return false; |
|
| 94 | + } |
|
| 95 | + if ($word === $this->TOKEN_ENDUL) {
|
|
| 96 | + $this->iCurrentWord = $this->TOKEN_BR; |
|
| 97 | + return false; |
|
| 98 | + } |
|
| 99 | + if ($word === $this->TOKEN_LI) {
|
|
| 100 | + $this->iCurrentWord = $this->TOKEN_AFTERLI; |
|
| 101 | + return false; |
|
| 102 | + } |
|
| 103 | + $toAdd = $word; |
|
| 104 | + if ($word === $this->TOKEN_AFTERLI) {
|
|
| 105 | + $toAdd = ""; |
|
| 106 | + } |
|
| 107 | + if ($prevLine != "") {
|
|
| 108 | + $prevLine .= " "; |
|
| 109 | + } |
|
| 110 | + else {
|
|
| 111 | + $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI); |
|
| 112 | + } |
|
| 113 | + $candidateLine = $prevLine . $toAdd; |
|
| 114 | + if (strlen ($candidateLine) > $this->iMaxColumns && $prevLine != "") {
|
|
| 115 | + return false; |
|
| 116 | + } |
|
| 117 | + $this->iCurrentLine = $candidateLine; |
|
| 118 | + return true; |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - function getWord() {
|
|
| 122 | - while (true) {
|
|
| 123 | - if ($this->iHtmlParser->iNodeType == NODE_TYPE_TEXT) {
|
|
| 124 | - if (!$this->iInText) {
|
|
| 125 | - $words = $this->splitWords($this->iHtmlParser->iNodeValue); |
|
| 126 | - $this->iCurrentWordArray = $words; |
|
| 127 | - $this->iCurrentWordIndex = 0; |
|
| 128 | - $this->iInText = true; |
|
| 129 | - } |
|
| 130 | - if ($this->iCurrentWordIndex < count($this->iCurrentWordArray)) {
|
|
| 131 | - $this->iCurrentWord = $this->iCurrentWordArray[$this->iCurrentWordIndex++]; |
|
| 132 | - return $this->iCurrentWord; |
|
| 133 | - } |
|
| 134 | - else {
|
|
| 135 | - $this->iInText = false; |
|
| 136 | - } |
|
| 137 | - } |
|
| 138 | - else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {
|
|
| 139 | - if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {
|
|
| 140 | - $this->iHtmlParser->parse(); |
|
| 141 | - $this->iCurrentWord = $this->TOKEN_BR; |
|
| 142 | - return $this->iCurrentWord; |
|
| 143 | - } |
|
| 144 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {
|
|
| 145 | - $this->iHtmlParser->parse(); |
|
| 146 | - $this->iCurrentWord = $this->TOKEN_P; |
|
| 147 | - return $this->iCurrentWord; |
|
| 148 | - } |
|
| 149 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 150 | - $this->iHtmlParser->parse(); |
|
| 151 | - $this->iCurrentWord = ""; |
|
| 152 | - $this->iInScript = true; |
|
| 153 | - return $this->iCurrentWord; |
|
| 154 | - } |
|
| 155 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 156 | - $this->iHtmlParser->parse(); |
|
| 157 | - $this->iCurrentWord = $this->TOKEN_UL; |
|
| 158 | - $this->iListLevel++; |
|
| 159 | - return $this->iCurrentWord; |
|
| 160 | - } |
|
| 161 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {
|
|
| 162 | - $this->iHtmlParser->parse(); |
|
| 163 | - $this->iCurrentWord = $this->TOKEN_LI; |
|
| 164 | - return $this->iCurrentWord; |
|
| 165 | - } |
|
| 166 | - } |
|
| 167 | - else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {
|
|
| 168 | - if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 169 | - $this->iHtmlParser->parse(); |
|
| 170 | - $this->iCurrentWord = ""; |
|
| 171 | - $this->iInScript = false; |
|
| 172 | - return $this->iCurrentWord; |
|
| 173 | - } |
|
| 174 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 175 | - $this->iHtmlParser->parse(); |
|
| 176 | - $this->iCurrentWord = $this->TOKEN_ENDUL; |
|
| 177 | - if ($this->iListLevel > 0) {
|
|
| 178 | - $this->iListLevel--; |
|
| 179 | - } |
|
| 180 | - return $this->iCurrentWord; |
|
| 181 | - } |
|
| 182 | - } |
|
| 183 | - if (!$this->iHtmlParser->parse()) {
|
|
| 184 | - break; |
|
| 185 | - } |
|
| 186 | - } |
|
| 187 | - return false; |
|
| 188 | - } |
|
| 121 | + function getWord() {
|
|
| 122 | + while (true) {
|
|
| 123 | + if ($this->iHtmlParser->iNodeType == NODE_TYPE_TEXT) {
|
|
| 124 | + if (!$this->iInText) {
|
|
| 125 | + $words = $this->splitWords($this->iHtmlParser->iNodeValue); |
|
| 126 | + $this->iCurrentWordArray = $words; |
|
| 127 | + $this->iCurrentWordIndex = 0; |
|
| 128 | + $this->iInText = true; |
|
| 129 | + } |
|
| 130 | + if ($this->iCurrentWordIndex < count($this->iCurrentWordArray)) {
|
|
| 131 | + $this->iCurrentWord = $this->iCurrentWordArray[$this->iCurrentWordIndex++]; |
|
| 132 | + return $this->iCurrentWord; |
|
| 133 | + } |
|
| 134 | + else {
|
|
| 135 | + $this->iInText = false; |
|
| 136 | + } |
|
| 137 | + } |
|
| 138 | + else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {
|
|
| 139 | + if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {
|
|
| 140 | + $this->iHtmlParser->parse(); |
|
| 141 | + $this->iCurrentWord = $this->TOKEN_BR; |
|
| 142 | + return $this->iCurrentWord; |
|
| 143 | + } |
|
| 144 | + else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {
|
|
| 145 | + $this->iHtmlParser->parse(); |
|
| 146 | + $this->iCurrentWord = $this->TOKEN_P; |
|
| 147 | + return $this->iCurrentWord; |
|
| 148 | + } |
|
| 149 | + else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 150 | + $this->iHtmlParser->parse(); |
|
| 151 | + $this->iCurrentWord = ""; |
|
| 152 | + $this->iInScript = true; |
|
| 153 | + return $this->iCurrentWord; |
|
| 154 | + } |
|
| 155 | + else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 156 | + $this->iHtmlParser->parse(); |
|
| 157 | + $this->iCurrentWord = $this->TOKEN_UL; |
|
| 158 | + $this->iListLevel++; |
|
| 159 | + return $this->iCurrentWord; |
|
| 160 | + } |
|
| 161 | + else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {
|
|
| 162 | + $this->iHtmlParser->parse(); |
|
| 163 | + $this->iCurrentWord = $this->TOKEN_LI; |
|
| 164 | + return $this->iCurrentWord; |
|
| 165 | + } |
|
| 166 | + } |
|
| 167 | + else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {
|
|
| 168 | + if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 169 | + $this->iHtmlParser->parse(); |
|
| 170 | + $this->iCurrentWord = ""; |
|
| 171 | + $this->iInScript = false; |
|
| 172 | + return $this->iCurrentWord; |
|
| 173 | + } |
|
| 174 | + else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 175 | + $this->iHtmlParser->parse(); |
|
| 176 | + $this->iCurrentWord = $this->TOKEN_ENDUL; |
|
| 177 | + if ($this->iListLevel > 0) {
|
|
| 178 | + $this->iListLevel--; |
|
| 179 | + } |
|
| 180 | + return $this->iCurrentWord; |
|
| 181 | + } |
|
| 182 | + } |
|
| 183 | + if (!$this->iHtmlParser->parse()) {
|
|
| 184 | + break; |
|
| 185 | + } |
|
| 186 | + } |
|
| 187 | + return false; |
|
| 188 | + } |
|
| 189 | 189 | |
| 190 | - function splitWords ($text) {
|
|
| 191 | - $words = split ("[ \t\r\n]+", $text);
|
|
| 192 | - for ($idx = 0; $idx < count($words); $idx++) {
|
|
| 193 | - $words[$idx] = $this->htmlDecode($words[$idx]); |
|
| 194 | - } |
|
| 195 | - return $words; |
|
| 196 | - } |
|
| 190 | + function splitWords ($text) {
|
|
| 191 | + $words = split ("[ \t\r\n]+", $text);
|
|
| 192 | + for ($idx = 0; $idx < count($words); $idx++) {
|
|
| 193 | + $words[$idx] = $this->htmlDecode($words[$idx]); |
|
| 194 | + } |
|
| 195 | + return $words; |
|
| 196 | + } |
|
| 197 | 197 | |
| 198 | - function htmlDecode ($text) {
|
|
| 199 | - // TBD |
|
| 200 | - return $text; |
|
| 201 | - } |
|
| 198 | + function htmlDecode ($text) {
|
|
| 199 | + // TBD |
|
| 200 | + return $text; |
|
| 201 | + } |
|
| 202 | 202 | |
| 203 | - function getIndentation ($hasLI) {
|
|
| 204 | - $indent = ""; |
|
| 205 | - $idx = 0; |
|
| 206 | - for ($idx = 0; $idx < ($this->iListLevel - 1); $idx++) {
|
|
| 207 | - $indent .= " "; |
|
| 208 | - } |
|
| 209 | - if ($this->iListLevel > 0) {
|
|
| 210 | - $indent = $hasLI ? ($indent . "- ") : ($indent . " "); |
|
| 211 | - } |
|
| 212 | - return $indent; |
|
| 213 | - } |
|
| 203 | + function getIndentation ($hasLI) {
|
|
| 204 | + $indent = ""; |
|
| 205 | + $idx = 0; |
|
| 206 | + for ($idx = 0; $idx < ($this->iListLevel - 1); $idx++) {
|
|
| 207 | + $indent .= " "; |
|
| 208 | + } |
|
| 209 | + if ($this->iListLevel > 0) {
|
|
| 210 | + $indent = $hasLI ? ($indent . "- ") : ($indent . " "); |
|
| 211 | + } |
|
| 212 | + return $indent; |
|
| 213 | + } |
|
| 214 | 214 | } |
@@ -106,8 +106,7 @@ discard block |
||
| 106 | 106 | } |
| 107 | 107 | if ($prevLine != "") {
|
| 108 | 108 | $prevLine .= " "; |
| 109 | - } |
|
| 110 | - else {
|
|
| 109 | + } else {
|
|
| 111 | 110 | $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI); |
| 112 | 111 | } |
| 113 | 112 | $candidateLine = $prevLine . $toAdd; |
@@ -130,48 +129,40 @@ discard block |
||
| 130 | 129 | if ($this->iCurrentWordIndex < count($this->iCurrentWordArray)) {
|
| 131 | 130 | $this->iCurrentWord = $this->iCurrentWordArray[$this->iCurrentWordIndex++]; |
| 132 | 131 | return $this->iCurrentWord; |
| 133 | - } |
|
| 134 | - else {
|
|
| 132 | + } else {
|
|
| 135 | 133 | $this->iInText = false; |
| 136 | 134 | } |
| 137 | - } |
|
| 138 | - else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {
|
|
| 135 | + } else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {
|
|
| 139 | 136 | if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {
|
| 140 | 137 | $this->iHtmlParser->parse(); |
| 141 | 138 | $this->iCurrentWord = $this->TOKEN_BR; |
| 142 | 139 | return $this->iCurrentWord; |
| 143 | - } |
|
| 144 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {
|
|
| 140 | + } else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {
|
|
| 145 | 141 | $this->iHtmlParser->parse(); |
| 146 | 142 | $this->iCurrentWord = $this->TOKEN_P; |
| 147 | 143 | return $this->iCurrentWord; |
| 148 | - } |
|
| 149 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 144 | + } else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 150 | 145 | $this->iHtmlParser->parse(); |
| 151 | 146 | $this->iCurrentWord = ""; |
| 152 | 147 | $this->iInScript = true; |
| 153 | 148 | return $this->iCurrentWord; |
| 154 | - } |
|
| 155 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 149 | + } else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 156 | 150 | $this->iHtmlParser->parse(); |
| 157 | 151 | $this->iCurrentWord = $this->TOKEN_UL; |
| 158 | 152 | $this->iListLevel++; |
| 159 | 153 | return $this->iCurrentWord; |
| 160 | - } |
|
| 161 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {
|
|
| 154 | + } else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {
|
|
| 162 | 155 | $this->iHtmlParser->parse(); |
| 163 | 156 | $this->iCurrentWord = $this->TOKEN_LI; |
| 164 | 157 | return $this->iCurrentWord; |
| 165 | 158 | } |
| 166 | - } |
|
| 167 | - else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {
|
|
| 159 | + } else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {
|
|
| 168 | 160 | if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
| 169 | 161 | $this->iHtmlParser->parse(); |
| 170 | 162 | $this->iCurrentWord = ""; |
| 171 | 163 | $this->iInScript = false; |
| 172 | 164 | return $this->iCurrentWord; |
| 173 | - } |
|
| 174 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 165 | + } else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 175 | 166 | $this->iHtmlParser->parse(); |
| 176 | 167 | $this->iCurrentWord = $this->TOKEN_ENDUL; |
| 177 | 168 | if ($this->iListLevel > 0) {
|
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | var $TOKEN_UL = 4; |
| 40 | 40 | var $TOKEN_ENDUL = 5; |
| 41 | 41 | |
| 42 | - function Html2Text ($aHtmlText, $aMaxColumns) {
|
|
| 42 | + function Html2Text($aHtmlText, $aMaxColumns) {
|
|
| 43 | 43 | $this->iHtmlText = $aHtmlText; |
| 44 | 44 | $this->iMaxColumns = $aMaxColumns; |
| 45 | 45 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $this->iHtmlParser = new HtmlParser($this->iHtmlText); |
| 49 | 49 | $wholeText = ""; |
| 50 | 50 | while (($line = $this->getLine()) !== false) {
|
| 51 | - $wholeText .= ($line . "\r\n"); |
|
| 51 | + $wholeText .= ($line."\r\n"); |
|
| 52 | 52 | } |
| 53 | 53 | return $wholeText; |
| 54 | 54 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | return false; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - function addWordToLine ($word) {
|
|
| 78 | + function addWordToLine($word) {
|
|
| 79 | 79 | if ($this->iInScript) {
|
| 80 | 80 | return true; |
| 81 | 81 | } |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | else {
|
| 111 | 111 | $prevLine = $this->getIndentation($word === $this->TOKEN_AFTERLI); |
| 112 | 112 | } |
| 113 | - $candidateLine = $prevLine . $toAdd; |
|
| 114 | - if (strlen ($candidateLine) > $this->iMaxColumns && $prevLine != "") {
|
|
| 113 | + $candidateLine = $prevLine.$toAdd; |
|
| 114 | + if (strlen($candidateLine) > $this->iMaxColumns && $prevLine != "") {
|
|
| 115 | 115 | return false; |
| 116 | 116 | } |
| 117 | 117 | $this->iCurrentLine = $candidateLine; |
@@ -136,42 +136,42 @@ discard block |
||
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | 138 | else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ELEMENT) {
|
| 139 | - if (strcasecmp ($this->iHtmlParser->iNodeName, "br") == 0) {
|
|
| 139 | + if (strcasecmp($this->iHtmlParser->iNodeName, "br") == 0) {
|
|
| 140 | 140 | $this->iHtmlParser->parse(); |
| 141 | 141 | $this->iCurrentWord = $this->TOKEN_BR; |
| 142 | 142 | return $this->iCurrentWord; |
| 143 | 143 | } |
| 144 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "p") == 0) {
|
|
| 144 | + else if (strcasecmp($this->iHtmlParser->iNodeName, "p") == 0) {
|
|
| 145 | 145 | $this->iHtmlParser->parse(); |
| 146 | 146 | $this->iCurrentWord = $this->TOKEN_P; |
| 147 | 147 | return $this->iCurrentWord; |
| 148 | 148 | } |
| 149 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 149 | + else if (strcasecmp($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 150 | 150 | $this->iHtmlParser->parse(); |
| 151 | 151 | $this->iCurrentWord = ""; |
| 152 | 152 | $this->iInScript = true; |
| 153 | 153 | return $this->iCurrentWord; |
| 154 | 154 | } |
| 155 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 155 | + else if (strcasecmp($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 156 | 156 | $this->iHtmlParser->parse(); |
| 157 | 157 | $this->iCurrentWord = $this->TOKEN_UL; |
| 158 | 158 | $this->iListLevel++; |
| 159 | 159 | return $this->iCurrentWord; |
| 160 | 160 | } |
| 161 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "li") == 0) {
|
|
| 161 | + else if (strcasecmp($this->iHtmlParser->iNodeName, "li") == 0) {
|
|
| 162 | 162 | $this->iHtmlParser->parse(); |
| 163 | 163 | $this->iCurrentWord = $this->TOKEN_LI; |
| 164 | 164 | return $this->iCurrentWord; |
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | else if ($this->iHtmlParser->iNodeType == NODE_TYPE_ENDELEMENT) {
|
| 168 | - if (strcasecmp ($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 168 | + if (strcasecmp($this->iHtmlParser->iNodeName, "script") == 0) {
|
|
| 169 | 169 | $this->iHtmlParser->parse(); |
| 170 | 170 | $this->iCurrentWord = ""; |
| 171 | 171 | $this->iInScript = false; |
| 172 | 172 | return $this->iCurrentWord; |
| 173 | 173 | } |
| 174 | - else if (strcasecmp ($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp ($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 174 | + else if (strcasecmp($this->iHtmlParser->iNodeName, "ul") == 0 || strcasecmp($this->iHtmlParser->iNodeName, "ol") == 0) {
|
|
| 175 | 175 | $this->iHtmlParser->parse(); |
| 176 | 176 | $this->iCurrentWord = $this->TOKEN_ENDUL; |
| 177 | 177 | if ($this->iListLevel > 0) {
|
@@ -187,27 +187,27 @@ discard block |
||
| 187 | 187 | return false; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | - function splitWords ($text) {
|
|
| 191 | - $words = split ("[ \t\r\n]+", $text);
|
|
| 190 | + function splitWords($text) {
|
|
| 191 | + $words = split("[ \t\r\n]+", $text);
|
|
| 192 | 192 | for ($idx = 0; $idx < count($words); $idx++) {
|
| 193 | 193 | $words[$idx] = $this->htmlDecode($words[$idx]); |
| 194 | 194 | } |
| 195 | 195 | return $words; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | - function htmlDecode ($text) {
|
|
| 198 | + function htmlDecode($text) {
|
|
| 199 | 199 | // TBD |
| 200 | 200 | return $text; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - function getIndentation ($hasLI) {
|
|
| 203 | + function getIndentation($hasLI) {
|
|
| 204 | 204 | $indent = ""; |
| 205 | 205 | $idx = 0; |
| 206 | 206 | for ($idx = 0; $idx < ($this->iListLevel - 1); $idx++) {
|
| 207 | 207 | $indent .= " "; |
| 208 | 208 | } |
| 209 | 209 | if ($this->iListLevel > 0) {
|
| 210 | - $indent = $hasLI ? ($indent . "- ") : ($indent . " "); |
|
| 210 | + $indent = $hasLI ? ($indent."- ") : ($indent." "); |
|
| 211 | 211 | } |
| 212 | 212 | return $indent; |
| 213 | 213 | } |
@@ -75,6 +75,9 @@ discard block |
||
| 75 | 75 | return false; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | + /** |
|
| 79 | + * @param string $word |
|
| 80 | + */ |
|
| 78 | 81 | function addWordToLine ($word) {
|
| 79 | 82 | if ($this->iInScript) {
|
| 80 | 83 | return true; |
@@ -187,6 +190,9 @@ discard block |
||
| 187 | 190 | return false; |
| 188 | 191 | } |
| 189 | 192 | |
| 193 | + /** |
|
| 194 | + * @param string $text |
|
| 195 | + */ |
|
| 190 | 196 | function splitWords ($text) {
|
| 191 | 197 | $words = split ("[ \t\r\n]+", $text);
|
| 192 | 198 | for ($idx = 0; $idx < count($words); $idx++) {
|
@@ -200,6 +206,9 @@ discard block |
||
| 200 | 206 | return $text; |
| 201 | 207 | } |
| 202 | 208 | |
| 209 | + /** |
|
| 210 | + * @param boolean $hasLI |
|
| 211 | + */ |
|
| 203 | 212 | function getIndentation ($hasLI) {
|
| 204 | 213 | $indent = ""; |
| 205 | 214 | $idx = 0; |
@@ -30,336 +30,336 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | class HtmlParser {
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Field iNodeType. |
|
| 35 | - * May be one of the NODE_TYPE_* constants above. |
|
| 36 | - */ |
|
| 37 | - var $iNodeType; |
|
| 33 | + /** |
|
| 34 | + * Field iNodeType. |
|
| 35 | + * May be one of the NODE_TYPE_* constants above. |
|
| 36 | + */ |
|
| 37 | + var $iNodeType; |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * Field iNodeName. |
|
| 41 | - * For elements, it's the name of the element. |
|
| 42 | - */ |
|
| 43 | - var $iNodeName = ""; |
|
| 39 | + /** |
|
| 40 | + * Field iNodeName. |
|
| 41 | + * For elements, it's the name of the element. |
|
| 42 | + */ |
|
| 43 | + var $iNodeName = ""; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Field iNodeValue. |
|
| 47 | - * For text nodes, it's the text. |
|
| 48 | - */ |
|
| 49 | - var $iNodeValue = ""; |
|
| 45 | + /** |
|
| 46 | + * Field iNodeValue. |
|
| 47 | + * For text nodes, it's the text. |
|
| 48 | + */ |
|
| 49 | + var $iNodeValue = ""; |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * Field iNodeAttributes. |
|
| 53 | - * A string-indexed array containing attribute values |
|
| 54 | - * of the current node. Indexes are always lowercase. |
|
| 55 | - */ |
|
| 56 | - var $iNodeAttributes; |
|
| 51 | + /** |
|
| 52 | + * Field iNodeAttributes. |
|
| 53 | + * A string-indexed array containing attribute values |
|
| 54 | + * of the current node. Indexes are always lowercase. |
|
| 55 | + */ |
|
| 56 | + var $iNodeAttributes; |
|
| 57 | 57 | |
| 58 | - // The following fields should be |
|
| 59 | - // considered private: |
|
| 58 | + // The following fields should be |
|
| 59 | + // considered private: |
|
| 60 | 60 | |
| 61 | - var $iHtmlText; |
|
| 62 | - var $iHtmlTextLength; |
|
| 63 | - var $iHtmlTextIndex = 0; |
|
| 64 | - var $iHtmlCurrentChar; |
|
| 65 | - var $BOE_ARRAY; |
|
| 66 | - var $B_ARRAY; |
|
| 67 | - var $BOS_ARRAY; |
|
| 61 | + var $iHtmlText; |
|
| 62 | + var $iHtmlTextLength; |
|
| 63 | + var $iHtmlTextIndex = 0; |
|
| 64 | + var $iHtmlCurrentChar; |
|
| 65 | + var $BOE_ARRAY; |
|
| 66 | + var $B_ARRAY; |
|
| 67 | + var $BOS_ARRAY; |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Constructor. |
|
| 71 | - * Constructs an HtmlParser instance with |
|
| 72 | - * the HTML text given. |
|
| 73 | - */ |
|
| 74 | - function HtmlParser ($aHtmlText) {
|
|
| 75 | - $this->iHtmlText = $aHtmlText; |
|
| 76 | - $this->iHtmlTextLength = strlen($aHtmlText); |
|
| 77 | - $this->iNodeAttributes = array(); |
|
| 78 | - $this->setTextIndex (0); |
|
| 69 | + /** |
|
| 70 | + * Constructor. |
|
| 71 | + * Constructs an HtmlParser instance with |
|
| 72 | + * the HTML text given. |
|
| 73 | + */ |
|
| 74 | + function HtmlParser ($aHtmlText) {
|
|
| 75 | + $this->iHtmlText = $aHtmlText; |
|
| 76 | + $this->iHtmlTextLength = strlen($aHtmlText); |
|
| 77 | + $this->iNodeAttributes = array(); |
|
| 78 | + $this->setTextIndex (0); |
|
| 79 | 79 | |
| 80 | - $this->BOE_ARRAY = array (" ", "\t", "\r", "\n", "=" );
|
|
| 81 | - $this->B_ARRAY = array (" ", "\t", "\r", "\n" );
|
|
| 82 | - $this->BOS_ARRAY = array (" ", "\t", "\r", "\n", "/" );
|
|
| 83 | - } |
|
| 80 | + $this->BOE_ARRAY = array (" ", "\t", "\r", "\n", "=" );
|
|
| 81 | + $this->B_ARRAY = array (" ", "\t", "\r", "\n" );
|
|
| 82 | + $this->BOS_ARRAY = array (" ", "\t", "\r", "\n", "/" );
|
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - /** |
|
| 86 | - * Method parse. |
|
| 87 | - * Parses the next node. Returns false only if |
|
| 88 | - * the end of the HTML text has been reached. |
|
| 89 | - * Updates values of iNode* fields. |
|
| 90 | - */ |
|
| 91 | - function parse() {
|
|
| 92 | - $text = $this->skipToElement(); |
|
| 93 | - if ($text != "") {
|
|
| 94 | - $this->iNodeType = NODE_TYPE_TEXT; |
|
| 95 | - $this->iNodeName = "Text"; |
|
| 96 | - $this->iNodeValue = $text; |
|
| 97 | - return true; |
|
| 98 | - } |
|
| 99 | - return $this->readTag(); |
|
| 100 | - } |
|
| 85 | + /** |
|
| 86 | + * Method parse. |
|
| 87 | + * Parses the next node. Returns false only if |
|
| 88 | + * the end of the HTML text has been reached. |
|
| 89 | + * Updates values of iNode* fields. |
|
| 90 | + */ |
|
| 91 | + function parse() {
|
|
| 92 | + $text = $this->skipToElement(); |
|
| 93 | + if ($text != "") {
|
|
| 94 | + $this->iNodeType = NODE_TYPE_TEXT; |
|
| 95 | + $this->iNodeName = "Text"; |
|
| 96 | + $this->iNodeValue = $text; |
|
| 97 | + return true; |
|
| 98 | + } |
|
| 99 | + return $this->readTag(); |
|
| 100 | + } |
|
| 101 | 101 | |
| 102 | - function clearAttributes() {
|
|
| 103 | - $this->iNodeAttributes = array(); |
|
| 104 | - } |
|
| 102 | + function clearAttributes() {
|
|
| 103 | + $this->iNodeAttributes = array(); |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - function readTag() {
|
|
| 107 | - if ($this->iCurrentChar != "<") {
|
|
| 108 | - $this->iNodeType = NODE_TYPE_DONE; |
|
| 109 | - return false; |
|
| 110 | - } |
|
| 111 | - $this->clearAttributes(); |
|
| 112 | - $this->skipMaxInTag ("<", 1);
|
|
| 113 | - if ($this->iCurrentChar == '/') {
|
|
| 114 | - $this->moveNext(); |
|
| 115 | - $name = $this->skipToBlanksInTag(); |
|
| 116 | - $this->iNodeType = NODE_TYPE_ENDELEMENT; |
|
| 117 | - $this->iNodeName = $name; |
|
| 118 | - $this->iNodeValue = ""; |
|
| 119 | - $this->skipEndOfTag(); |
|
| 120 | - return true; |
|
| 121 | - } |
|
| 122 | - $name = $this->skipToBlanksOrSlashInTag(); |
|
| 123 | - if (!$this->isValidTagIdentifier ($name)) {
|
|
| 124 | - $comment = false; |
|
| 125 | - if (strpos($name, "!--") === 0) {
|
|
| 126 | - $ppos = strpos($name, "--", 3); |
|
| 127 | - if (strpos($name, "--", 3) === (strlen($name) - 2)) {
|
|
| 128 | - $this->iNodeType = NODE_TYPE_COMMENT; |
|
| 129 | - $this->iNodeName = "Comment"; |
|
| 130 | - $this->iNodeValue = "<" . $name . ">"; |
|
| 131 | - $comment = true; |
|
| 132 | - } |
|
| 133 | - else {
|
|
| 134 | - $rest = $this->skipToStringInTag ("-->");
|
|
| 135 | - if ($rest != "") {
|
|
| 136 | - $this->iNodeType = NODE_TYPE_COMMENT; |
|
| 137 | - $this->iNodeName = "Comment"; |
|
| 138 | - $this->iNodeValue = "<" . $name . $rest; |
|
| 139 | - $comment = true; |
|
| 140 | - // Already skipped end of tag |
|
| 141 | - return true; |
|
| 142 | - } |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - if (!$comment) {
|
|
| 146 | - $this->iNodeType = NODE_TYPE_TEXT; |
|
| 147 | - $this->iNodeName = "Text"; |
|
| 148 | - $this->iNodeValue = "<" . $name; |
|
| 149 | - return true; |
|
| 150 | - } |
|
| 151 | - } |
|
| 152 | - else {
|
|
| 153 | - $this->iNodeType = NODE_TYPE_ELEMENT; |
|
| 154 | - $this->iNodeValue = ""; |
|
| 155 | - $this->iNodeName = $name; |
|
| 156 | - while ($this->skipBlanksInTag()) {
|
|
| 157 | - $attrName = $this->skipToBlanksOrEqualsInTag(); |
|
| 158 | - if ($attrName != "" && $attrName != "/") {
|
|
| 159 | - $this->skipBlanksInTag(); |
|
| 160 | - if ($this->iCurrentChar == "=") {
|
|
| 161 | - $this->skipEqualsInTag(); |
|
| 162 | - $this->skipBlanksInTag(); |
|
| 163 | - $value = $this->readValueInTag(); |
|
| 164 | - $this->iNodeAttributes[strtolower($attrName)] = $value; |
|
| 165 | - } |
|
| 166 | - else {
|
|
| 167 | - $this->iNodeAttributes[strtolower($attrName)] = ""; |
|
| 168 | - } |
|
| 169 | - } |
|
| 170 | - } |
|
| 171 | - } |
|
| 172 | - $this->skipEndOfTag(); |
|
| 173 | - return true; |
|
| 174 | - } |
|
| 106 | + function readTag() {
|
|
| 107 | + if ($this->iCurrentChar != "<") {
|
|
| 108 | + $this->iNodeType = NODE_TYPE_DONE; |
|
| 109 | + return false; |
|
| 110 | + } |
|
| 111 | + $this->clearAttributes(); |
|
| 112 | + $this->skipMaxInTag ("<", 1);
|
|
| 113 | + if ($this->iCurrentChar == '/') {
|
|
| 114 | + $this->moveNext(); |
|
| 115 | + $name = $this->skipToBlanksInTag(); |
|
| 116 | + $this->iNodeType = NODE_TYPE_ENDELEMENT; |
|
| 117 | + $this->iNodeName = $name; |
|
| 118 | + $this->iNodeValue = ""; |
|
| 119 | + $this->skipEndOfTag(); |
|
| 120 | + return true; |
|
| 121 | + } |
|
| 122 | + $name = $this->skipToBlanksOrSlashInTag(); |
|
| 123 | + if (!$this->isValidTagIdentifier ($name)) {
|
|
| 124 | + $comment = false; |
|
| 125 | + if (strpos($name, "!--") === 0) {
|
|
| 126 | + $ppos = strpos($name, "--", 3); |
|
| 127 | + if (strpos($name, "--", 3) === (strlen($name) - 2)) {
|
|
| 128 | + $this->iNodeType = NODE_TYPE_COMMENT; |
|
| 129 | + $this->iNodeName = "Comment"; |
|
| 130 | + $this->iNodeValue = "<" . $name . ">"; |
|
| 131 | + $comment = true; |
|
| 132 | + } |
|
| 133 | + else {
|
|
| 134 | + $rest = $this->skipToStringInTag ("-->");
|
|
| 135 | + if ($rest != "") {
|
|
| 136 | + $this->iNodeType = NODE_TYPE_COMMENT; |
|
| 137 | + $this->iNodeName = "Comment"; |
|
| 138 | + $this->iNodeValue = "<" . $name . $rest; |
|
| 139 | + $comment = true; |
|
| 140 | + // Already skipped end of tag |
|
| 141 | + return true; |
|
| 142 | + } |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + if (!$comment) {
|
|
| 146 | + $this->iNodeType = NODE_TYPE_TEXT; |
|
| 147 | + $this->iNodeName = "Text"; |
|
| 148 | + $this->iNodeValue = "<" . $name; |
|
| 149 | + return true; |
|
| 150 | + } |
|
| 151 | + } |
|
| 152 | + else {
|
|
| 153 | + $this->iNodeType = NODE_TYPE_ELEMENT; |
|
| 154 | + $this->iNodeValue = ""; |
|
| 155 | + $this->iNodeName = $name; |
|
| 156 | + while ($this->skipBlanksInTag()) {
|
|
| 157 | + $attrName = $this->skipToBlanksOrEqualsInTag(); |
|
| 158 | + if ($attrName != "" && $attrName != "/") {
|
|
| 159 | + $this->skipBlanksInTag(); |
|
| 160 | + if ($this->iCurrentChar == "=") {
|
|
| 161 | + $this->skipEqualsInTag(); |
|
| 162 | + $this->skipBlanksInTag(); |
|
| 163 | + $value = $this->readValueInTag(); |
|
| 164 | + $this->iNodeAttributes[strtolower($attrName)] = $value; |
|
| 165 | + } |
|
| 166 | + else {
|
|
| 167 | + $this->iNodeAttributes[strtolower($attrName)] = ""; |
|
| 168 | + } |
|
| 169 | + } |
|
| 170 | + } |
|
| 171 | + } |
|
| 172 | + $this->skipEndOfTag(); |
|
| 173 | + return true; |
|
| 174 | + } |
|
| 175 | 175 | |
| 176 | - function isValidTagIdentifier ($name) {
|
|
| 177 | - return ereg ("^[A-Za-z0-9_\\-]+$", $name);
|
|
| 178 | - } |
|
| 176 | + function isValidTagIdentifier ($name) {
|
|
| 177 | + return ereg ("^[A-Za-z0-9_\\-]+$", $name);
|
|
| 178 | + } |
|
| 179 | 179 | |
| 180 | - function skipBlanksInTag() {
|
|
| 181 | - return "" != ($this->skipInTag ($this->B_ARRAY)); |
|
| 182 | - } |
|
| 180 | + function skipBlanksInTag() {
|
|
| 181 | + return "" != ($this->skipInTag ($this->B_ARRAY)); |
|
| 182 | + } |
|
| 183 | 183 | |
| 184 | - function skipToBlanksOrEqualsInTag() {
|
|
| 185 | - return $this->skipToInTag ($this->BOE_ARRAY); |
|
| 186 | - } |
|
| 184 | + function skipToBlanksOrEqualsInTag() {
|
|
| 185 | + return $this->skipToInTag ($this->BOE_ARRAY); |
|
| 186 | + } |
|
| 187 | 187 | |
| 188 | - function skipToBlanksInTag() {
|
|
| 189 | - return $this->skipToInTag ($this->B_ARRAY); |
|
| 190 | - } |
|
| 188 | + function skipToBlanksInTag() {
|
|
| 189 | + return $this->skipToInTag ($this->B_ARRAY); |
|
| 190 | + } |
|
| 191 | 191 | |
| 192 | - function skipToBlanksOrSlashInTag() {
|
|
| 193 | - return $this->skipToInTag ($this->BOS_ARRAY); |
|
| 194 | - } |
|
| 192 | + function skipToBlanksOrSlashInTag() {
|
|
| 193 | + return $this->skipToInTag ($this->BOS_ARRAY); |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - function skipEqualsInTag() {
|
|
| 197 | - return $this->skipMaxInTag ("=", 1);
|
|
| 198 | - } |
|
| 196 | + function skipEqualsInTag() {
|
|
| 197 | + return $this->skipMaxInTag ("=", 1);
|
|
| 198 | + } |
|
| 199 | 199 | |
| 200 | - function readValueInTag() {
|
|
| 201 | - $ch = $this->iCurrentChar; |
|
| 202 | - $value = ""; |
|
| 203 | - if ($ch == "\"") {
|
|
| 204 | - $this->skipMaxInTag ("\"", 1);
|
|
| 205 | - $value = $this->skipToInTag ("\"");
|
|
| 206 | - $this->skipMaxInTag ("\"", 1);
|
|
| 207 | - } |
|
| 208 | - else if ($ch == "'") {
|
|
| 209 | - $this->skipMaxInTag ("'", 1);
|
|
| 210 | - $value = $this->skipToInTag ("'");
|
|
| 211 | - $this->skipMaxInTag ("'", 1);
|
|
| 212 | - } |
|
| 213 | - else {
|
|
| 214 | - $value = $this->skipToBlanksInTag(); |
|
| 215 | - } |
|
| 216 | - return $value; |
|
| 217 | - } |
|
| 200 | + function readValueInTag() {
|
|
| 201 | + $ch = $this->iCurrentChar; |
|
| 202 | + $value = ""; |
|
| 203 | + if ($ch == "\"") {
|
|
| 204 | + $this->skipMaxInTag ("\"", 1);
|
|
| 205 | + $value = $this->skipToInTag ("\"");
|
|
| 206 | + $this->skipMaxInTag ("\"", 1);
|
|
| 207 | + } |
|
| 208 | + else if ($ch == "'") {
|
|
| 209 | + $this->skipMaxInTag ("'", 1);
|
|
| 210 | + $value = $this->skipToInTag ("'");
|
|
| 211 | + $this->skipMaxInTag ("'", 1);
|
|
| 212 | + } |
|
| 213 | + else {
|
|
| 214 | + $value = $this->skipToBlanksInTag(); |
|
| 215 | + } |
|
| 216 | + return $value; |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | - function setTextIndex ($index) {
|
|
| 220 | - $this->iHtmlTextIndex = $index; |
|
| 221 | - if ($index >= $this->iHtmlTextLength) {
|
|
| 222 | - $this->iCurrentChar = -1; |
|
| 223 | - } |
|
| 224 | - else {
|
|
| 225 | - $this->iCurrentChar = $this->iHtmlText{$index};
|
|
| 226 | - } |
|
| 227 | - } |
|
| 219 | + function setTextIndex ($index) {
|
|
| 220 | + $this->iHtmlTextIndex = $index; |
|
| 221 | + if ($index >= $this->iHtmlTextLength) {
|
|
| 222 | + $this->iCurrentChar = -1; |
|
| 223 | + } |
|
| 224 | + else {
|
|
| 225 | + $this->iCurrentChar = $this->iHtmlText{$index};
|
|
| 226 | + } |
|
| 227 | + } |
|
| 228 | 228 | |
| 229 | - function moveNext() {
|
|
| 230 | - if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {
|
|
| 231 | - $this->setTextIndex ($this->iHtmlTextIndex + 1); |
|
| 232 | - return true; |
|
| 233 | - } |
|
| 234 | - else {
|
|
| 235 | - return false; |
|
| 236 | - } |
|
| 237 | - } |
|
| 229 | + function moveNext() {
|
|
| 230 | + if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {
|
|
| 231 | + $this->setTextIndex ($this->iHtmlTextIndex + 1); |
|
| 232 | + return true; |
|
| 233 | + } |
|
| 234 | + else {
|
|
| 235 | + return false; |
|
| 236 | + } |
|
| 237 | + } |
|
| 238 | 238 | |
| 239 | - function skipEndOfTag() {
|
|
| 240 | - while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 241 | - if ($ch == ">") {
|
|
| 242 | - $this->moveNext(); |
|
| 243 | - return; |
|
| 244 | - } |
|
| 245 | - $this->moveNext(); |
|
| 246 | - } |
|
| 247 | - } |
|
| 239 | + function skipEndOfTag() {
|
|
| 240 | + while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 241 | + if ($ch == ">") {
|
|
| 242 | + $this->moveNext(); |
|
| 243 | + return; |
|
| 244 | + } |
|
| 245 | + $this->moveNext(); |
|
| 246 | + } |
|
| 247 | + } |
|
| 248 | 248 | |
| 249 | - function skipInTag ($chars) {
|
|
| 250 | - $sb = ""; |
|
| 251 | - while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 252 | - if ($ch == ">") {
|
|
| 253 | - return $sb; |
|
| 254 | - } else {
|
|
| 255 | - $match = false; |
|
| 256 | - for ($idx = 0; $idx < count($chars); $idx++) {
|
|
| 257 | - if ($ch == $chars[$idx]) {
|
|
| 258 | - $match = true; |
|
| 259 | - break; |
|
| 260 | - } |
|
| 261 | - } |
|
| 262 | - if (!$match) {
|
|
| 263 | - return $sb; |
|
| 264 | - } |
|
| 265 | - $sb .= $ch; |
|
| 266 | - $this->moveNext(); |
|
| 267 | - } |
|
| 268 | - } |
|
| 269 | - return $sb; |
|
| 270 | - } |
|
| 249 | + function skipInTag ($chars) {
|
|
| 250 | + $sb = ""; |
|
| 251 | + while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 252 | + if ($ch == ">") {
|
|
| 253 | + return $sb; |
|
| 254 | + } else {
|
|
| 255 | + $match = false; |
|
| 256 | + for ($idx = 0; $idx < count($chars); $idx++) {
|
|
| 257 | + if ($ch == $chars[$idx]) {
|
|
| 258 | + $match = true; |
|
| 259 | + break; |
|
| 260 | + } |
|
| 261 | + } |
|
| 262 | + if (!$match) {
|
|
| 263 | + return $sb; |
|
| 264 | + } |
|
| 265 | + $sb .= $ch; |
|
| 266 | + $this->moveNext(); |
|
| 267 | + } |
|
| 268 | + } |
|
| 269 | + return $sb; |
|
| 270 | + } |
|
| 271 | 271 | |
| 272 | - function skipMaxInTag ($chars, $maxChars) {
|
|
| 273 | - $sb = ""; |
|
| 274 | - $count = 0; |
|
| 275 | - while (($ch = $this->iCurrentChar) !== -1 && $count++ < $maxChars) {
|
|
| 276 | - if ($ch == ">") {
|
|
| 277 | - return $sb; |
|
| 278 | - } else {
|
|
| 279 | - $match = false; |
|
| 280 | - for ($idx = 0; $idx < count($chars); $idx++) {
|
|
| 281 | - if ($ch == $chars[$idx]) {
|
|
| 282 | - $match = true; |
|
| 283 | - break; |
|
| 284 | - } |
|
| 285 | - } |
|
| 286 | - if (!$match) {
|
|
| 287 | - return $sb; |
|
| 288 | - } |
|
| 289 | - $sb .= $ch; |
|
| 290 | - $this->moveNext(); |
|
| 291 | - } |
|
| 292 | - } |
|
| 293 | - return $sb; |
|
| 294 | - } |
|
| 272 | + function skipMaxInTag ($chars, $maxChars) {
|
|
| 273 | + $sb = ""; |
|
| 274 | + $count = 0; |
|
| 275 | + while (($ch = $this->iCurrentChar) !== -1 && $count++ < $maxChars) {
|
|
| 276 | + if ($ch == ">") {
|
|
| 277 | + return $sb; |
|
| 278 | + } else {
|
|
| 279 | + $match = false; |
|
| 280 | + for ($idx = 0; $idx < count($chars); $idx++) {
|
|
| 281 | + if ($ch == $chars[$idx]) {
|
|
| 282 | + $match = true; |
|
| 283 | + break; |
|
| 284 | + } |
|
| 285 | + } |
|
| 286 | + if (!$match) {
|
|
| 287 | + return $sb; |
|
| 288 | + } |
|
| 289 | + $sb .= $ch; |
|
| 290 | + $this->moveNext(); |
|
| 291 | + } |
|
| 292 | + } |
|
| 293 | + return $sb; |
|
| 294 | + } |
|
| 295 | 295 | |
| 296 | - function skipToInTag ($chars) {
|
|
| 297 | - $sb = ""; |
|
| 298 | - while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 299 | - $match = $ch == ">"; |
|
| 300 | - if (!$match) {
|
|
| 301 | - for ($idx = 0; $idx < count($chars); $idx++) {
|
|
| 302 | - if ($ch == $chars[$idx]) {
|
|
| 303 | - $match = true; |
|
| 304 | - break; |
|
| 305 | - } |
|
| 306 | - } |
|
| 307 | - } |
|
| 308 | - if ($match) {
|
|
| 309 | - return $sb; |
|
| 310 | - } |
|
| 311 | - $sb .= $ch; |
|
| 312 | - $this->moveNext(); |
|
| 313 | - } |
|
| 314 | - return $sb; |
|
| 315 | - } |
|
| 296 | + function skipToInTag ($chars) {
|
|
| 297 | + $sb = ""; |
|
| 298 | + while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 299 | + $match = $ch == ">"; |
|
| 300 | + if (!$match) {
|
|
| 301 | + for ($idx = 0; $idx < count($chars); $idx++) {
|
|
| 302 | + if ($ch == $chars[$idx]) {
|
|
| 303 | + $match = true; |
|
| 304 | + break; |
|
| 305 | + } |
|
| 306 | + } |
|
| 307 | + } |
|
| 308 | + if ($match) {
|
|
| 309 | + return $sb; |
|
| 310 | + } |
|
| 311 | + $sb .= $ch; |
|
| 312 | + $this->moveNext(); |
|
| 313 | + } |
|
| 314 | + return $sb; |
|
| 315 | + } |
|
| 316 | 316 | |
| 317 | - function skipToElement() {
|
|
| 318 | - $sb = ""; |
|
| 319 | - while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 320 | - if ($ch == "<") {
|
|
| 321 | - return $sb; |
|
| 322 | - } |
|
| 323 | - $sb .= $ch; |
|
| 324 | - $this->moveNext(); |
|
| 325 | - } |
|
| 326 | - return $sb; |
|
| 327 | - } |
|
| 317 | + function skipToElement() {
|
|
| 318 | + $sb = ""; |
|
| 319 | + while (($ch = $this->iCurrentChar) !== -1) {
|
|
| 320 | + if ($ch == "<") {
|
|
| 321 | + return $sb; |
|
| 322 | + } |
|
| 323 | + $sb .= $ch; |
|
| 324 | + $this->moveNext(); |
|
| 325 | + } |
|
| 326 | + return $sb; |
|
| 327 | + } |
|
| 328 | 328 | |
| 329 | - /** |
|
| 330 | - * Returns text between current position and $needle, |
|
| 331 | - * inclusive, or "" if not found. The current index is moved to a point |
|
| 332 | - * after the location of $needle, or not moved at all |
|
| 333 | - * if nothing is found. |
|
| 334 | - */ |
|
| 335 | - function skipToStringInTag ($needle) {
|
|
| 336 | - $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex); |
|
| 337 | - if ($pos === false) {
|
|
| 338 | - return ""; |
|
| 339 | - } |
|
| 340 | - $top = $pos + strlen($needle); |
|
| 341 | - $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex); |
|
| 342 | - $this->setTextIndex ($top); |
|
| 343 | - return $retvalue; |
|
| 344 | - } |
|
| 329 | + /** |
|
| 330 | + * Returns text between current position and $needle, |
|
| 331 | + * inclusive, or "" if not found. The current index is moved to a point |
|
| 332 | + * after the location of $needle, or not moved at all |
|
| 333 | + * if nothing is found. |
|
| 334 | + */ |
|
| 335 | + function skipToStringInTag ($needle) {
|
|
| 336 | + $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex); |
|
| 337 | + if ($pos === false) {
|
|
| 338 | + return ""; |
|
| 339 | + } |
|
| 340 | + $top = $pos + strlen($needle); |
|
| 341 | + $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex); |
|
| 342 | + $this->setTextIndex ($top); |
|
| 343 | + return $retvalue; |
|
| 344 | + } |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | function HtmlParser_ForFile ($fileName) {
|
| 348 | - return HtmlParser_ForURL($fileName); |
|
| 348 | + return HtmlParser_ForURL($fileName); |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | function HtmlParser_ForURL ($url) {
|
| 352 | - $fp = fopen ($url, "r"); |
|
| 353 | - $content = ""; |
|
| 354 | - while (true) {
|
|
| 355 | - $data = fread ($fp, 8192); |
|
| 356 | - if (strlen($data) == 0) {
|
|
| 357 | - break; |
|
| 358 | - } |
|
| 359 | - $content .= $data; |
|
| 360 | - } |
|
| 361 | - fclose ($fp); |
|
| 362 | - return new HtmlParser ($content); |
|
| 352 | + $fp = fopen ($url, "r"); |
|
| 353 | + $content = ""; |
|
| 354 | + while (true) {
|
|
| 355 | + $data = fread ($fp, 8192); |
|
| 356 | + if (strlen($data) == 0) {
|
|
| 357 | + break; |
|
| 358 | + } |
|
| 359 | + $content .= $data; |
|
| 360 | + } |
|
| 361 | + fclose ($fp); |
|
| 362 | + return new HtmlParser ($content); |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | php?> |
@@ -129,8 +129,7 @@ discard block |
||
| 129 | 129 | $this->iNodeName = "Comment"; |
| 130 | 130 | $this->iNodeValue = "<" . $name . ">"; |
| 131 | 131 | $comment = true; |
| 132 | - } |
|
| 133 | - else {
|
|
| 132 | + } else {
|
|
| 134 | 133 | $rest = $this->skipToStringInTag ("-->");
|
| 135 | 134 | if ($rest != "") {
|
| 136 | 135 | $this->iNodeType = NODE_TYPE_COMMENT; |
@@ -148,8 +147,7 @@ discard block |
||
| 148 | 147 | $this->iNodeValue = "<" . $name; |
| 149 | 148 | return true; |
| 150 | 149 | } |
| 151 | - } |
|
| 152 | - else {
|
|
| 150 | + } else {
|
|
| 153 | 151 | $this->iNodeType = NODE_TYPE_ELEMENT; |
| 154 | 152 | $this->iNodeValue = ""; |
| 155 | 153 | $this->iNodeName = $name; |
@@ -162,8 +160,7 @@ discard block |
||
| 162 | 160 | $this->skipBlanksInTag(); |
| 163 | 161 | $value = $this->readValueInTag(); |
| 164 | 162 | $this->iNodeAttributes[strtolower($attrName)] = $value; |
| 165 | - } |
|
| 166 | - else {
|
|
| 163 | + } else {
|
|
| 167 | 164 | $this->iNodeAttributes[strtolower($attrName)] = ""; |
| 168 | 165 | } |
| 169 | 166 | } |
@@ -204,13 +201,11 @@ discard block |
||
| 204 | 201 | $this->skipMaxInTag ("\"", 1);
|
| 205 | 202 | $value = $this->skipToInTag ("\"");
|
| 206 | 203 | $this->skipMaxInTag ("\"", 1);
|
| 207 | - } |
|
| 208 | - else if ($ch == "'") {
|
|
| 204 | + } else if ($ch == "'") {
|
|
| 209 | 205 | $this->skipMaxInTag ("'", 1);
|
| 210 | 206 | $value = $this->skipToInTag ("'");
|
| 211 | 207 | $this->skipMaxInTag ("'", 1);
|
| 212 | - } |
|
| 213 | - else {
|
|
| 208 | + } else {
|
|
| 214 | 209 | $value = $this->skipToBlanksInTag(); |
| 215 | 210 | } |
| 216 | 211 | return $value; |
@@ -220,8 +215,7 @@ discard block |
||
| 220 | 215 | $this->iHtmlTextIndex = $index; |
| 221 | 216 | if ($index >= $this->iHtmlTextLength) {
|
| 222 | 217 | $this->iCurrentChar = -1; |
| 223 | - } |
|
| 224 | - else {
|
|
| 218 | + } else {
|
|
| 225 | 219 | $this->iCurrentChar = $this->iHtmlText{$index};
|
| 226 | 220 | } |
| 227 | 221 | } |
@@ -230,8 +224,7 @@ discard block |
||
| 230 | 224 | if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {
|
| 231 | 225 | $this->setTextIndex ($this->iHtmlTextIndex + 1); |
| 232 | 226 | return true; |
| 233 | - } |
|
| 234 | - else {
|
|
| 227 | + } else {
|
|
| 235 | 228 | return false; |
| 236 | 229 | } |
| 237 | 230 | } |
@@ -10,12 +10,12 @@ discard block |
||
| 10 | 10 | * - Leo West (performance improvements) |
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | -define ("NODE_TYPE_START",0);
|
|
| 14 | -define ("NODE_TYPE_ELEMENT",1);
|
|
| 15 | -define ("NODE_TYPE_ENDELEMENT",2);
|
|
| 16 | -define ("NODE_TYPE_TEXT",3);
|
|
| 17 | -define ("NODE_TYPE_COMMENT",4);
|
|
| 18 | -define ("NODE_TYPE_DONE",5);
|
|
| 13 | +define("NODE_TYPE_START", 0);
|
|
| 14 | +define("NODE_TYPE_ELEMENT", 1);
|
|
| 15 | +define("NODE_TYPE_ENDELEMENT", 2);
|
|
| 16 | +define("NODE_TYPE_TEXT", 3);
|
|
| 17 | +define("NODE_TYPE_COMMENT", 4);
|
|
| 18 | +define("NODE_TYPE_DONE", 5);
|
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * Class HtmlParser. |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | * Constructs an HtmlParser instance with |
| 72 | 72 | * the HTML text given. |
| 73 | 73 | */ |
| 74 | - function HtmlParser ($aHtmlText) {
|
|
| 74 | + function HtmlParser($aHtmlText) {
|
|
| 75 | 75 | $this->iHtmlText = $aHtmlText; |
| 76 | 76 | $this->iHtmlTextLength = strlen($aHtmlText); |
| 77 | 77 | $this->iNodeAttributes = array(); |
| 78 | - $this->setTextIndex (0); |
|
| 78 | + $this->setTextIndex(0); |
|
| 79 | 79 | |
| 80 | - $this->BOE_ARRAY = array (" ", "\t", "\r", "\n", "=" );
|
|
| 81 | - $this->B_ARRAY = array (" ", "\t", "\r", "\n" );
|
|
| 82 | - $this->BOS_ARRAY = array (" ", "\t", "\r", "\n", "/" );
|
|
| 80 | + $this->BOE_ARRAY = array(" ", "\t", "\r", "\n", "=");
|
|
| 81 | + $this->B_ARRAY = array(" ", "\t", "\r", "\n");
|
|
| 82 | + $this->BOS_ARRAY = array(" ", "\t", "\r", "\n", "/");
|
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | return false; |
| 110 | 110 | } |
| 111 | 111 | $this->clearAttributes(); |
| 112 | - $this->skipMaxInTag ("<", 1);
|
|
| 112 | + $this->skipMaxInTag("<", 1);
|
|
| 113 | 113 | if ($this->iCurrentChar == '/') {
|
| 114 | 114 | $this->moveNext(); |
| 115 | 115 | $name = $this->skipToBlanksInTag(); |
@@ -120,22 +120,22 @@ discard block |
||
| 120 | 120 | return true; |
| 121 | 121 | } |
| 122 | 122 | $name = $this->skipToBlanksOrSlashInTag(); |
| 123 | - if (!$this->isValidTagIdentifier ($name)) {
|
|
| 123 | + if (!$this->isValidTagIdentifier($name)) {
|
|
| 124 | 124 | $comment = false; |
| 125 | 125 | if (strpos($name, "!--") === 0) {
|
| 126 | 126 | $ppos = strpos($name, "--", 3); |
| 127 | 127 | if (strpos($name, "--", 3) === (strlen($name) - 2)) {
|
| 128 | 128 | $this->iNodeType = NODE_TYPE_COMMENT; |
| 129 | 129 | $this->iNodeName = "Comment"; |
| 130 | - $this->iNodeValue = "<" . $name . ">"; |
|
| 130 | + $this->iNodeValue = "<".$name.">"; |
|
| 131 | 131 | $comment = true; |
| 132 | 132 | } |
| 133 | 133 | else {
|
| 134 | - $rest = $this->skipToStringInTag ("-->");
|
|
| 134 | + $rest = $this->skipToStringInTag("-->");
|
|
| 135 | 135 | if ($rest != "") {
|
| 136 | 136 | $this->iNodeType = NODE_TYPE_COMMENT; |
| 137 | 137 | $this->iNodeName = "Comment"; |
| 138 | - $this->iNodeValue = "<" . $name . $rest; |
|
| 138 | + $this->iNodeValue = "<".$name.$rest; |
|
| 139 | 139 | $comment = true; |
| 140 | 140 | // Already skipped end of tag |
| 141 | 141 | return true; |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | if (!$comment) {
|
| 146 | 146 | $this->iNodeType = NODE_TYPE_TEXT; |
| 147 | 147 | $this->iNodeName = "Text"; |
| 148 | - $this->iNodeValue = "<" . $name; |
|
| 148 | + $this->iNodeValue = "<".$name; |
|
| 149 | 149 | return true; |
| 150 | 150 | } |
| 151 | 151 | } |
@@ -173,42 +173,42 @@ discard block |
||
| 173 | 173 | return true; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - function isValidTagIdentifier ($name) {
|
|
| 177 | - return ereg ("^[A-Za-z0-9_\\-]+$", $name);
|
|
| 176 | + function isValidTagIdentifier($name) {
|
|
| 177 | + return ereg("^[A-Za-z0-9_\\-]+$", $name);
|
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | function skipBlanksInTag() {
|
| 181 | - return "" != ($this->skipInTag ($this->B_ARRAY)); |
|
| 181 | + return "" != ($this->skipInTag($this->B_ARRAY)); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | function skipToBlanksOrEqualsInTag() {
|
| 185 | - return $this->skipToInTag ($this->BOE_ARRAY); |
|
| 185 | + return $this->skipToInTag($this->BOE_ARRAY); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | function skipToBlanksInTag() {
|
| 189 | - return $this->skipToInTag ($this->B_ARRAY); |
|
| 189 | + return $this->skipToInTag($this->B_ARRAY); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | function skipToBlanksOrSlashInTag() {
|
| 193 | - return $this->skipToInTag ($this->BOS_ARRAY); |
|
| 193 | + return $this->skipToInTag($this->BOS_ARRAY); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | function skipEqualsInTag() {
|
| 197 | - return $this->skipMaxInTag ("=", 1);
|
|
| 197 | + return $this->skipMaxInTag("=", 1);
|
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | function readValueInTag() {
|
| 201 | 201 | $ch = $this->iCurrentChar; |
| 202 | 202 | $value = ""; |
| 203 | 203 | if ($ch == "\"") {
|
| 204 | - $this->skipMaxInTag ("\"", 1);
|
|
| 205 | - $value = $this->skipToInTag ("\"");
|
|
| 206 | - $this->skipMaxInTag ("\"", 1);
|
|
| 204 | + $this->skipMaxInTag("\"", 1);
|
|
| 205 | + $value = $this->skipToInTag("\"");
|
|
| 206 | + $this->skipMaxInTag("\"", 1);
|
|
| 207 | 207 | } |
| 208 | 208 | else if ($ch == "'") {
|
| 209 | - $this->skipMaxInTag ("'", 1);
|
|
| 210 | - $value = $this->skipToInTag ("'");
|
|
| 211 | - $this->skipMaxInTag ("'", 1);
|
|
| 209 | + $this->skipMaxInTag("'", 1);
|
|
| 210 | + $value = $this->skipToInTag("'");
|
|
| 211 | + $this->skipMaxInTag("'", 1);
|
|
| 212 | 212 | } |
| 213 | 213 | else {
|
| 214 | 214 | $value = $this->skipToBlanksInTag(); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | return $value; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - function setTextIndex ($index) {
|
|
| 219 | + function setTextIndex($index) {
|
|
| 220 | 220 | $this->iHtmlTextIndex = $index; |
| 221 | 221 | if ($index >= $this->iHtmlTextLength) {
|
| 222 | 222 | $this->iCurrentChar = -1; |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | function moveNext() {
|
| 230 | 230 | if ($this->iHtmlTextIndex < $this->iHtmlTextLength) {
|
| 231 | - $this->setTextIndex ($this->iHtmlTextIndex + 1); |
|
| 231 | + $this->setTextIndex($this->iHtmlTextIndex + 1); |
|
| 232 | 232 | return true; |
| 233 | 233 | } |
| 234 | 234 | else {
|
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | } |
| 247 | 247 | } |
| 248 | 248 | |
| 249 | - function skipInTag ($chars) {
|
|
| 249 | + function skipInTag($chars) {
|
|
| 250 | 250 | $sb = ""; |
| 251 | 251 | while (($ch = $this->iCurrentChar) !== -1) {
|
| 252 | 252 | if ($ch == ">") {
|
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | return $sb; |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | - function skipMaxInTag ($chars, $maxChars) {
|
|
| 272 | + function skipMaxInTag($chars, $maxChars) {
|
|
| 273 | 273 | $sb = ""; |
| 274 | 274 | $count = 0; |
| 275 | 275 | while (($ch = $this->iCurrentChar) !== -1 && $count++ < $maxChars) {
|
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | return $sb; |
| 294 | 294 | } |
| 295 | 295 | |
| 296 | - function skipToInTag ($chars) {
|
|
| 296 | + function skipToInTag($chars) {
|
|
| 297 | 297 | $sb = ""; |
| 298 | 298 | while (($ch = $this->iCurrentChar) !== -1) {
|
| 299 | 299 | $match = $ch == ">"; |
@@ -332,34 +332,34 @@ discard block |
||
| 332 | 332 | * after the location of $needle, or not moved at all |
| 333 | 333 | * if nothing is found. |
| 334 | 334 | */ |
| 335 | - function skipToStringInTag ($needle) {
|
|
| 336 | - $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex); |
|
| 335 | + function skipToStringInTag($needle) {
|
|
| 336 | + $pos = strpos($this->iHtmlText, $needle, $this->iHtmlTextIndex); |
|
| 337 | 337 | if ($pos === false) {
|
| 338 | 338 | return ""; |
| 339 | 339 | } |
| 340 | 340 | $top = $pos + strlen($needle); |
| 341 | - $retvalue = substr ($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex); |
|
| 342 | - $this->setTextIndex ($top); |
|
| 341 | + $retvalue = substr($this->iHtmlText, $this->iHtmlTextIndex, $top - $this->iHtmlTextIndex); |
|
| 342 | + $this->setTextIndex($top); |
|
| 343 | 343 | return $retvalue; |
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | -function HtmlParser_ForFile ($fileName) {
|
|
| 347 | +function HtmlParser_ForFile($fileName) {
|
|
| 348 | 348 | return HtmlParser_ForURL($fileName); |
| 349 | 349 | } |
| 350 | 350 | |
| 351 | -function HtmlParser_ForURL ($url) {
|
|
| 352 | - $fp = fopen ($url, "r"); |
|
| 351 | +function HtmlParser_ForURL($url) {
|
|
| 352 | + $fp = fopen($url, "r"); |
|
| 353 | 353 | $content = ""; |
| 354 | 354 | while (true) {
|
| 355 | - $data = fread ($fp, 8192); |
|
| 355 | + $data = fread($fp, 8192); |
|
| 356 | 356 | if (strlen($data) == 0) {
|
| 357 | 357 | break; |
| 358 | 358 | } |
| 359 | 359 | $content .= $data; |
| 360 | 360 | } |
| 361 | - fclose ($fp); |
|
| 362 | - return new HtmlParser ($content); |
|
| 361 | + fclose($fp); |
|
| 362 | + return new HtmlParser($content); |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | php?> |
@@ -173,6 +173,9 @@ discard block |
||
| 173 | 173 | return true; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | + /** |
|
| 177 | + * @param string $name |
|
| 178 | + */ |
|
| 176 | 179 | function isValidTagIdentifier ($name) {
|
| 177 | 180 | return ereg ("^[A-Za-z0-9_\\-]+$", $name);
|
| 178 | 181 | } |
@@ -216,6 +219,9 @@ discard block |
||
| 216 | 219 | return $value; |
| 217 | 220 | } |
| 218 | 221 | |
| 222 | + /** |
|
| 223 | + * @param integer $index |
|
| 224 | + */ |
|
| 219 | 225 | function setTextIndex ($index) {
|
| 220 | 226 | $this->iHtmlTextIndex = $index; |
| 221 | 227 | if ($index >= $this->iHtmlTextLength) {
|
@@ -246,6 +252,9 @@ discard block |
||
| 246 | 252 | } |
| 247 | 253 | } |
| 248 | 254 | |
| 255 | + /** |
|
| 256 | + * @param string[] $chars |
|
| 257 | + */ |
|
| 249 | 258 | function skipInTag ($chars) {
|
| 250 | 259 | $sb = ""; |
| 251 | 260 | while (($ch = $this->iCurrentChar) !== -1) {
|
@@ -269,6 +278,10 @@ discard block |
||
| 269 | 278 | return $sb; |
| 270 | 279 | } |
| 271 | 280 | |
| 281 | + /** |
|
| 282 | + * @param string $chars |
|
| 283 | + * @param integer $maxChars |
|
| 284 | + */ |
|
| 272 | 285 | function skipMaxInTag ($chars, $maxChars) {
|
| 273 | 286 | $sb = ""; |
| 274 | 287 | $count = 0; |
@@ -331,6 +344,7 @@ discard block |
||
| 331 | 344 | * inclusive, or "" if not found. The current index is moved to a point |
| 332 | 345 | * after the location of $needle, or not moved at all |
| 333 | 346 | * if nothing is found. |
| 347 | + * @param string $needle |
|
| 334 | 348 | */ |
| 335 | 349 | function skipToStringInTag ($needle) {
|
| 336 | 350 | $pos = strpos ($this->iHtmlText, $needle, $this->iHtmlTextIndex); |
@@ -39,99 +39,99 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | abstract class HTTP_Request2_Adapter |
| 41 | 41 | {
|
| 42 | - /** |
|
| 43 | - * A list of methods that MUST NOT have a request body, per RFC 2616 |
|
| 44 | - * @var array |
|
| 45 | - */ |
|
| 46 | - protected static $bodyDisallowed = array('TRACE');
|
|
| 42 | + /** |
|
| 43 | + * A list of methods that MUST NOT have a request body, per RFC 2616 |
|
| 44 | + * @var array |
|
| 45 | + */ |
|
| 46 | + protected static $bodyDisallowed = array('TRACE');
|
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Methods having defined semantics for request body |
|
| 50 | - * |
|
| 51 | - * Content-Length header (indicating that the body follows, section 4.3 of |
|
| 52 | - * RFC 2616) will be sent for these methods even if no body was added |
|
| 53 | - * |
|
| 54 | - * @var array |
|
| 55 | - * @link http://pear.php.net/bugs/bug.php?id=12900 |
|
| 56 | - * @link http://pear.php.net/bugs/bug.php?id=14740 |
|
| 57 | - */ |
|
| 58 | - protected static $bodyRequired = array('POST', 'PUT');
|
|
| 48 | + /** |
|
| 49 | + * Methods having defined semantics for request body |
|
| 50 | + * |
|
| 51 | + * Content-Length header (indicating that the body follows, section 4.3 of |
|
| 52 | + * RFC 2616) will be sent for these methods even if no body was added |
|
| 53 | + * |
|
| 54 | + * @var array |
|
| 55 | + * @link http://pear.php.net/bugs/bug.php?id=12900 |
|
| 56 | + * @link http://pear.php.net/bugs/bug.php?id=14740 |
|
| 57 | + */ |
|
| 58 | + protected static $bodyRequired = array('POST', 'PUT');
|
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * Request being sent |
|
| 62 | - * @var HTTP_Request2 |
|
| 63 | - */ |
|
| 64 | - protected $request; |
|
| 60 | + /** |
|
| 61 | + * Request being sent |
|
| 62 | + * @var HTTP_Request2 |
|
| 63 | + */ |
|
| 64 | + protected $request; |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * Request body |
|
| 68 | - * @var string|resource|HTTP_Request2_MultipartBody |
|
| 69 | - * @see HTTP_Request2::getBody() |
|
| 70 | - */ |
|
| 71 | - protected $requestBody; |
|
| 66 | + /** |
|
| 67 | + * Request body |
|
| 68 | + * @var string|resource|HTTP_Request2_MultipartBody |
|
| 69 | + * @see HTTP_Request2::getBody() |
|
| 70 | + */ |
|
| 71 | + protected $requestBody; |
|
| 72 | 72 | |
| 73 | - /** |
|
| 74 | - * Length of the request body |
|
| 75 | - * @var integer |
|
| 76 | - */ |
|
| 77 | - protected $contentLength; |
|
| 73 | + /** |
|
| 74 | + * Length of the request body |
|
| 75 | + * @var integer |
|
| 76 | + */ |
|
| 77 | + protected $contentLength; |
|
| 78 | 78 | |
| 79 | - /** |
|
| 80 | - * Sends request to the remote server and returns its response |
|
| 81 | - * |
|
| 82 | - * @param HTTP_Request2 $request HTTP request message |
|
| 83 | - * |
|
| 84 | - * @return HTTP_Request2_Response |
|
| 85 | - * @throws HTTP_Request2_Exception |
|
| 86 | - */ |
|
| 87 | - abstract public function sendRequest(HTTP_Request2 $request); |
|
| 79 | + /** |
|
| 80 | + * Sends request to the remote server and returns its response |
|
| 81 | + * |
|
| 82 | + * @param HTTP_Request2 $request HTTP request message |
|
| 83 | + * |
|
| 84 | + * @return HTTP_Request2_Response |
|
| 85 | + * @throws HTTP_Request2_Exception |
|
| 86 | + */ |
|
| 87 | + abstract public function sendRequest(HTTP_Request2 $request); |
|
| 88 | 88 | |
| 89 | - /** |
|
| 90 | - * Calculates length of the request body, adds proper headers |
|
| 91 | - * |
|
| 92 | - * @param array &$headers associative array of request headers, this method |
|
| 93 | - * will add proper 'Content-Length' and 'Content-Type' |
|
| 94 | - * headers to this array (or remove them if not needed) |
|
| 95 | - */ |
|
| 96 | - protected function calculateRequestLength(&$headers) |
|
| 97 | - {
|
|
| 98 | - $this->requestBody = $this->request->getBody(); |
|
| 89 | + /** |
|
| 90 | + * Calculates length of the request body, adds proper headers |
|
| 91 | + * |
|
| 92 | + * @param array &$headers associative array of request headers, this method |
|
| 93 | + * will add proper 'Content-Length' and 'Content-Type' |
|
| 94 | + * headers to this array (or remove them if not needed) |
|
| 95 | + */ |
|
| 96 | + protected function calculateRequestLength(&$headers) |
|
| 97 | + {
|
|
| 98 | + $this->requestBody = $this->request->getBody(); |
|
| 99 | 99 | |
| 100 | - if (is_string($this->requestBody)) {
|
|
| 101 | - $this->contentLength = strlen($this->requestBody); |
|
| 102 | - } elseif (is_resource($this->requestBody)) {
|
|
| 103 | - $stat = fstat($this->requestBody); |
|
| 104 | - $this->contentLength = $stat['size']; |
|
| 105 | - rewind($this->requestBody); |
|
| 106 | - } else {
|
|
| 107 | - $this->contentLength = $this->requestBody->getLength(); |
|
| 108 | - $headers['content-type'] = 'multipart/form-data; boundary=' . |
|
| 109 | - $this->requestBody->getBoundary(); |
|
| 110 | - $this->requestBody->rewind(); |
|
| 111 | - } |
|
| 100 | + if (is_string($this->requestBody)) {
|
|
| 101 | + $this->contentLength = strlen($this->requestBody); |
|
| 102 | + } elseif (is_resource($this->requestBody)) {
|
|
| 103 | + $stat = fstat($this->requestBody); |
|
| 104 | + $this->contentLength = $stat['size']; |
|
| 105 | + rewind($this->requestBody); |
|
| 106 | + } else {
|
|
| 107 | + $this->contentLength = $this->requestBody->getLength(); |
|
| 108 | + $headers['content-type'] = 'multipart/form-data; boundary=' . |
|
| 109 | + $this->requestBody->getBoundary(); |
|
| 110 | + $this->requestBody->rewind(); |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - if (in_array($this->request->getMethod(), self::$bodyDisallowed) |
|
| 114 | - || 0 == $this->contentLength |
|
| 115 | - ) {
|
|
| 116 | - // No body: send a Content-Length header nonetheless (request #12900), |
|
| 117 | - // but do that only for methods that require a body (bug #14740) |
|
| 118 | - if (in_array($this->request->getMethod(), self::$bodyRequired)) {
|
|
| 119 | - $headers['content-length'] = 0; |
|
| 120 | - } else {
|
|
| 121 | - unset($headers['content-length']); |
|
| 122 | - // if the method doesn't require a body and doesn't have a |
|
| 123 | - // body, don't send a Content-Type header. (request #16799) |
|
| 124 | - unset($headers['content-type']); |
|
| 125 | - } |
|
| 126 | - } else {
|
|
| 127 | - if (empty($headers['content-type'])) {
|
|
| 128 | - $headers['content-type'] = 'application/x-www-form-urlencoded'; |
|
| 129 | - } |
|
| 130 | - // Content-Length should not be sent for chunked Transfer-Encoding (bug #20125) |
|
| 131 | - if (!isset($headers['transfer-encoding'])) {
|
|
| 132 | - $headers['content-length'] = $this->contentLength; |
|
| 133 | - } |
|
| 134 | - } |
|
| 135 | - } |
|
| 113 | + if (in_array($this->request->getMethod(), self::$bodyDisallowed) |
|
| 114 | + || 0 == $this->contentLength |
|
| 115 | + ) {
|
|
| 116 | + // No body: send a Content-Length header nonetheless (request #12900), |
|
| 117 | + // but do that only for methods that require a body (bug #14740) |
|
| 118 | + if (in_array($this->request->getMethod(), self::$bodyRequired)) {
|
|
| 119 | + $headers['content-length'] = 0; |
|
| 120 | + } else {
|
|
| 121 | + unset($headers['content-length']); |
|
| 122 | + // if the method doesn't require a body and doesn't have a |
|
| 123 | + // body, don't send a Content-Type header. (request #16799) |
|
| 124 | + unset($headers['content-type']); |
|
| 125 | + } |
|
| 126 | + } else {
|
|
| 127 | + if (empty($headers['content-type'])) {
|
|
| 128 | + $headers['content-type'] = 'application/x-www-form-urlencoded'; |
|
| 129 | + } |
|
| 130 | + // Content-Length should not be sent for chunked Transfer-Encoding (bug #20125) |
|
| 131 | + if (!isset($headers['transfer-encoding'])) {
|
|
| 132 | + $headers['content-length'] = $this->contentLength; |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | + } |
|
| 136 | 136 | } |
| 137 | 137 | ?> |
@@ -105,7 +105,7 @@ |
||
| 105 | 105 | rewind($this->requestBody); |
| 106 | 106 | } else {
|
| 107 | 107 | $this->contentLength = $this->requestBody->getLength(); |
| 108 | - $headers['content-type'] = 'multipart/form-data; boundary=' . |
|
| 108 | + $headers['content-type'] = 'multipart/form-data; boundary='. |
|
| 109 | 109 | $this->requestBody->getBoundary(); |
| 110 | 110 | $this->requestBody->rewind(); |
| 111 | 111 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | $this->_checkCacheDir(); |
| 15 | 15 | |
| 16 | 16 | // purifier setting |
| 17 | - require_once _XE_PATH_ . 'classes/security/htmlpurifier/library/HTMLPurifier.auto.php'; |
|
| 17 | + require_once _XE_PATH_.'classes/security/htmlpurifier/library/HTMLPurifier.auto.php'; |
|
| 18 | 18 | require_once 'HTMLPurifier.func.php'; |
| 19 | 19 | |
| 20 | 20 | $this->_setConfig(); |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function getInstance() |
| 24 | 24 | { |
| 25 | - if(!isset($GLOBALS['__PURIFIER_INSTANCE__'])) |
|
| 25 | + if (!isset($GLOBALS['__PURIFIER_INSTANCE__'])) |
|
| 26 | 26 | { |
| 27 | 27 | $GLOBALS['__PURIFIER_INSTANCE__'] = new Purifier(); |
| 28 | 28 | } |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | { |
| 53 | 53 | // add attribute for edit component |
| 54 | 54 | $editComponentAttrs = $this->_searchEditComponent($content); |
| 55 | - if(is_array($editComponentAttrs)) |
|
| 55 | + if (is_array($editComponentAttrs)) |
|
| 56 | 56 | { |
| 57 | - foreach($editComponentAttrs AS $k => $v) |
|
| 57 | + foreach ($editComponentAttrs AS $k => $v) |
|
| 58 | 58 | { |
| 59 | 59 | $this->_def->addAttribute('img', $v, 'CDATA'); |
| 60 | 60 | $this->_def->addAttribute('div', $v, 'CDATA'); |
@@ -63,9 +63,9 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | // add attribute for widget component |
| 65 | 65 | $widgetAttrs = $this->_searchWidget($content); |
| 66 | - if(is_array($widgetAttrs)) |
|
| 66 | + if (is_array($widgetAttrs)) |
|
| 67 | 67 | { |
| 68 | - foreach($widgetAttrs AS $k => $v) |
|
| 68 | + foreach ($widgetAttrs AS $k => $v) |
|
| 69 | 69 | { |
| 70 | 70 | $this->_def->addAttribute('img', $v, 'CDATA'); |
| 71 | 71 | } |
@@ -82,19 +82,19 @@ discard block |
||
| 82 | 82 | preg_match_all('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', $content, $m); |
| 83 | 83 | |
| 84 | 84 | $attributeList = array(); |
| 85 | - if(is_array($m[2])) |
|
| 85 | + if (is_array($m[2])) |
|
| 86 | 86 | { |
| 87 | - foreach($m[2] as $key => $value) |
|
| 87 | + foreach ($m[2] as $key => $value) |
|
| 88 | 88 | { |
| 89 | 89 | unset($script, $m2); |
| 90 | 90 | $script = " {$m[2][$key]} editor_component={$m[3][$key]}"; |
| 91 | 91 | |
| 92 | - if(preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $script, $m2)) |
|
| 92 | + if (preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $script, $m2)) |
|
| 93 | 93 | { |
| 94 | - foreach($m2[1] as $value2) |
|
| 94 | + foreach ($m2[1] as $value2) |
|
| 95 | 95 | { |
| 96 | 96 | //SECISSUE check style attr |
| 97 | - if($value2 == 'style') |
|
| 97 | + if ($value2 == 'style') |
|
| 98 | 98 | { |
| 99 | 99 | continue; |
| 100 | 100 | } |
@@ -117,18 +117,18 @@ discard block |
||
| 117 | 117 | preg_match_all('!<(?:(div)|img)([^>]*)class="zbxe_widget_output"([^>]*)>(?(1)(.*?)</div>)!is', $content, $m); |
| 118 | 118 | |
| 119 | 119 | $attributeList = array(); |
| 120 | - if(is_array($m[3])) |
|
| 120 | + if (is_array($m[3])) |
|
| 121 | 121 | { |
| 122 | 122 | $content = str_replace('<img class="zbxe_widget_output"', '<img src="" class="zbxe_widget_output"', $content); |
| 123 | 123 | |
| 124 | - foreach($m[3] as $key => $value) |
|
| 124 | + foreach ($m[3] as $key => $value) |
|
| 125 | 125 | { |
| 126 | 126 | if (preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $m[3][$key], $m2)) |
| 127 | 127 | { |
| 128 | - foreach($m2[1] as $value2) |
|
| 128 | + foreach ($m2[1] as $value2) |
|
| 129 | 129 | { |
| 130 | 130 | //SECISSUE check style attr |
| 131 | - if($value2 == 'style') |
|
| 131 | + if ($value2 == 'style') |
|
| 132 | 132 | { |
| 133 | 133 | continue; |
| 134 | 134 | } |
@@ -146,12 +146,12 @@ discard block |
||
| 146 | 146 | $whiteIframeUrlList = $oEmbedFilter->getWhiteIframeUrlList(); |
| 147 | 147 | |
| 148 | 148 | $whiteDomain = array(); |
| 149 | - foreach($whiteIframeUrlList as $value) |
|
| 149 | + foreach ($whiteIframeUrlList as $value) |
|
| 150 | 150 | { |
| 151 | 151 | $whiteDomain[] = preg_quote($value, '%'); |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - $whiteDomainRegex = '%^(' . implode('|', $whiteDomain) . ')%'; |
|
| 154 | + $whiteDomainRegex = '%^('.implode('|', $whiteDomain).')%'; |
|
| 155 | 155 | |
| 156 | 156 | return $whiteDomainRegex; |
| 157 | 157 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | private function _checkCacheDir() |
| 160 | 160 | { |
| 161 | 161 | // check htmlpurifier cache directory |
| 162 | - $this->_cacheDir = _XE_PATH_ . 'files/cache/htmlpurifier'; |
|
| 162 | + $this->_cacheDir = _XE_PATH_.'files/cache/htmlpurifier'; |
|
| 163 | 163 | FileHandler::makeDir($this->_cacheDir); |
| 164 | 164 | } |
| 165 | 165 | |
@@ -12,204 +12,204 @@ |
||
| 12 | 12 | |
| 13 | 13 | $__dir = dirname(__FILE__); |
| 14 | 14 | |
| 15 | -require_once $__dir . '/HTMLPurifier.php'; |
|
| 16 | -require_once $__dir . '/HTMLPurifier/AttrCollections.php'; |
|
| 17 | -require_once $__dir . '/HTMLPurifier/AttrDef.php'; |
|
| 18 | -require_once $__dir . '/HTMLPurifier/AttrTransform.php'; |
|
| 19 | -require_once $__dir . '/HTMLPurifier/AttrTypes.php'; |
|
| 20 | -require_once $__dir . '/HTMLPurifier/AttrValidator.php'; |
|
| 21 | -require_once $__dir . '/HTMLPurifier/Bootstrap.php'; |
|
| 22 | -require_once $__dir . '/HTMLPurifier/Definition.php'; |
|
| 23 | -require_once $__dir . '/HTMLPurifier/CSSDefinition.php'; |
|
| 24 | -require_once $__dir . '/HTMLPurifier/ChildDef.php'; |
|
| 25 | -require_once $__dir . '/HTMLPurifier/Config.php'; |
|
| 26 | -require_once $__dir . '/HTMLPurifier/ConfigSchema.php'; |
|
| 27 | -require_once $__dir . '/HTMLPurifier/ContentSets.php'; |
|
| 28 | -require_once $__dir . '/HTMLPurifier/Context.php'; |
|
| 29 | -require_once $__dir . '/HTMLPurifier/DefinitionCache.php'; |
|
| 30 | -require_once $__dir . '/HTMLPurifier/DefinitionCacheFactory.php'; |
|
| 31 | -require_once $__dir . '/HTMLPurifier/Doctype.php'; |
|
| 32 | -require_once $__dir . '/HTMLPurifier/DoctypeRegistry.php'; |
|
| 33 | -require_once $__dir . '/HTMLPurifier/ElementDef.php'; |
|
| 34 | -require_once $__dir . '/HTMLPurifier/Encoder.php'; |
|
| 35 | -require_once $__dir . '/HTMLPurifier/EntityLookup.php'; |
|
| 36 | -require_once $__dir . '/HTMLPurifier/EntityParser.php'; |
|
| 37 | -require_once $__dir . '/HTMLPurifier/ErrorCollector.php'; |
|
| 38 | -require_once $__dir . '/HTMLPurifier/ErrorStruct.php'; |
|
| 39 | -require_once $__dir . '/HTMLPurifier/Exception.php'; |
|
| 40 | -require_once $__dir . '/HTMLPurifier/Filter.php'; |
|
| 41 | -require_once $__dir . '/HTMLPurifier/Generator.php'; |
|
| 42 | -require_once $__dir . '/HTMLPurifier/HTMLDefinition.php'; |
|
| 43 | -require_once $__dir . '/HTMLPurifier/HTMLModule.php'; |
|
| 44 | -require_once $__dir . '/HTMLPurifier/HTMLModuleManager.php'; |
|
| 45 | -require_once $__dir . '/HTMLPurifier/IDAccumulator.php'; |
|
| 46 | -require_once $__dir . '/HTMLPurifier/Injector.php'; |
|
| 47 | -require_once $__dir . '/HTMLPurifier/Language.php'; |
|
| 48 | -require_once $__dir . '/HTMLPurifier/LanguageFactory.php'; |
|
| 49 | -require_once $__dir . '/HTMLPurifier/Length.php'; |
|
| 50 | -require_once $__dir . '/HTMLPurifier/Lexer.php'; |
|
| 51 | -require_once $__dir . '/HTMLPurifier/PercentEncoder.php'; |
|
| 52 | -require_once $__dir . '/HTMLPurifier/PropertyList.php'; |
|
| 53 | -require_once $__dir . '/HTMLPurifier/PropertyListIterator.php'; |
|
| 54 | -require_once $__dir . '/HTMLPurifier/Strategy.php'; |
|
| 55 | -require_once $__dir . '/HTMLPurifier/StringHash.php'; |
|
| 56 | -require_once $__dir . '/HTMLPurifier/StringHashParser.php'; |
|
| 57 | -require_once $__dir . '/HTMLPurifier/TagTransform.php'; |
|
| 58 | -require_once $__dir . '/HTMLPurifier/Token.php'; |
|
| 59 | -require_once $__dir . '/HTMLPurifier/TokenFactory.php'; |
|
| 60 | -require_once $__dir . '/HTMLPurifier/URI.php'; |
|
| 61 | -require_once $__dir . '/HTMLPurifier/URIDefinition.php'; |
|
| 62 | -require_once $__dir . '/HTMLPurifier/URIFilter.php'; |
|
| 63 | -require_once $__dir . '/HTMLPurifier/URIParser.php'; |
|
| 64 | -require_once $__dir . '/HTMLPurifier/URIScheme.php'; |
|
| 65 | -require_once $__dir . '/HTMLPurifier/URISchemeRegistry.php'; |
|
| 66 | -require_once $__dir . '/HTMLPurifier/UnitConverter.php'; |
|
| 67 | -require_once $__dir . '/HTMLPurifier/VarParser.php'; |
|
| 68 | -require_once $__dir . '/HTMLPurifier/VarParserException.php'; |
|
| 69 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS.php'; |
|
| 70 | -require_once $__dir . '/HTMLPurifier/AttrDef/Clone.php'; |
|
| 71 | -require_once $__dir . '/HTMLPurifier/AttrDef/Enum.php'; |
|
| 72 | -require_once $__dir . '/HTMLPurifier/AttrDef/Integer.php'; |
|
| 73 | -require_once $__dir . '/HTMLPurifier/AttrDef/Lang.php'; |
|
| 74 | -require_once $__dir . '/HTMLPurifier/AttrDef/Switch.php'; |
|
| 75 | -require_once $__dir . '/HTMLPurifier/AttrDef/Text.php'; |
|
| 76 | -require_once $__dir . '/HTMLPurifier/AttrDef/URI.php'; |
|
| 77 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Number.php'; |
|
| 78 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/AlphaValue.php'; |
|
| 79 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Background.php'; |
|
| 80 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php'; |
|
| 81 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Border.php'; |
|
| 82 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Color.php'; |
|
| 83 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Composite.php'; |
|
| 84 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php'; |
|
| 85 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Filter.php'; |
|
| 86 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Font.php'; |
|
| 87 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/FontFamily.php'; |
|
| 88 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Ident.php'; |
|
| 89 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php'; |
|
| 90 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Length.php'; |
|
| 91 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/ListStyle.php'; |
|
| 92 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Multiple.php'; |
|
| 93 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/Percentage.php'; |
|
| 94 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/TextDecoration.php'; |
|
| 95 | -require_once $__dir . '/HTMLPurifier/AttrDef/CSS/URI.php'; |
|
| 96 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Bool.php'; |
|
| 97 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php'; |
|
| 98 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php'; |
|
| 99 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php'; |
|
| 100 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php'; |
|
| 101 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php'; |
|
| 102 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php'; |
|
| 103 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Length.php'; |
|
| 104 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/LinkTypes.php'; |
|
| 105 | -require_once $__dir . '/HTMLPurifier/AttrDef/HTML/MultiLength.php'; |
|
| 106 | -require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email.php'; |
|
| 107 | -require_once $__dir . '/HTMLPurifier/AttrDef/URI/Host.php'; |
|
| 108 | -require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv4.php'; |
|
| 109 | -require_once $__dir . '/HTMLPurifier/AttrDef/URI/IPv6.php'; |
|
| 110 | -require_once $__dir . '/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php'; |
|
| 111 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Background.php'; |
|
| 112 | -require_once $__dir . '/HTMLPurifier/AttrTransform/BdoDir.php'; |
|
| 113 | -require_once $__dir . '/HTMLPurifier/AttrTransform/BgColor.php'; |
|
| 114 | -require_once $__dir . '/HTMLPurifier/AttrTransform/BoolToCSS.php'; |
|
| 115 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Border.php'; |
|
| 116 | -require_once $__dir . '/HTMLPurifier/AttrTransform/EnumToCSS.php'; |
|
| 117 | -require_once $__dir . '/HTMLPurifier/AttrTransform/ImgRequired.php'; |
|
| 118 | -require_once $__dir . '/HTMLPurifier/AttrTransform/ImgSpace.php'; |
|
| 119 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Input.php'; |
|
| 120 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Lang.php'; |
|
| 121 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Length.php'; |
|
| 122 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Name.php'; |
|
| 123 | -require_once $__dir . '/HTMLPurifier/AttrTransform/NameSync.php'; |
|
| 124 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Nofollow.php'; |
|
| 125 | -require_once $__dir . '/HTMLPurifier/AttrTransform/SafeEmbed.php'; |
|
| 126 | -require_once $__dir . '/HTMLPurifier/AttrTransform/SafeObject.php'; |
|
| 127 | -require_once $__dir . '/HTMLPurifier/AttrTransform/SafeParam.php'; |
|
| 128 | -require_once $__dir . '/HTMLPurifier/AttrTransform/ScriptRequired.php'; |
|
| 129 | -require_once $__dir . '/HTMLPurifier/AttrTransform/TargetBlank.php'; |
|
| 130 | -require_once $__dir . '/HTMLPurifier/AttrTransform/Textarea.php'; |
|
| 131 | -require_once $__dir . '/HTMLPurifier/ChildDef/Chameleon.php'; |
|
| 132 | -require_once $__dir . '/HTMLPurifier/ChildDef/Custom.php'; |
|
| 133 | -require_once $__dir . '/HTMLPurifier/ChildDef/Empty.php'; |
|
| 134 | -require_once $__dir . '/HTMLPurifier/ChildDef/List.php'; |
|
| 135 | -require_once $__dir . '/HTMLPurifier/ChildDef/Required.php'; |
|
| 136 | -require_once $__dir . '/HTMLPurifier/ChildDef/Optional.php'; |
|
| 137 | -require_once $__dir . '/HTMLPurifier/ChildDef/StrictBlockquote.php'; |
|
| 138 | -require_once $__dir . '/HTMLPurifier/ChildDef/Table.php'; |
|
| 139 | -require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator.php'; |
|
| 140 | -require_once $__dir . '/HTMLPurifier/DefinitionCache/Null.php'; |
|
| 141 | -require_once $__dir . '/HTMLPurifier/DefinitionCache/Serializer.php'; |
|
| 142 | -require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php'; |
|
| 143 | -require_once $__dir . '/HTMLPurifier/DefinitionCache/Decorator/Memory.php'; |
|
| 144 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Bdo.php'; |
|
| 145 | -require_once $__dir . '/HTMLPurifier/HTMLModule/CommonAttributes.php'; |
|
| 146 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Edit.php'; |
|
| 147 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Forms.php'; |
|
| 148 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Hypertext.php'; |
|
| 149 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Iframe.php'; |
|
| 150 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Image.php'; |
|
| 151 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Legacy.php'; |
|
| 152 | -require_once $__dir . '/HTMLPurifier/HTMLModule/List.php'; |
|
| 153 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Name.php'; |
|
| 154 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Nofollow.php'; |
|
| 155 | -require_once $__dir . '/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php'; |
|
| 156 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Object.php'; |
|
| 157 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Presentation.php'; |
|
| 158 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Proprietary.php'; |
|
| 159 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Ruby.php'; |
|
| 160 | -require_once $__dir . '/HTMLPurifier/HTMLModule/SafeEmbed.php'; |
|
| 161 | -require_once $__dir . '/HTMLPurifier/HTMLModule/SafeObject.php'; |
|
| 162 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Scripting.php'; |
|
| 163 | -require_once $__dir . '/HTMLPurifier/HTMLModule/StyleAttribute.php'; |
|
| 164 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tables.php'; |
|
| 165 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Target.php'; |
|
| 166 | -require_once $__dir . '/HTMLPurifier/HTMLModule/TargetBlank.php'; |
|
| 167 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Text.php'; |
|
| 168 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy.php'; |
|
| 169 | -require_once $__dir . '/HTMLPurifier/HTMLModule/XMLCommonAttributes.php'; |
|
| 170 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Name.php'; |
|
| 171 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Proprietary.php'; |
|
| 172 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php'; |
|
| 173 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Strict.php'; |
|
| 174 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/Transitional.php'; |
|
| 175 | -require_once $__dir . '/HTMLPurifier/HTMLModule/Tidy/XHTML.php'; |
|
| 176 | -require_once $__dir . '/HTMLPurifier/Injector/AutoParagraph.php'; |
|
| 177 | -require_once $__dir . '/HTMLPurifier/Injector/DisplayLinkURI.php'; |
|
| 178 | -require_once $__dir . '/HTMLPurifier/Injector/Linkify.php'; |
|
| 179 | -require_once $__dir . '/HTMLPurifier/Injector/PurifierLinkify.php'; |
|
| 180 | -require_once $__dir . '/HTMLPurifier/Injector/RemoveEmpty.php'; |
|
| 181 | -require_once $__dir . '/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php'; |
|
| 182 | -require_once $__dir . '/HTMLPurifier/Injector/SafeObject.php'; |
|
| 183 | -require_once $__dir . '/HTMLPurifier/Lexer/DOMLex.php'; |
|
| 184 | -require_once $__dir . '/HTMLPurifier/Lexer/DirectLex.php'; |
|
| 185 | -require_once $__dir . '/HTMLPurifier/Strategy/Composite.php'; |
|
| 186 | -require_once $__dir . '/HTMLPurifier/Strategy/Core.php'; |
|
| 187 | -require_once $__dir . '/HTMLPurifier/Strategy/FixNesting.php'; |
|
| 188 | -require_once $__dir . '/HTMLPurifier/Strategy/MakeWellFormed.php'; |
|
| 189 | -require_once $__dir . '/HTMLPurifier/Strategy/RemoveForeignElements.php'; |
|
| 190 | -require_once $__dir . '/HTMLPurifier/Strategy/ValidateAttributes.php'; |
|
| 191 | -require_once $__dir . '/HTMLPurifier/TagTransform/Font.php'; |
|
| 192 | -require_once $__dir . '/HTMLPurifier/TagTransform/Simple.php'; |
|
| 193 | -require_once $__dir . '/HTMLPurifier/Token/Comment.php'; |
|
| 194 | -require_once $__dir . '/HTMLPurifier/Token/Tag.php'; |
|
| 195 | -require_once $__dir . '/HTMLPurifier/Token/Empty.php'; |
|
| 196 | -require_once $__dir . '/HTMLPurifier/Token/End.php'; |
|
| 197 | -require_once $__dir . '/HTMLPurifier/Token/Start.php'; |
|
| 198 | -require_once $__dir . '/HTMLPurifier/Token/Text.php'; |
|
| 199 | -require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternal.php'; |
|
| 200 | -require_once $__dir . '/HTMLPurifier/URIFilter/DisableExternalResources.php'; |
|
| 201 | -require_once $__dir . '/HTMLPurifier/URIFilter/DisableResources.php'; |
|
| 202 | -require_once $__dir . '/HTMLPurifier/URIFilter/HostBlacklist.php'; |
|
| 203 | -require_once $__dir . '/HTMLPurifier/URIFilter/MakeAbsolute.php'; |
|
| 204 | -require_once $__dir . '/HTMLPurifier/URIFilter/Munge.php'; |
|
| 205 | -require_once $__dir . '/HTMLPurifier/URIFilter/SafeIframe.php'; |
|
| 206 | -require_once $__dir . '/HTMLPurifier/URIScheme/data.php'; |
|
| 207 | -require_once $__dir . '/HTMLPurifier/URIScheme/file.php'; |
|
| 208 | -require_once $__dir . '/HTMLPurifier/URIScheme/ftp.php'; |
|
| 209 | -require_once $__dir . '/HTMLPurifier/URIScheme/http.php'; |
|
| 210 | -require_once $__dir . '/HTMLPurifier/URIScheme/https.php'; |
|
| 211 | -require_once $__dir . '/HTMLPurifier/URIScheme/mailto.php'; |
|
| 212 | -require_once $__dir . '/HTMLPurifier/URIScheme/news.php'; |
|
| 213 | -require_once $__dir . '/HTMLPurifier/URIScheme/nntp.php'; |
|
| 214 | -require_once $__dir . '/HTMLPurifier/VarParser/Flexible.php'; |
|
| 215 | -require_once $__dir . '/HTMLPurifier/VarParser/Native.php'; |
|
| 15 | +require_once $__dir.'/HTMLPurifier.php'; |
|
| 16 | +require_once $__dir.'/HTMLPurifier/AttrCollections.php'; |
|
| 17 | +require_once $__dir.'/HTMLPurifier/AttrDef.php'; |
|
| 18 | +require_once $__dir.'/HTMLPurifier/AttrTransform.php'; |
|
| 19 | +require_once $__dir.'/HTMLPurifier/AttrTypes.php'; |
|
| 20 | +require_once $__dir.'/HTMLPurifier/AttrValidator.php'; |
|
| 21 | +require_once $__dir.'/HTMLPurifier/Bootstrap.php'; |
|
| 22 | +require_once $__dir.'/HTMLPurifier/Definition.php'; |
|
| 23 | +require_once $__dir.'/HTMLPurifier/CSSDefinition.php'; |
|
| 24 | +require_once $__dir.'/HTMLPurifier/ChildDef.php'; |
|
| 25 | +require_once $__dir.'/HTMLPurifier/Config.php'; |
|
| 26 | +require_once $__dir.'/HTMLPurifier/ConfigSchema.php'; |
|
| 27 | +require_once $__dir.'/HTMLPurifier/ContentSets.php'; |
|
| 28 | +require_once $__dir.'/HTMLPurifier/Context.php'; |
|
| 29 | +require_once $__dir.'/HTMLPurifier/DefinitionCache.php'; |
|
| 30 | +require_once $__dir.'/HTMLPurifier/DefinitionCacheFactory.php'; |
|
| 31 | +require_once $__dir.'/HTMLPurifier/Doctype.php'; |
|
| 32 | +require_once $__dir.'/HTMLPurifier/DoctypeRegistry.php'; |
|
| 33 | +require_once $__dir.'/HTMLPurifier/ElementDef.php'; |
|
| 34 | +require_once $__dir.'/HTMLPurifier/Encoder.php'; |
|
| 35 | +require_once $__dir.'/HTMLPurifier/EntityLookup.php'; |
|
| 36 | +require_once $__dir.'/HTMLPurifier/EntityParser.php'; |
|
| 37 | +require_once $__dir.'/HTMLPurifier/ErrorCollector.php'; |
|
| 38 | +require_once $__dir.'/HTMLPurifier/ErrorStruct.php'; |
|
| 39 | +require_once $__dir.'/HTMLPurifier/Exception.php'; |
|
| 40 | +require_once $__dir.'/HTMLPurifier/Filter.php'; |
|
| 41 | +require_once $__dir.'/HTMLPurifier/Generator.php'; |
|
| 42 | +require_once $__dir.'/HTMLPurifier/HTMLDefinition.php'; |
|
| 43 | +require_once $__dir.'/HTMLPurifier/HTMLModule.php'; |
|
| 44 | +require_once $__dir.'/HTMLPurifier/HTMLModuleManager.php'; |
|
| 45 | +require_once $__dir.'/HTMLPurifier/IDAccumulator.php'; |
|
| 46 | +require_once $__dir.'/HTMLPurifier/Injector.php'; |
|
| 47 | +require_once $__dir.'/HTMLPurifier/Language.php'; |
|
| 48 | +require_once $__dir.'/HTMLPurifier/LanguageFactory.php'; |
|
| 49 | +require_once $__dir.'/HTMLPurifier/Length.php'; |
|
| 50 | +require_once $__dir.'/HTMLPurifier/Lexer.php'; |
|
| 51 | +require_once $__dir.'/HTMLPurifier/PercentEncoder.php'; |
|
| 52 | +require_once $__dir.'/HTMLPurifier/PropertyList.php'; |
|
| 53 | +require_once $__dir.'/HTMLPurifier/PropertyListIterator.php'; |
|
| 54 | +require_once $__dir.'/HTMLPurifier/Strategy.php'; |
|
| 55 | +require_once $__dir.'/HTMLPurifier/StringHash.php'; |
|
| 56 | +require_once $__dir.'/HTMLPurifier/StringHashParser.php'; |
|
| 57 | +require_once $__dir.'/HTMLPurifier/TagTransform.php'; |
|
| 58 | +require_once $__dir.'/HTMLPurifier/Token.php'; |
|
| 59 | +require_once $__dir.'/HTMLPurifier/TokenFactory.php'; |
|
| 60 | +require_once $__dir.'/HTMLPurifier/URI.php'; |
|
| 61 | +require_once $__dir.'/HTMLPurifier/URIDefinition.php'; |
|
| 62 | +require_once $__dir.'/HTMLPurifier/URIFilter.php'; |
|
| 63 | +require_once $__dir.'/HTMLPurifier/URIParser.php'; |
|
| 64 | +require_once $__dir.'/HTMLPurifier/URIScheme.php'; |
|
| 65 | +require_once $__dir.'/HTMLPurifier/URISchemeRegistry.php'; |
|
| 66 | +require_once $__dir.'/HTMLPurifier/UnitConverter.php'; |
|
| 67 | +require_once $__dir.'/HTMLPurifier/VarParser.php'; |
|
| 68 | +require_once $__dir.'/HTMLPurifier/VarParserException.php'; |
|
| 69 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS.php'; |
|
| 70 | +require_once $__dir.'/HTMLPurifier/AttrDef/Clone.php'; |
|
| 71 | +require_once $__dir.'/HTMLPurifier/AttrDef/Enum.php'; |
|
| 72 | +require_once $__dir.'/HTMLPurifier/AttrDef/Integer.php'; |
|
| 73 | +require_once $__dir.'/HTMLPurifier/AttrDef/Lang.php'; |
|
| 74 | +require_once $__dir.'/HTMLPurifier/AttrDef/Switch.php'; |
|
| 75 | +require_once $__dir.'/HTMLPurifier/AttrDef/Text.php'; |
|
| 76 | +require_once $__dir.'/HTMLPurifier/AttrDef/URI.php'; |
|
| 77 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Number.php'; |
|
| 78 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/AlphaValue.php'; |
|
| 79 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Background.php'; |
|
| 80 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php'; |
|
| 81 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Border.php'; |
|
| 82 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Color.php'; |
|
| 83 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Composite.php'; |
|
| 84 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php'; |
|
| 85 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Filter.php'; |
|
| 86 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Font.php'; |
|
| 87 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/FontFamily.php'; |
|
| 88 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Ident.php'; |
|
| 89 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php'; |
|
| 90 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Length.php'; |
|
| 91 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/ListStyle.php'; |
|
| 92 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Multiple.php'; |
|
| 93 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/Percentage.php'; |
|
| 94 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/TextDecoration.php'; |
|
| 95 | +require_once $__dir.'/HTMLPurifier/AttrDef/CSS/URI.php'; |
|
| 96 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Bool.php'; |
|
| 97 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Nmtokens.php'; |
|
| 98 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Class.php'; |
|
| 99 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Color.php'; |
|
| 100 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/FrameTarget.php'; |
|
| 101 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/ID.php'; |
|
| 102 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Pixels.php'; |
|
| 103 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/Length.php'; |
|
| 104 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/LinkTypes.php'; |
|
| 105 | +require_once $__dir.'/HTMLPurifier/AttrDef/HTML/MultiLength.php'; |
|
| 106 | +require_once $__dir.'/HTMLPurifier/AttrDef/URI/Email.php'; |
|
| 107 | +require_once $__dir.'/HTMLPurifier/AttrDef/URI/Host.php'; |
|
| 108 | +require_once $__dir.'/HTMLPurifier/AttrDef/URI/IPv4.php'; |
|
| 109 | +require_once $__dir.'/HTMLPurifier/AttrDef/URI/IPv6.php'; |
|
| 110 | +require_once $__dir.'/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php'; |
|
| 111 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Background.php'; |
|
| 112 | +require_once $__dir.'/HTMLPurifier/AttrTransform/BdoDir.php'; |
|
| 113 | +require_once $__dir.'/HTMLPurifier/AttrTransform/BgColor.php'; |
|
| 114 | +require_once $__dir.'/HTMLPurifier/AttrTransform/BoolToCSS.php'; |
|
| 115 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Border.php'; |
|
| 116 | +require_once $__dir.'/HTMLPurifier/AttrTransform/EnumToCSS.php'; |
|
| 117 | +require_once $__dir.'/HTMLPurifier/AttrTransform/ImgRequired.php'; |
|
| 118 | +require_once $__dir.'/HTMLPurifier/AttrTransform/ImgSpace.php'; |
|
| 119 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Input.php'; |
|
| 120 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Lang.php'; |
|
| 121 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Length.php'; |
|
| 122 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Name.php'; |
|
| 123 | +require_once $__dir.'/HTMLPurifier/AttrTransform/NameSync.php'; |
|
| 124 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Nofollow.php'; |
|
| 125 | +require_once $__dir.'/HTMLPurifier/AttrTransform/SafeEmbed.php'; |
|
| 126 | +require_once $__dir.'/HTMLPurifier/AttrTransform/SafeObject.php'; |
|
| 127 | +require_once $__dir.'/HTMLPurifier/AttrTransform/SafeParam.php'; |
|
| 128 | +require_once $__dir.'/HTMLPurifier/AttrTransform/ScriptRequired.php'; |
|
| 129 | +require_once $__dir.'/HTMLPurifier/AttrTransform/TargetBlank.php'; |
|
| 130 | +require_once $__dir.'/HTMLPurifier/AttrTransform/Textarea.php'; |
|
| 131 | +require_once $__dir.'/HTMLPurifier/ChildDef/Chameleon.php'; |
|
| 132 | +require_once $__dir.'/HTMLPurifier/ChildDef/Custom.php'; |
|
| 133 | +require_once $__dir.'/HTMLPurifier/ChildDef/Empty.php'; |
|
| 134 | +require_once $__dir.'/HTMLPurifier/ChildDef/List.php'; |
|
| 135 | +require_once $__dir.'/HTMLPurifier/ChildDef/Required.php'; |
|
| 136 | +require_once $__dir.'/HTMLPurifier/ChildDef/Optional.php'; |
|
| 137 | +require_once $__dir.'/HTMLPurifier/ChildDef/StrictBlockquote.php'; |
|
| 138 | +require_once $__dir.'/HTMLPurifier/ChildDef/Table.php'; |
|
| 139 | +require_once $__dir.'/HTMLPurifier/DefinitionCache/Decorator.php'; |
|
| 140 | +require_once $__dir.'/HTMLPurifier/DefinitionCache/Null.php'; |
|
| 141 | +require_once $__dir.'/HTMLPurifier/DefinitionCache/Serializer.php'; |
|
| 142 | +require_once $__dir.'/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php'; |
|
| 143 | +require_once $__dir.'/HTMLPurifier/DefinitionCache/Decorator/Memory.php'; |
|
| 144 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Bdo.php'; |
|
| 145 | +require_once $__dir.'/HTMLPurifier/HTMLModule/CommonAttributes.php'; |
|
| 146 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Edit.php'; |
|
| 147 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Forms.php'; |
|
| 148 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Hypertext.php'; |
|
| 149 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Iframe.php'; |
|
| 150 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Image.php'; |
|
| 151 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Legacy.php'; |
|
| 152 | +require_once $__dir.'/HTMLPurifier/HTMLModule/List.php'; |
|
| 153 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Name.php'; |
|
| 154 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Nofollow.php'; |
|
| 155 | +require_once $__dir.'/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php'; |
|
| 156 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Object.php'; |
|
| 157 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Presentation.php'; |
|
| 158 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Proprietary.php'; |
|
| 159 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Ruby.php'; |
|
| 160 | +require_once $__dir.'/HTMLPurifier/HTMLModule/SafeEmbed.php'; |
|
| 161 | +require_once $__dir.'/HTMLPurifier/HTMLModule/SafeObject.php'; |
|
| 162 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Scripting.php'; |
|
| 163 | +require_once $__dir.'/HTMLPurifier/HTMLModule/StyleAttribute.php'; |
|
| 164 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tables.php'; |
|
| 165 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Target.php'; |
|
| 166 | +require_once $__dir.'/HTMLPurifier/HTMLModule/TargetBlank.php'; |
|
| 167 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Text.php'; |
|
| 168 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy.php'; |
|
| 169 | +require_once $__dir.'/HTMLPurifier/HTMLModule/XMLCommonAttributes.php'; |
|
| 170 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Name.php'; |
|
| 171 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Proprietary.php'; |
|
| 172 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php'; |
|
| 173 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Strict.php'; |
|
| 174 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/Transitional.php'; |
|
| 175 | +require_once $__dir.'/HTMLPurifier/HTMLModule/Tidy/XHTML.php'; |
|
| 176 | +require_once $__dir.'/HTMLPurifier/Injector/AutoParagraph.php'; |
|
| 177 | +require_once $__dir.'/HTMLPurifier/Injector/DisplayLinkURI.php'; |
|
| 178 | +require_once $__dir.'/HTMLPurifier/Injector/Linkify.php'; |
|
| 179 | +require_once $__dir.'/HTMLPurifier/Injector/PurifierLinkify.php'; |
|
| 180 | +require_once $__dir.'/HTMLPurifier/Injector/RemoveEmpty.php'; |
|
| 181 | +require_once $__dir.'/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php'; |
|
| 182 | +require_once $__dir.'/HTMLPurifier/Injector/SafeObject.php'; |
|
| 183 | +require_once $__dir.'/HTMLPurifier/Lexer/DOMLex.php'; |
|
| 184 | +require_once $__dir.'/HTMLPurifier/Lexer/DirectLex.php'; |
|
| 185 | +require_once $__dir.'/HTMLPurifier/Strategy/Composite.php'; |
|
| 186 | +require_once $__dir.'/HTMLPurifier/Strategy/Core.php'; |
|
| 187 | +require_once $__dir.'/HTMLPurifier/Strategy/FixNesting.php'; |
|
| 188 | +require_once $__dir.'/HTMLPurifier/Strategy/MakeWellFormed.php'; |
|
| 189 | +require_once $__dir.'/HTMLPurifier/Strategy/RemoveForeignElements.php'; |
|
| 190 | +require_once $__dir.'/HTMLPurifier/Strategy/ValidateAttributes.php'; |
|
| 191 | +require_once $__dir.'/HTMLPurifier/TagTransform/Font.php'; |
|
| 192 | +require_once $__dir.'/HTMLPurifier/TagTransform/Simple.php'; |
|
| 193 | +require_once $__dir.'/HTMLPurifier/Token/Comment.php'; |
|
| 194 | +require_once $__dir.'/HTMLPurifier/Token/Tag.php'; |
|
| 195 | +require_once $__dir.'/HTMLPurifier/Token/Empty.php'; |
|
| 196 | +require_once $__dir.'/HTMLPurifier/Token/End.php'; |
|
| 197 | +require_once $__dir.'/HTMLPurifier/Token/Start.php'; |
|
| 198 | +require_once $__dir.'/HTMLPurifier/Token/Text.php'; |
|
| 199 | +require_once $__dir.'/HTMLPurifier/URIFilter/DisableExternal.php'; |
|
| 200 | +require_once $__dir.'/HTMLPurifier/URIFilter/DisableExternalResources.php'; |
|
| 201 | +require_once $__dir.'/HTMLPurifier/URIFilter/DisableResources.php'; |
|
| 202 | +require_once $__dir.'/HTMLPurifier/URIFilter/HostBlacklist.php'; |
|
| 203 | +require_once $__dir.'/HTMLPurifier/URIFilter/MakeAbsolute.php'; |
|
| 204 | +require_once $__dir.'/HTMLPurifier/URIFilter/Munge.php'; |
|
| 205 | +require_once $__dir.'/HTMLPurifier/URIFilter/SafeIframe.php'; |
|
| 206 | +require_once $__dir.'/HTMLPurifier/URIScheme/data.php'; |
|
| 207 | +require_once $__dir.'/HTMLPurifier/URIScheme/file.php'; |
|
| 208 | +require_once $__dir.'/HTMLPurifier/URIScheme/ftp.php'; |
|
| 209 | +require_once $__dir.'/HTMLPurifier/URIScheme/http.php'; |
|
| 210 | +require_once $__dir.'/HTMLPurifier/URIScheme/https.php'; |
|
| 211 | +require_once $__dir.'/HTMLPurifier/URIScheme/mailto.php'; |
|
| 212 | +require_once $__dir.'/HTMLPurifier/URIScheme/news.php'; |
|
| 213 | +require_once $__dir.'/HTMLPurifier/URIScheme/nntp.php'; |
|
| 214 | +require_once $__dir.'/HTMLPurifier/VarParser/Flexible.php'; |
|
| 215 | +require_once $__dir.'/HTMLPurifier/VarParser/Native.php'; |
|
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | * This is a stub include that automatically configures the include path. |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path() ); |
|
| 7 | +set_include_path(dirname(__FILE__).PATH_SEPARATOR.get_include_path()); |
|
| 8 | 8 | require_once 'HTMLPurifier/Bootstrap.php'; |
| 9 | 9 | require_once 'HTMLPurifier.autoload.php'; |
| 10 | 10 | |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | */ |
| 43 | 43 | function getExpression() |
| 44 | 44 | {
|
| 45 | - return sprintf("%s%s", $this->column_name, $this->column_alias ? " as " . $this->column_alias : "");
|
|
| 45 | + return sprintf("%s%s", $this->column_name, $this->column_alias ? " as ".$this->column_alias : "");
|
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | function show() |
@@ -42,16 +42,16 @@ |
||
| 42 | 42 | function getValue() |
| 43 | 43 | {
|
| 44 | 44 | // TODO Escape value according to column type instead of variable type |
| 45 | - if(!is_numeric($this->value)) |
|
| 45 | + if (!is_numeric($this->value)) |
|
| 46 | 46 | {
|
| 47 | - return "'" . $this->value . "'"; |
|
| 47 | + return "'".$this->value."'"; |
|
| 48 | 48 | } |
| 49 | 49 | return $this->value; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | function show() |
| 53 | 53 | {
|
| 54 | - if(!$this->value) |
|
| 54 | + if (!$this->value) |
|
| 55 | 55 | {
|
| 56 | 56 | return false; |
| 57 | 57 | } |
@@ -38,21 +38,21 @@ |
||
| 38 | 38 | {
|
| 39 | 39 | // TODO Escape value according to column type instead of variable type |
| 40 | 40 | $value = $this->argument; |
| 41 | - if(!is_numeric($value)) |
|
| 41 | + if (!is_numeric($value)) |
|
| 42 | 42 | {
|
| 43 | - return "'" . $value . "'"; |
|
| 43 | + return "'".$value."'"; |
|
| 44 | 44 | } |
| 45 | 45 | return $value; |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | function show() |
| 49 | 49 | {
|
| 50 | - if(!$this->argument) |
|
| 50 | + if (!$this->argument) |
|
| 51 | 51 | {
|
| 52 | 52 | return false; |
| 53 | 53 | } |
| 54 | 54 | $value = $this->argument; |
| 55 | - if(!isset($value)) |
|
| 55 | + if (!isset($value)) |
|
| 56 | 56 | {
|
| 57 | 57 | return false; |
| 58 | 58 | } |
