apply code-formating-cleanup-convert-DOS-to-UNIX-text-form from https://github.com/zedzedtop/mailzu
This commit is contained in:
@@ -17,10 +17,10 @@
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
* 02111-1307, USA.
|
||||
*
|
||||
* @Author Konstantin Riabitsev <icon@linux.duke.edu>
|
||||
@@ -30,7 +30,7 @@
|
||||
/**
|
||||
* This is a debugging function used throughout the code. To enable
|
||||
* debugging you have to specify a global variable called "debug" before
|
||||
* calling sanitize() and set it to true.
|
||||
* calling sanitize() and set it to true.
|
||||
*
|
||||
* Note: Although insignificantly, debugging does slow you down even
|
||||
* when $debug is set to false. If you wish to get rid of all
|
||||
@@ -43,16 +43,16 @@
|
||||
* @param $message A string with the message to output.
|
||||
* @return void.
|
||||
*/
|
||||
function spew($message){
|
||||
function spew($message) {
|
||||
global $debug;
|
||||
if ($debug == true){
|
||||
if ($debug == true) {
|
||||
echo "$message";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This function returns the final tag out of the tag name, an array
|
||||
* of attributes, and the type of the tag. This function is called by
|
||||
* of attributes, and the type of the tag. This function is called by
|
||||
* sanitize internally.
|
||||
*
|
||||
* @param $tagname the name of the tag.
|
||||
@@ -60,20 +60,20 @@ function spew($message){
|
||||
* @param $tagtype The type of the tag (see in comments).
|
||||
* @return a string with the final tag representation.
|
||||
*/
|
||||
function tagprint($tagname, $attary, $tagtype){
|
||||
function tagprint($tagname, $attary, $tagtype) {
|
||||
$me = 'tagprint';
|
||||
if ($tagtype == 2){
|
||||
if ($tagtype == 2) {
|
||||
$fulltag = '</' . $tagname . '>';
|
||||
} else {
|
||||
$fulltag = '<' . $tagname;
|
||||
if (is_array($attary) && sizeof($attary)){
|
||||
if (is_array($attary) && sizeof($attary)) {
|
||||
$atts = Array();
|
||||
while (list($attname, $attvalue) = each($attary)){
|
||||
while (list($attname, $attvalue) = each($attary)) {
|
||||
array_push($atts, "$attname=$attvalue");
|
||||
}
|
||||
$fulltag .= ' ' . join(' ', $atts);
|
||||
}
|
||||
if ($tagtype == 3){
|
||||
if ($tagtype == 3) {
|
||||
$fulltag .= ' /';
|
||||
}
|
||||
$fulltag .= '>';
|
||||
@@ -89,24 +89,24 @@ function tagprint($tagname, $attary, $tagtype){
|
||||
* @param $val a value passed by-ref.
|
||||
* @return void since it modifies a by-ref value.
|
||||
*/
|
||||
function casenormalize(&$val){
|
||||
function casenormalize(&$val) {
|
||||
$val = strtolower($val);
|
||||
}
|
||||
|
||||
/**
|
||||
* This function skips any whitespace from the current position within
|
||||
* a string and to the next non-whitespace value.
|
||||
*
|
||||
*
|
||||
* @param $body the string
|
||||
* @param $offset the offset within the string where we should start
|
||||
* looking for the next non-whitespace character.
|
||||
* @return the location within the $body where the next
|
||||
* non-whitespace char is located.
|
||||
*/
|
||||
function skipspace($body, $offset){
|
||||
function skipspace($body, $offset) {
|
||||
$me = 'skipspace';
|
||||
preg_match('/^(\s*)/s', substr($body, $offset), $matches);
|
||||
if (sizeof($matches{1})){
|
||||
if (sizeof($matches{1})) {
|
||||
$count = strlen($matches{1});
|
||||
spew("$me: skipped $count chars\n");
|
||||
$offset += $count;
|
||||
@@ -125,10 +125,10 @@ function skipspace($body, $offset){
|
||||
* @return location of the next occurance of the needle, or
|
||||
* strlen($body) if needle wasn't found.
|
||||
*/
|
||||
function findnxstr($body, $offset, $needle){
|
||||
function findnxstr($body, $offset, $needle) {
|
||||
$me = 'findnxstr';
|
||||
$pos = strpos($body, $needle, $offset);
|
||||
if ($pos === FALSE){
|
||||
if ($pos === FALSE) {
|
||||
$pos = strlen($body);
|
||||
spew("$me: end of body reached\n");
|
||||
}
|
||||
@@ -149,13 +149,13 @@ function findnxstr($body, $offset, $needle){
|
||||
* - string with whatever content between offset and the match
|
||||
* - string with whatever it is we matched
|
||||
*/
|
||||
function findnxreg($body, $offset, $reg){
|
||||
function findnxreg($body, $offset, $reg) {
|
||||
$me = 'findnxreg';
|
||||
$matches = Array();
|
||||
$retarr = Array();
|
||||
$preg_rule = '%^(.*?)(' . $reg . ')%s';
|
||||
preg_match($preg_rule, substr($body, $offset), $matches);
|
||||
if (!isset($matches{0})){
|
||||
if (!isset($matches{0})) {
|
||||
spew("$me: No matches found.\n");
|
||||
$retarr = false;
|
||||
} else {
|
||||
@@ -181,14 +181,14 @@ function findnxreg($body, $offset, $reg){
|
||||
* - integer where the tag ends (ending ">")
|
||||
* first three members will be false, if the tag is invalid.
|
||||
*/
|
||||
function getnxtag($body, $offset){
|
||||
function getnxtag($body, $offset) {
|
||||
$me = 'getnxtag';
|
||||
if ($offset > strlen($body)){
|
||||
if ($offset > strlen($body)) {
|
||||
spew("$me: Past the end of body\n");
|
||||
return false;
|
||||
}
|
||||
$lt = findnxstr($body, $offset, '<');
|
||||
if ($lt == strlen($body)){
|
||||
if ($lt == strlen($body)) {
|
||||
spew("$me: No more tags found!\n");
|
||||
return false;
|
||||
}
|
||||
@@ -199,7 +199,7 @@ function getnxtag($body, $offset){
|
||||
*/
|
||||
spew("$me: Found '<' at pos $lt\n");
|
||||
$pos = skipspace($body, $lt + 1);
|
||||
if ($pos >= strlen($body)){
|
||||
if ($pos >= strlen($body)) {
|
||||
spew("$me: End of body reached.\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
@@ -213,40 +213,40 @@ function getnxtag($body, $offset){
|
||||
* <img src="blah"/>
|
||||
*/
|
||||
$tagtype = false;
|
||||
switch (substr($body, $pos, 1)){
|
||||
case '/':
|
||||
spew("$me: This is a closing tag (type 2)\n");
|
||||
$tagtype = 2;
|
||||
$pos++;
|
||||
break;
|
||||
case '!':
|
||||
/**
|
||||
* A comment or an SGML declaration.
|
||||
*/
|
||||
if (substr($body, $pos+1, 2) == '--'){
|
||||
spew("$me: A comment found. Stripping.\n");
|
||||
$gt = strpos($body, '-->', $pos);
|
||||
if ($gt === false){
|
||||
$gt = strlen($body);
|
||||
switch (substr($body, $pos, 1)) {
|
||||
case '/':
|
||||
spew("$me: This is a closing tag (type 2)\n");
|
||||
$tagtype = 2;
|
||||
$pos++;
|
||||
break;
|
||||
case '!':
|
||||
/**
|
||||
* A comment or an SGML declaration.
|
||||
*/
|
||||
if (substr($body, $pos+1, 2) == '--') {
|
||||
spew("$me: A comment found. Stripping.\n");
|
||||
$gt = strpos($body, '-->', $pos);
|
||||
if ($gt === false) {
|
||||
$gt = strlen($body);
|
||||
} else {
|
||||
$gt += 2;
|
||||
}
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
} else {
|
||||
$gt += 2;
|
||||
spew("$me: An SGML declaration found. Stripping.\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
}
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
} else {
|
||||
spew("$me: An SGML declaration found. Stripping.\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
/**
|
||||
* Assume tagtype 1 for now. If it's type 3, we'll switch values
|
||||
* later.
|
||||
*/
|
||||
$tagtype = 1;
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
/**
|
||||
* Assume tagtype 1 for now. If it's type 3, we'll switch values
|
||||
* later.
|
||||
*/
|
||||
$tagtype = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
$tag_start = $pos;
|
||||
$tagname = '';
|
||||
/**
|
||||
@@ -259,56 +259,56 @@ function getnxtag($body, $offset){
|
||||
}
|
||||
list($pos, $tagname, $match) = $regary;
|
||||
$tagname = strtolower($tagname);
|
||||
|
||||
|
||||
/**
|
||||
* $match can be either of these:
|
||||
* '>' indicating the end of the tag entirely.
|
||||
* '\s' indicating the end of the tag name.
|
||||
* '/' indicating that this is type-3 xhtml tag.
|
||||
*
|
||||
*
|
||||
* Whatever else we find there indicates an invalid tag.
|
||||
*/
|
||||
switch ($match){
|
||||
case '/':
|
||||
/**
|
||||
* This is an xhtml-style tag with a closing / at the
|
||||
* end, like so: <img src="blah"/>. Check if it's followed
|
||||
* by the closing bracket. If not, then this tag is invalid
|
||||
*/
|
||||
if (substr($body, $pos, 2) == '/>'){
|
||||
spew("$me: XHTML-style tag found.\n");
|
||||
$pos++;
|
||||
spew("$me: Setting tagtype to 3\n");
|
||||
$tagtype = 3;
|
||||
} else {
|
||||
spew("$me: Found invalid character '/'.\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
spew("$me: Tag is invalid. Returning.\n");
|
||||
$retary = Array(false, false, false, $lt, $gt);
|
||||
return $retary;
|
||||
}
|
||||
case '>':
|
||||
spew("$me: End of tag found at $pos\n");
|
||||
spew("$me: Tagname is '$tagname'\n");
|
||||
spew("$me: This tag has no attributes\n");
|
||||
return Array($tagname, false, $tagtype, $lt, $pos);
|
||||
break;
|
||||
default:
|
||||
/**
|
||||
* Check if it's whitespace
|
||||
*/
|
||||
if (preg_match('/\s/', $match)){
|
||||
spew("$me: Tagname is '$tagname'\n");
|
||||
} else {
|
||||
switch ($match) {
|
||||
case '/':
|
||||
/**
|
||||
* This is an invalid tag! Look for the next closing ">".
|
||||
* This is an xhtml-style tag with a closing / at the
|
||||
* end, like so: <img src="blah"/>. Check if it's followed
|
||||
* by the closing bracket. If not, then this tag is invalid
|
||||
*/
|
||||
spew("$me: Invalid characters found in tag name: $match\n");
|
||||
$gt = findnxstr($body, $lt, '>');
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
}
|
||||
if (substr($body, $pos, 2) == '/>') {
|
||||
spew("$me: XHTML-style tag found.\n");
|
||||
$pos++;
|
||||
spew("$me: Setting tagtype to 3\n");
|
||||
$tagtype = 3;
|
||||
} else {
|
||||
spew("$me: Found invalid character '/'.\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
spew("$me: Tag is invalid. Returning.\n");
|
||||
$retary = Array(false, false, false, $lt, $gt);
|
||||
return $retary;
|
||||
}
|
||||
case '>':
|
||||
spew("$me: End of tag found at $pos\n");
|
||||
spew("$me: Tagname is '$tagname'\n");
|
||||
spew("$me: This tag has no attributes\n");
|
||||
return Array($tagname, false, $tagtype, $lt, $pos);
|
||||
break;
|
||||
default:
|
||||
/**
|
||||
* Check if it's whitespace
|
||||
*/
|
||||
if (preg_match('/\s/', $match)){
|
||||
spew("$me: Tagname is '$tagname'\n");
|
||||
} else {
|
||||
/**
|
||||
* This is an invalid tag! Look for the next closing ">".
|
||||
*/
|
||||
spew("$me: Invalid characters found in tag name: $match\n");
|
||||
$gt = findnxstr($body, $lt, '>');
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* At this point we're here:
|
||||
* <tagname attribute='blah'>
|
||||
@@ -319,10 +319,10 @@ function getnxtag($body, $offset){
|
||||
$attname = '';
|
||||
$atttype = false;
|
||||
$attary = Array();
|
||||
|
||||
while ($pos <= strlen($body)){
|
||||
|
||||
while ($pos <= strlen($body)) {
|
||||
$pos = skipspace($body, $pos);
|
||||
if ($pos == strlen($body)){
|
||||
if ($pos == strlen($body)) {
|
||||
/**
|
||||
* Non-closed tag.
|
||||
*/
|
||||
@@ -335,19 +335,19 @@ function getnxtag($body, $offset){
|
||||
*/
|
||||
$matches = Array();
|
||||
preg_match('%^(\s*)(>|/>)%s', substr($body, $pos), $matches);
|
||||
if (isset($matches{0}) && $matches{0}){
|
||||
if (isset($matches{0}) && $matches{0}) {
|
||||
/**
|
||||
* Yep. So we did.
|
||||
*/
|
||||
spew("$me: Arrived at the end of the tag.\n");
|
||||
$pos += strlen($matches{1});
|
||||
if ($matches{2} == '/>'){
|
||||
if ($matches{2} == '/>') {
|
||||
$tagtype = 3;
|
||||
$pos++;
|
||||
}
|
||||
return Array($tagname, $attary, $tagtype, $lt, $pos);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* There are several types of attributes, with optional
|
||||
* [:space:] between members.
|
||||
@@ -366,7 +366,7 @@ function getnxtag($body, $offset){
|
||||
* attrname="yes".
|
||||
*/
|
||||
$regary = findnxreg($body, $pos, '[^\w\-_]');
|
||||
if ($regary == false){
|
||||
if ($regary == false) {
|
||||
/**
|
||||
* Looks like body ended before the end of tag.
|
||||
*/
|
||||
@@ -385,121 +385,121 @@ function getnxtag($body, $offset){
|
||||
* '\s' means a lot of things -- look what it's followed by.
|
||||
* anything else means the attribute is invalid.
|
||||
*/
|
||||
switch($match){
|
||||
case '/':
|
||||
/**
|
||||
* This is an xhtml-style tag with a closing / at the
|
||||
* end, like so: <img src="blah"/>. Check if it's followed
|
||||
* by the closing bracket. If not, then this tag is invalid
|
||||
*/
|
||||
if (substr($body, $pos, 2) == '/>'){
|
||||
spew("$me: This is an xhtml-style tag.\n");
|
||||
$pos++;
|
||||
spew("$me: Setting tagtype to 3\n");
|
||||
$tagtype = 3;
|
||||
} else {
|
||||
spew("$me: Found invalid character '/'.\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
spew("$me: Tag is invalid. Returning.\n");
|
||||
$retary = Array(false, false, false, $lt, $gt);
|
||||
return $retary;
|
||||
}
|
||||
case '>':
|
||||
spew("$me: found type 4 attribute.\n");
|
||||
spew("$me: Additionally, end of tag found at $pos\n");
|
||||
spew("$me: Attname is '$attname'\n");
|
||||
spew("$me: Setting attvalue to 'yes'\n");
|
||||
$attary{$attname} = '"yes"';
|
||||
return Array($tagname, $attary, $tagtype, $lt, $pos);
|
||||
break;
|
||||
default:
|
||||
/**
|
||||
* Skip whitespace and see what we arrive at.
|
||||
*/
|
||||
$pos = skipspace($body, $pos);
|
||||
$char = substr($body, $pos, 1);
|
||||
/**
|
||||
* Two things are valid here:
|
||||
* '=' means this is attribute type 1 2 or 3.
|
||||
* \w means this was attribute type 4.
|
||||
* anything else we ignore and re-loop. End of tag and
|
||||
* invalid stuff will be caught by our checks at the beginning
|
||||
* of the loop.
|
||||
*/
|
||||
if ($char == '='){
|
||||
spew("$me: Attribute type 1, 2, or 3 found.\n");
|
||||
$pos++;
|
||||
$pos = skipspace($body, $pos);
|
||||
switch($match) {
|
||||
case '/':
|
||||
/**
|
||||
* Here are 3 possibilities:
|
||||
* "'" attribute type 1
|
||||
* '"' attribute type 2
|
||||
* everything else is the content of tag type 3
|
||||
* This is an xhtml-style tag with a closing / at the
|
||||
* end, like so: <img src="blah"/>. Check if it's followed
|
||||
* by the closing bracket. If not, then this tag is invalid
|
||||
*/
|
||||
$quot = substr($body, $pos, 1);
|
||||
if ($quot == '\''){
|
||||
spew("$me: In fact, this is attribute type 1\n");
|
||||
spew("$me: looking for closing quote\n");
|
||||
$regary = findnxreg($body, $pos+1, '\'');
|
||||
if ($regary == false){
|
||||
spew("$me: end of body reached before end of val\n");
|
||||
spew("$me: Returning\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
list($pos, $attval, $match) = $regary;
|
||||
spew("$me: Attvalue is '$attval'\n");
|
||||
if (substr($body, $pos, 2) == '/>') {
|
||||
spew("$me: This is an xhtml-style tag.\n");
|
||||
$pos++;
|
||||
$attary{$attname} = '\'' . $attval . '\'';
|
||||
} else if ($quot == '"'){
|
||||
spew("$me: In fact, this is attribute type 2\n");
|
||||
spew("$me: looking for closing quote\n");
|
||||
$regary = findnxreg($body, $pos+1, '\"');
|
||||
if ($regary == false){
|
||||
spew("$me: end of body reached before end of val\n");
|
||||
spew("$me: Returning\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
list($pos, $attval, $match) = $regary;
|
||||
spew("$me: Attvalue is \"$attval\"\n");
|
||||
$pos++;
|
||||
$attary{$attname} = '"' . $attval . '"';
|
||||
spew("$me: Setting tagtype to 3\n");
|
||||
$tagtype = 3;
|
||||
} else {
|
||||
spew("$me: This looks like attribute type 3\n");
|
||||
/**
|
||||
* These are hateful. Look for \s, or >.
|
||||
*/
|
||||
spew("$me: Looking for end of attval\n");
|
||||
$regary = findnxreg($body, $pos, '[\s>]');
|
||||
if ($regary == false){
|
||||
spew("$me: end of body reached before end of val\n");
|
||||
spew("$me: Returning\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
list($pos, $attval, $match) = $regary;
|
||||
/**
|
||||
* If it's ">" it will be caught at the top.
|
||||
*/
|
||||
spew("$me: translating '\"' into "\n");
|
||||
$attval = preg_replace('/\"/s', '"', $attval);
|
||||
spew("$me: wrapping in quotes\n");
|
||||
$attary{$attname} = '"' . $attval . '"';
|
||||
spew("$me: Found invalid character '/'.\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
spew("$me: Tag is invalid. Returning.\n");
|
||||
$retary = Array(false, false, false, $lt, $gt);
|
||||
return $retary;
|
||||
}
|
||||
} else if (preg_match('|[\w/>]|', $char)) {
|
||||
/**
|
||||
* That was attribute type 4.
|
||||
*/
|
||||
spew("$me: attribute type 4 found.\n");
|
||||
spew("$me: Setting value to 'yes'\n");
|
||||
case '>':
|
||||
spew("$me: found type 4 attribute.\n");
|
||||
spew("$me: Additionally, end of tag found at $pos\n");
|
||||
spew("$me: Attname is '$attname'\n");
|
||||
spew("$me: Setting attvalue to 'yes'\n");
|
||||
$attary{$attname} = '"yes"';
|
||||
} else {
|
||||
return Array($tagname, $attary, $tagtype, $lt, $pos);
|
||||
break;
|
||||
default:
|
||||
/**
|
||||
* An illegal character. Find next '>' and return.
|
||||
* Skip whitespace and see what we arrive at.
|
||||
*/
|
||||
spew("$me: illegal character '$char' found.\n");
|
||||
spew("$me: returning\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
}
|
||||
$pos = skipspace($body, $pos);
|
||||
$char = substr($body, $pos, 1);
|
||||
/**
|
||||
* Two things are valid here:
|
||||
* '=' means this is attribute type 1 2 or 3.
|
||||
* \w means this was attribute type 4.
|
||||
* anything else we ignore and re-loop. End of tag and
|
||||
* invalid stuff will be caught by our checks at the beginning
|
||||
* of the loop.
|
||||
*/
|
||||
if ($char == '=') {
|
||||
spew("$me: Attribute type 1, 2, or 3 found.\n");
|
||||
$pos++;
|
||||
$pos = skipspace($body, $pos);
|
||||
/**
|
||||
* Here are 3 possibilities:
|
||||
* "'" attribute type 1
|
||||
* '"' attribute type 2
|
||||
* everything else is the content of tag type 3
|
||||
*/
|
||||
$quot = substr($body, $pos, 1);
|
||||
if ($quot == '\'') {
|
||||
spew("$me: In fact, this is attribute type 1\n");
|
||||
spew("$me: looking for closing quote\n");
|
||||
$regary = findnxreg($body, $pos+1, '\'');
|
||||
if ($regary == false) {
|
||||
spew("$me: end of body reached before end of val\n");
|
||||
spew("$me: Returning\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
list($pos, $attval, $match) = $regary;
|
||||
spew("$me: Attvalue is '$attval'\n");
|
||||
$pos++;
|
||||
$attary{$attname} = '\'' . $attval . '\'';
|
||||
} else if ($quot == '"') {
|
||||
spew("$me: In fact, this is attribute type 2\n");
|
||||
spew("$me: looking for closing quote\n");
|
||||
$regary = findnxreg($body, $pos+1, '\"');
|
||||
if ($regary == false) {
|
||||
spew("$me: end of body reached before end of val\n");
|
||||
spew("$me: Returning\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
list($pos, $attval, $match) = $regary;
|
||||
spew("$me: Attvalue is \"$attval\"\n");
|
||||
$pos++;
|
||||
$attary{$attname} = '"' . $attval . '"';
|
||||
} else {
|
||||
spew("$me: This looks like attribute type 3\n");
|
||||
/**
|
||||
* These are hateful. Look for \s, or >.
|
||||
*/
|
||||
spew("$me: Looking for end of attval\n");
|
||||
$regary = findnxreg($body, $pos, '[\s>]');
|
||||
if ($regary == false) {
|
||||
spew("$me: end of body reached before end of val\n");
|
||||
spew("$me: Returning\n");
|
||||
return Array(false, false, false, $lt, strlen($body));
|
||||
}
|
||||
list($pos, $attval, $match) = $regary;
|
||||
/**
|
||||
* If it's ">" it will be caught at the top.
|
||||
*/
|
||||
spew("$me: translating '\"' into "\n");
|
||||
$attval = preg_replace('/\"/s', '"', $attval);
|
||||
spew("$me: wrapping in quotes\n");
|
||||
$attary{$attname} = '"' . $attval . '"';
|
||||
}
|
||||
} else if (preg_match('|[\w/>]|', $char)) {
|
||||
/**
|
||||
* That was attribute type 4.
|
||||
*/
|
||||
spew("$me: attribute type 4 found.\n");
|
||||
spew("$me: Setting value to 'yes'\n");
|
||||
$attary{$attname} = '"yes"';
|
||||
} else {
|
||||
/**
|
||||
* An illegal character. Find next '>' and return.
|
||||
*/
|
||||
spew("$me: illegal character '$char' found.\n");
|
||||
spew("$me: returning\n");
|
||||
$gt = findnxstr($body, $pos, '>');
|
||||
return Array(false, false, false, $lt, $gt);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
@@ -518,18 +518,18 @@ function getnxtag($body, $offset){
|
||||
* @param $hex whether the entites are hexadecimal.
|
||||
* @return True or False depending on whether there were matches.
|
||||
*/
|
||||
function deent(&$attvalue, $regex, $hex=false){
|
||||
function deent(&$attvalue, $regex, $hex=false) {
|
||||
$me = 'deent';
|
||||
spew("$me: matching '$regex' against: $attvalue\n");
|
||||
$ret_match = false;
|
||||
preg_match_all($regex, $attvalue, $matches);
|
||||
if (is_array($matches) && sizeof($matches[0]) > 0){
|
||||
if (is_array($matches) && sizeof($matches[0]) > 0) {
|
||||
spew("$me: found " . sizeof($matches[0]) . " matches\n");
|
||||
$repl = Array();
|
||||
for ($i = 0; $i < sizeof($matches[0]); $i++){
|
||||
for ($i = 0; $i < sizeof($matches[0]); $i++) {
|
||||
$numval = $matches[1][$i];
|
||||
spew("$me: numval is $numval\n");
|
||||
if ($hex){
|
||||
if ($hex) {
|
||||
$numval = hexdec($numval);
|
||||
spew("$me: hex! Numval is now $numval\n");
|
||||
}
|
||||
@@ -552,14 +552,15 @@ function deent(&$attvalue, $regex, $hex=false){
|
||||
* @param $attvalue A string to run entity check against.
|
||||
* @return Nothing, modifies a reference value.
|
||||
*/
|
||||
function defang(&$attvalue){
|
||||
function defang(&$attvalue) {
|
||||
$me = 'defang';
|
||||
/**
|
||||
* Skip this if there aren't ampersands or backslashes.
|
||||
*/
|
||||
spew("$me: Checking '$attvalue' for suspicious content\n");
|
||||
if (strpos($attvalue, '&') === false
|
||||
&& strpos($attvalue, '\\') === false){
|
||||
&& strpos($attvalue, '\\') === false)
|
||||
{
|
||||
spew("$me: no suspicious content found, returning.\n");
|
||||
return;
|
||||
}
|
||||
@@ -579,15 +580,15 @@ function defang(&$attvalue){
|
||||
* Kill any tabs, newlines, or carriage returns. Our friends the
|
||||
* makers of the browser with 95% market value decided that it'd
|
||||
* be funny to make "java[tab]script" be just as good as "javascript".
|
||||
*
|
||||
*
|
||||
* @param attvalue The attribute value before extraneous spaces removed.
|
||||
* @return attvalue Nothing, modifies a reference value.
|
||||
*/
|
||||
function unspace(&$attvalue){
|
||||
$me = 'unspace';
|
||||
if (strcspn($attvalue, "\t\r\n\0 ") != strlen($attvalue)){
|
||||
if (strcspn($attvalue, "\t\r\n\0 ") != strlen($attvalue)) {
|
||||
spew("$me: Killing whitespace.\n");
|
||||
$attvalue = str_replace(Array("\t", "\r", "\n", "\0", " "),
|
||||
$attvalue = str_replace(Array("\t", "\r", "\n", "\0", " "),
|
||||
Array('', '', ''), $attvalue);
|
||||
}
|
||||
spew("$me: after unspace: $attvalue\n");
|
||||
@@ -603,22 +604,17 @@ function unspace(&$attvalue){
|
||||
* @param $add_attr_to_tag See description for sanitize
|
||||
* @return Array with modified attributes.
|
||||
*/
|
||||
function fixatts($tagname,
|
||||
$attary,
|
||||
$rm_attnames,
|
||||
$bad_attvals,
|
||||
$add_attr_to_tag
|
||||
){
|
||||
function fixatts($tagname, $attary, $rm_attnames, $bad_attvals, $add_attr_to_tag) {
|
||||
$me = 'fixatts';
|
||||
spew("$me: Fixing attributes\n");
|
||||
while (list($attname, $attvalue) = each($attary)){
|
||||
while (list($attname, $attvalue) = each($attary)) {
|
||||
/**
|
||||
* See if this attribute should be removed.
|
||||
*/
|
||||
foreach ($rm_attnames as $matchtag=>$matchattrs){
|
||||
if (preg_match($matchtag, $tagname)){
|
||||
foreach ($matchattrs as $matchattr){
|
||||
if (preg_match($matchattr, $attname)){
|
||||
foreach ($rm_attnames as $matchtag=>$matchattrs) {
|
||||
if (preg_match($matchtag, $tagname)) {
|
||||
foreach ($matchattrs as $matchattr) {
|
||||
if (preg_match($matchattr, $attname)) {
|
||||
spew("$me: Attribute '$attname' defined as bad.\n");
|
||||
spew("$me: Removing.\n");
|
||||
unset($attary{$attname});
|
||||
@@ -632,17 +628,17 @@ function fixatts($tagname,
|
||||
*/
|
||||
defang($attvalue);
|
||||
unspace($attvalue);
|
||||
|
||||
|
||||
/**
|
||||
* Now let's run checks on the attvalues.
|
||||
* I don't expect anyone to comprehend this. If you do,
|
||||
* get in touch with me so I can drive to where you live and
|
||||
* shake your hand personally. :)
|
||||
*/
|
||||
foreach ($bad_attvals as $matchtag=>$matchattrs){
|
||||
if (preg_match($matchtag, $tagname)){
|
||||
foreach ($matchattrs as $matchattr=>$valary){
|
||||
if (preg_match($matchattr, $attname)){
|
||||
foreach ($bad_attvals as $matchtag=>$matchattrs) {
|
||||
if (preg_match($matchtag, $tagname)) {
|
||||
foreach ($matchattrs as $matchattr=>$valary) {
|
||||
if (preg_match($matchattr, $attname)) {
|
||||
/**
|
||||
* There are two arrays in valary.
|
||||
* First is matches.
|
||||
@@ -650,7 +646,7 @@ function fixatts($tagname,
|
||||
*/
|
||||
list($valmatch, $valrepl) = $valary;
|
||||
$newvalue = preg_replace($valmatch,$valrepl,$attvalue);
|
||||
if ($newvalue != $attvalue){
|
||||
if ($newvalue != $attvalue) {
|
||||
spew("$me: attvalue is now $newvalue\n");
|
||||
$attary{$attname} = $newvalue;
|
||||
}
|
||||
@@ -662,8 +658,8 @@ function fixatts($tagname,
|
||||
/**
|
||||
* See if we need to append any attributes to this tag.
|
||||
*/
|
||||
foreach ($add_attr_to_tag as $matchtag=>$addattary){
|
||||
if (preg_match($matchtag, $tagname)){
|
||||
foreach ($add_attr_to_tag as $matchtag=>$addattary) {
|
||||
if (preg_match($matchtag, $tagname)) {
|
||||
$attary = array_merge($attary, $addattary);
|
||||
spew("$me: Added attributes to this tag\n");
|
||||
}
|
||||
@@ -689,8 +685,8 @@ function fixatts($tagname,
|
||||
*
|
||||
* Examples:
|
||||
* $tag_list = Array(
|
||||
* false,
|
||||
* "blink",
|
||||
* false,
|
||||
* "blink",
|
||||
* "link",
|
||||
* "object",
|
||||
* "meta",
|
||||
@@ -698,17 +694,17 @@ function fixatts($tagname,
|
||||
* "html"
|
||||
* );
|
||||
*
|
||||
* This will allow all tags except for blink, link, object, meta, marquee,
|
||||
* This will allow all tags except for blink, link, object, meta, marquee,
|
||||
* and html.
|
||||
*
|
||||
* $tag_list = Array(
|
||||
* true,
|
||||
* "b",
|
||||
* "a",
|
||||
* "i",
|
||||
* "img",
|
||||
* "strong",
|
||||
* "em",
|
||||
* true,
|
||||
* "b",
|
||||
* "a",
|
||||
* "i",
|
||||
* "img",
|
||||
* "strong",
|
||||
* "em",
|
||||
* "p"
|
||||
* );
|
||||
*
|
||||
@@ -723,7 +719,7 @@ function fixatts($tagname,
|
||||
* Example:
|
||||
* $rm_tags_with_content = Array(
|
||||
* "script",
|
||||
* "style",
|
||||
* "style",
|
||||
* "applet",
|
||||
* "embed"
|
||||
* );
|
||||
@@ -732,7 +728,7 @@ function fixatts($tagname,
|
||||
* <script>
|
||||
* window.alert("Isn't cross-site-scripting fun?!");
|
||||
* </script>
|
||||
*
|
||||
*
|
||||
* $self_closing_tags
|
||||
* ------------------
|
||||
* This is a simple one-dimentional array of strings, which specifies which
|
||||
@@ -741,10 +737,10 @@ function fixatts($tagname,
|
||||
* Example:
|
||||
* $self_closing_tags = Array(
|
||||
* "img",
|
||||
* "br",
|
||||
* "br",
|
||||
* "hr",
|
||||
* "input"
|
||||
* );
|
||||
* );
|
||||
*
|
||||
* $force_tag_closing
|
||||
* ------------------
|
||||
@@ -757,7 +753,7 @@ function fixatts($tagname,
|
||||
* Now we come to parameters that are more obscure. This parameter is
|
||||
* a nested array which is used to specify which attributes should be
|
||||
* removed. It goes like so:
|
||||
*
|
||||
*
|
||||
* $rm_attnames = Array(
|
||||
* "PCRE regex to match tag name" =>
|
||||
* Array(
|
||||
@@ -770,7 +766,7 @@ function fixatts($tagname,
|
||||
* "|.*|" =>
|
||||
* Array(
|
||||
* "|target|i",
|
||||
* "|^on.*|i"
|
||||
* "|^on.*|i"
|
||||
* )
|
||||
* );
|
||||
*
|
||||
@@ -829,33 +825,33 @@ function fixatts($tagname,
|
||||
* );
|
||||
*
|
||||
* This will take care of nearly all known cross-site scripting exploits,
|
||||
* plus some (see my filter sample at
|
||||
* plus some (see my filter sample at
|
||||
* http://www.mricon.com/html/phpfilter.html for a working version).
|
||||
*
|
||||
* $add_attr_to_tag
|
||||
* ----------------
|
||||
* This is a useful little feature which lets you add attributes to
|
||||
* This is a useful little feature which lets you add attributes to
|
||||
* certain tags. It is a nested array as well, but not at all like
|
||||
* the previous one. It goes like so:
|
||||
*
|
||||
*
|
||||
* $add_attr_to_tag = Array(
|
||||
* "PCRE regex to match tag name" =>
|
||||
* Array(
|
||||
* "attribute name"=>'"attribute value"'
|
||||
* )
|
||||
* );
|
||||
*
|
||||
*
|
||||
* Note: don't forget quotes around attribute value.
|
||||
*
|
||||
*
|
||||
* Example:
|
||||
*
|
||||
*
|
||||
* $add_attr_to_tag = Array(
|
||||
* "/^a$/si" =>
|
||||
* "/^a$/si" =>
|
||||
* Array(
|
||||
* 'target'=>'"_new"'
|
||||
* )
|
||||
* );
|
||||
*
|
||||
*
|
||||
* This will change all <a> tags and add target="_new" to them so all links
|
||||
* open in a new window.
|
||||
*
|
||||
@@ -871,15 +867,7 @@ function fixatts($tagname,
|
||||
* @param $add_attr_to_tag see description above
|
||||
* @return sanitized html safe to show on your pages.
|
||||
*/
|
||||
function sanitize($body,
|
||||
$tag_list,
|
||||
$rm_tags_with_content,
|
||||
$self_closing_tags,
|
||||
$force_tag_closing,
|
||||
$rm_attnames,
|
||||
$bad_attvals,
|
||||
$add_attr_to_tag
|
||||
){
|
||||
function sanitize($body, $tag_list, $rm_tags_with_content, $self_closing_tags, $force_tag_closing, $rm_attnames, $bad_attvals, $add_attr_to_tag) {
|
||||
$me = 'sanitize';
|
||||
/**
|
||||
* Normalize rm_tags and rm_tags_with_content.
|
||||
@@ -903,22 +891,22 @@ function sanitize($body,
|
||||
*/
|
||||
$body = preg_replace('/&(\{.*?\};)/si', '&\\1', $body);
|
||||
spew("$me: invoking the loop\n");
|
||||
while (($curtag = getnxtag($body, $curpos)) != FALSE){
|
||||
while (($curtag = getnxtag($body, $curpos)) != FALSE) {
|
||||
list($tagname, $attary, $tagtype, $lt, $gt) = $curtag;
|
||||
spew("$me: grabbing free-standing content\n");
|
||||
$free_content = substr($body, $curpos, $lt - $curpos);
|
||||
spew("$me: " . strlen($free_content) . " chars grabbed\n");
|
||||
if ($skip_content == false){
|
||||
if ($skip_content == false) {
|
||||
spew("$me: appending free content to trusted.\n");
|
||||
$trusted .= $free_content;
|
||||
} else {
|
||||
spew("$me: Skipping free content.\n");
|
||||
}
|
||||
if ($tagname != FALSE){
|
||||
if ($tagname != FALSE) {
|
||||
spew("$me: tagname is '$tagname'\n");
|
||||
if ($tagtype == 2){
|
||||
if ($tagtype == 2) {
|
||||
spew("$me: This is a closing tag\n");
|
||||
if ($skip_content == $tagname){
|
||||
if ($skip_content == $tagname) {
|
||||
/**
|
||||
* Got to the end of tag we needed to remove.
|
||||
*/
|
||||
@@ -926,9 +914,8 @@ function sanitize($body,
|
||||
$tagname = false;
|
||||
$skip_content = false;
|
||||
} else {
|
||||
if ($skip_content == false){
|
||||
if (isset($open_tags{$tagname}) &&
|
||||
$open_tags{$tagname} > 0){
|
||||
if ($skip_content == false) {
|
||||
if (isset($open_tags{$tagname}) && $open_tags{$tagname} > 0) {
|
||||
spew("$me: popping '$tagname' from open_tags\n");
|
||||
$open_tags{$tagname}--;
|
||||
} else {
|
||||
@@ -949,8 +936,7 @@ function sanitize($body,
|
||||
* See if this is a self-closing type and change
|
||||
* tagtype appropriately.
|
||||
*/
|
||||
if ($tagtype == 1
|
||||
&& in_array($tagname, $self_closing_tags)){
|
||||
if ($tagtype == 1 && in_array($tagname, $self_closing_tags)) {
|
||||
spew("$me: Self-closing tag. Changing tagtype.\n");
|
||||
$tagtype = 3;
|
||||
}
|
||||
@@ -958,21 +944,19 @@ function sanitize($body,
|
||||
* See if we should skip this tag and any content
|
||||
* inside it.
|
||||
*/
|
||||
if ($tagtype == 1
|
||||
&& in_array($tagname, $rm_tags_with_content)){
|
||||
if ($tagtype == 1 && in_array($tagname, $rm_tags_with_content)) {
|
||||
spew("$me: removing this tag with content\n");
|
||||
$skip_content = $tagname;
|
||||
} else {
|
||||
if (($rm_tags == false
|
||||
&& in_array($tagname, $tag_list)) ||
|
||||
($rm_tags == true
|
||||
&& !in_array($tagname, $tag_list))){
|
||||
if (($rm_tags == false && in_array($tagname, $tag_list)) ||
|
||||
($rm_tags == true && !in_array($tagname, $tag_list)))
|
||||
{
|
||||
spew("$me: Removing this tag.\n");
|
||||
$tagname = false;
|
||||
} else {
|
||||
if ($tagtype == 1){
|
||||
if ($tagtype == 1) {
|
||||
spew("$me: adding '$tagname' to open_tags\n");
|
||||
if (isset($open_tags{$tagname})){
|
||||
if (isset($open_tags{$tagname})) {
|
||||
$open_tags{$tagname}++;
|
||||
} else {
|
||||
$open_tags{$tagname} = 1;
|
||||
@@ -981,12 +965,8 @@ function sanitize($body,
|
||||
/**
|
||||
* This is where we run other checks.
|
||||
*/
|
||||
if (is_array($attary) && sizeof($attary) > 0){
|
||||
$attary = fixatts($tagname,
|
||||
$attary,
|
||||
$rm_attnames,
|
||||
$bad_attvals,
|
||||
$add_attr_to_tag);
|
||||
if (is_array($attary) && sizeof($attary) > 0) {
|
||||
$attary = fixatts($tagname, $attary, $rm_attnames, $bad_attvals, $add_attr_to_tag);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -994,7 +974,7 @@ function sanitize($body,
|
||||
spew("$me: Skipping this tag\n");
|
||||
}
|
||||
}
|
||||
if ($tagname != false && $skip_content == false){
|
||||
if ($tagname != false && $skip_content == false) {
|
||||
spew("$me: Appending tag to trusted.\n");
|
||||
$trusted .= tagprint($tagname, $attary, $tagtype);
|
||||
}
|
||||
@@ -1005,9 +985,9 @@ function sanitize($body,
|
||||
}
|
||||
spew("$me: Appending any leftover content\n");
|
||||
$trusted .= substr($body, $curpos, strlen($body) - $curpos);
|
||||
if ($force_tag_closing == true){
|
||||
foreach ($open_tags as $tagname=>$opentimes){
|
||||
while ($opentimes > 0){
|
||||
if ($force_tag_closing == true) {
|
||||
foreach ($open_tags as $tagname=>$opentimes) {
|
||||
while ($opentimes > 0) {
|
||||
spew("$me: '$tagname' left open. Closing by force.\n");
|
||||
$trusted .= '</' . $tagname . '>';
|
||||
$opentimes--;
|
||||
|
||||
Reference in New Issue
Block a user