chamilo / chamilo-lms

main/inc/lib/getid3/getid3.php

Indentation +165 added lines, -165 removed lines

@@ -300,7 +300,7 @@ 
         $class = new $class_name($this);
 
         try {
-             $this->option_analyze and $class->Analyze();
+                $this->option_analyze and $class->Analyze();
             }
         catch (getid3_exception $e) {
             throw $e;
@@ -383,7 +383,7 @@ 
             // CalculateReplayGain() {
             if (@$this->info['replay_gain']) {
                 if (!@$this->info['replay_gain']['reference_volume']) {
-                     $this->info['replay_gain']['reference_volume'] = 89;
+                        $this->info['replay_gain']['reference_volume'] = 89;
                 }
                 if (isset($this->info['replay_gain']['track']['adjustment'])) {
                     $this->info['replay_gain']['track']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['track']['adjustment'];
@@ -403,7 +403,7 @@ 
 
             // ProcessAudioStreams() {
             if (@!$this->info['audio']['streams'] && (@$this->info['audio']['bitrate'] || @$this->info['audio']['channels'] || @$this->info['audio']['sample_rate'])) {
-                  foreach ($this->info['audio'] as $key => $value) {
+                    foreach ($this->info['audio'] as $key => $value) {
                     if ($key != 'streams') {
                         $this->info['audio']['streams'][0][$key] = $value;
                     }
@@ -544,7 +544,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'ac3',
                             'mime_type' => 'audio/ac3',
-                          ),
+                            ),
 
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADIF format
                 'adif' => array (
@@ -553,7 +553,7 @@ 
                             'module'    => 'aac_adif',
                             'mime_type' => 'application/octet-stream',
                             'fail_ape'  => 'WARNING',
-                          ),
+                            ),
 
 
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
@@ -563,7 +563,7 @@ 
                             'module'    => 'aac_adts',
                             'mime_type' => 'application/octet-stream',
                             'fail_ape'  => 'WARNING',
-                          ),
+                            ),
 
 
                 // AU   - audio       - NeXT/Sun AUdio (AU)
@@ -572,7 +572,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'au',
                             'mime_type' => 'audio/basic',
-                          ),
+                            ),
 
                 // AVR  - audio       - Audio Visual Research
                 'avr'  => array (
@@ -580,7 +580,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'avr',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // BONK - audio       - Bonk v0.9+
                 'bonk' => array (
@@ -588,15 +588,15 @@ 
                             'group'     => 'audio',
                             'module'    => 'bonk',
                             'mime_type' => 'audio/xmms-bonk',
-                          ),
+                            ),
 
                 // DTS  - audio       - Dolby Theatre System
-				'dts'  => array(
-							'pattern'   => '^\x7F\xFE\x80\x01',
-							'group'     => 'audio',
-							'module'    => 'dts',
-							'mime_type' => 'audio/dts',
-						),
+                'dts'  => array(
+                            'pattern'   => '^\x7F\xFE\x80\x01',
+                            'group'     => 'audio',
+                            'module'    => 'dts',
+                            'mime_type' => 'audio/dts',
+                        ),
 
                 // FLAC - audio       - Free Lossless Audio Codec
                 'flac' => array (
@@ -604,7 +604,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'xiph',
                             'mime_type' => 'audio/x-flac',
-                          ),
+                            ),
 
                 // LA   - audio       - Lossless Audio (LA)
                 'la'   => array (
@@ -612,7 +612,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'la',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // LPAC - audio       - Lossless Predictive Audio Compression (LPAC)
                 'lpac' => array (
@@ -620,7 +620,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'lpac',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // MIDI - audio       - MIDI (Musical Instrument Digital Interface)
                 'midi' => array (
@@ -628,7 +628,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'midi',
                             'mime_type' => 'audio/midi',
-                          ),
+                            ),
 
                 // MAC  - audio       - Monkey's Audio Compressor
                 'mac'  => array (
@@ -636,31 +636,31 @@ 
                             'group'     => 'audio',
                             'module'    => 'monkey',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // MOD  - audio       - MODule (assorted sub-formats)
                 'mod'  => array (
                             'pattern'   => '^.{1080}(M.K.|[5-9]CHN|[1-3][0-9]CH)',
                             'mime_type' => 'audio/mod',
-                          ),
+                            ),
 
                 // MOD  - audio       - MODule (Impulse Tracker)
                 'it'   => array (
                             'pattern'   => '^IMPM',
                             'mime_type' => 'audio/it',
-                          ),
+                            ),
 
                 // MOD  - audio       - MODule (eXtended Module, various sub-formats)
                 'xm'   => array (
                             'pattern'   => '^Extended Module',
                             'mime_type' => 'audio/xm',
-                          ),
+                            ),
 
                 // MOD  - audio       - MODule (ScreamTracker)
                 's3m'  => array (
                             'pattern'   => '^.{44}SCRM',
                             'mime_type' => 'audio/s3m',
-                          ),
+                            ),
 
                 // MPC  - audio       - Musepack / MPEGplus SV7+
                 'mpc'  => array (
@@ -668,7 +668,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'mpc',
                             'mime_type' => 'audio/x-musepack',
-                          ),
+                            ),
 
                 // MPC  - audio       - Musepack / MPEGplus SV4-6
                 'mpc_old' => array (
@@ -676,7 +676,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'mpc_old',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
 
                 // MP3  - audio       - MPEG-audio Layer 3 (very similar to AAC-ADTS)
@@ -685,7 +685,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'mp3',
                             'mime_type' => 'audio/mpeg',
-                          ),
+                            ),
 
                 // OFR  - audio       - OptimFROG
                 'ofr'  => array (
@@ -693,7 +693,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'optimfrog',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // RKAU - audio       - RKive AUdio compressor
                 'rkau' => array (
@@ -701,7 +701,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'rkau',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // SHN  - audio       - Shorten
                 'shn'  => array (
@@ -711,7 +711,7 @@ 
                             'mime_type' => 'audio/xmms-shn',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
                 'tta'  => array (
@@ -719,7 +719,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'tta',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // VOC  - audio       - Creative Voice (VOC)
                 'voc'  => array (
@@ -727,7 +727,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'voc',
                             'mime_type' => 'audio/voc',
-                          ),
+                            ),
 
                 // VQF  - audio       - transform-domain weighted interleave Vector Quantization Format (VQF)
                 'vqf'  => array (
@@ -735,7 +735,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'vqf',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // WV  - audio        - WavPack (v4.0+)
                 'vw'  => array(
@@ -743,7 +743,7 @@ 
                             'group'     => 'audio',
                             'module'    => 'wavpack',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
 
                 // Audio-Video formats
@@ -754,13 +754,13 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'asf',
                             'mime_type' => 'video/x-ms-asf',
-                          ),
+                            ),
 
                 // BINK  - audio/video - Bink / Smacker
                 'bink' => array(
                             'pattern'   => '^(BIK|SMK)',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // FLV  - audio/video - FLash Video
                 'flv' => array(
@@ -768,13 +768,13 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'flv',
                             'mime_type' => 'video/x-flv',
-                          ),
+                            ),
 
                 // MKAV - audio/video - Mastroka
                 'matroska' => array (
                             'pattern'   => '^\x1A\x45\xDF\xA3',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // MPEG - audio/video - MPEG (Moving Pictures Experts Group)
                 'mpeg' => array (
@@ -782,7 +782,7 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'mpeg',
                             'mime_type' => 'video/mpeg',
-                          ),
+                            ),
 
                 // NSV  - audio/video - Nullsoft Streaming Video (NSV)
                 'nsv'  => array (
@@ -790,7 +790,7 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'nsv',
                             'mime_type' => 'application/octet-stream',
-                          ),
+                            ),
 
                 // Ogg  - audio/video - Ogg (Ogg Vorbis, OggFLAC, Speex, Ogg Theora(*), Ogg Tarkin(*))
                 'ogg'  => array (
@@ -800,7 +800,7 @@ 
                             'mime_type' => 'application/ogg',
                             'fail_id3'  => 'WARNING',
                             'fail_ape'  => 'WARNING',
-                          ),
+                            ),
 
                 // QT   - audio/video - Quicktime
                 'quicktime' => array (
@@ -808,7 +808,7 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'quicktime',
                             'mime_type' => 'video/quicktime',
-                          ),
+                            ),
 
                 // RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
                 'riff' => array (
@@ -817,7 +817,7 @@ 
                             'module'    => 'riff',
                             'mime_type' => 'audio/x-wave',
                             'fail_ape'  => 'WARNING',
-                          ),
+                            ),
 
                 // Real - audio/video - RealAudio, RealVideo
                 'real' => array (
@@ -825,7 +825,7 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'real',
                             'mime_type' => 'audio/x-realaudio',
-                          ),
+                            ),
 
                 // SWF - audio/video - ShockWave Flash
                 'swf' => array (
@@ -833,7 +833,7 @@ 
                             'group'     => 'audio-video',
                             'module'    => 'swf',
                             'mime_type' => 'application/x-shockwave-flash',
-                          ),
+                            ),
 
 
                 // Still-Image formats
@@ -846,7 +846,7 @@ 
                             'mime_type' => 'image/bmp',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // GIF  - still image - Graphics Interchange Format
                 'gif'  => array (
@@ -856,7 +856,7 @@ 
                             'mime_type' => 'image/gif',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // JPEG - still image - Joint Photographic Experts Group (JPEG)
                 'jpeg'  => array (
@@ -866,7 +866,7 @@ 
                             'mime_type' => 'image/jpeg',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // PCD  - still image - Kodak Photo CD
                 'pcd'  => array (
@@ -876,7 +876,7 @@ 
                             'mime_type' => 'image/x-photo-cd',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
 
                 // PNG  - still image - Portable Network Graphics (PNG)
@@ -887,16 +887,16 @@ 
                             'mime_type' => 'image/png',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
 
                 // SVG  - still image - Scalable Vector Graphics (SVG)
-				'svg'  => array(
-							'pattern'   => '<!DOCTYPE svg PUBLIC ',
-							'mime_type' => 'image/svg+xml',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
+                'svg'  => array(
+                            'pattern'   => '<!DOCTYPE svg PUBLIC ',
+                            'mime_type' => 'image/svg+xml',
+                            'fail_id3'  => 'ERROR',
+                            'fail_ape'  => 'ERROR',
+                        ),
 
 
                 // TIFF  - still image - Tagged Information File Format (TIFF)
@@ -907,7 +907,7 @@ 
                             'mime_type' => 'image/tiff',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
 
                 // Data formats
@@ -917,7 +917,7 @@ 
                             'mime_type' => 'application/octet-stream',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // ISO  - data        - International Standards Organization (ISO) CD-ROM Image
                 'iso'  => array (
@@ -927,7 +927,7 @@ 
                             'mime_type' => 'application/octet-stream',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // RAR  - data        - RAR compressed data
                 'rar'  => array(
@@ -935,7 +935,7 @@ 
                             'mime_type' => 'application/octet-stream',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // SZIP - audio       - SZIP compressed data
                 'szip' => array (
@@ -945,7 +945,7 @@ 
                             'mime_type' => 'application/octet-stream',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // TAR  - data        - TAR compressed data
                 'tar'  => array(
@@ -955,7 +955,7 @@ 
                             'mime_type' => 'application/x-tar',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
                 // GZIP  - data        - GZIP compressed data
                 'gz'  => array(
@@ -965,7 +965,7 @@ 
                             'mime_type' => 'application/x-gzip',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
 
                 // ZIP  - data        - ZIP compressed data
@@ -976,33 +976,33 @@ 
                             'mime_type' => 'application/zip',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
 
 
                 // PAR2 - data        - Parity Volume Set Specification 2.0
                 'par2' => array (
-                			'pattern'   => '^PAR2\x00PKT',
-							'mime_type' => 'application/octet-stream',
-							'fail_id3'  => 'ERROR',
-							'fail_ape'  => 'ERROR',
-						),
+                            'pattern'   => '^PAR2\x00PKT',
+                            'mime_type' => 'application/octet-stream',
+                            'fail_id3'  => 'ERROR',
+                            'fail_ape'  => 'ERROR',
+                        ),
 
 
-                 // PDF  - data       - Portable Document Format
-                 'pdf' => array(
+                    // PDF  - data       - Portable Document Format
+                    'pdf' => array(
                             'pattern'   => '^\x25PDF',
                             'mime_type' => 'application/pdf',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                           ),
+                            ),
 
-                 // DOC  - data       - Microsoft Word
-                 'msoffice' => array(
+                    // DOC  - data       - Microsoft Word
+                    'msoffice' => array(
                             'pattern'   => '^\xD0\xCF\x11\xE0', // D0CF11E == DOCFILE == Microsoft Office Document
                             'mime_type' => 'application/octet-stream',
                             'fail_id3'  => 'ERROR',
                             'fail_ape'  => 'ERROR',
-                          ),
+                            ),
             );
 
         return $format_info;
@@ -1393,99 +1393,99 @@ 
 
     public static function BigEndian2Float($byte_word) {
 
-		// ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
-		// http://www.psc.edu/general/software/packages/ieee/ieee.html
-		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
+        // ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
+        // http://www.psc.edu/general/software/packages/ieee/ieee.html
+        // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
 
-		$bit_word = getid3_lib::BigEndian2Bin($byte_word);
-		if (!$bit_word) {
+        $bit_word = getid3_lib::BigEndian2Bin($byte_word);
+        if (!$bit_word) {
             return 0;
         }
-		$sign_bit = $bit_word{0};
-
-		switch (strlen($byte_word) * 8) {
-			case 32:
-				$exponent_bits = 8;
-				$fraction_bits = 23;
-				break;
-
-			case 64:
-				$exponent_bits = 11;
-				$fraction_bits = 52;
-				break;
-
-			case 80:
-				// 80-bit Apple SANE format
-				// http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
-				$exponent_string = substr($bit_word, 1, 15);
-				$is_normalized = intval($bit_word{16});
-				$fraction_string = substr($bit_word, 17, 63);
-				$exponent = pow(2, getid3_lib::Bin2Dec($exponent_string) - 16383);
-				$fraction = $is_normalized + getid3_lib::DecimalBinary2Float($fraction_string);
-				$float_value = $exponent * $fraction;
-				if ($sign_bit == '1') {
-					$float_value *= -1;
-				}
-				return $float_value;
-				break;
-
-			default:
-				return false;
-				break;
-		}
-		$exponent_string = substr($bit_word, 1, $exponent_bits);
-		$fraction_string = substr($bit_word, $exponent_bits + 1, $fraction_bits);
-		$exponent = bindec($exponent_string);
-		$fraction = bindec($fraction_string);
-
-		if (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction != 0)) {
-			// Not a Number
-			$float_value = false;
-		} elseif (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction == 0)) {
-			if ($sign_bit == '1') {
-				$float_value = '-infinity';
-			} else {
-				$float_value = '+infinity';
-			}
-		} elseif (($exponent == 0) && ($fraction == 0)) {
-			if ($sign_bit == '1') {
-				$float_value = -0;
-			} else {
-				$float_value = 0;
-			}
-			$float_value = ($sign_bit ? 0 : -0);
-		} elseif (($exponent == 0) && ($fraction != 0)) {
-			// These are 'unnormalized' values
-			$float_value = pow(2, (-1 * (pow(2, $exponent_bits - 1) - 2))) * getid3_lib::DecimalBinary2Float($fraction_string);
-			if ($sign_bit == '1') {
-				$float_value *= -1;
-			}
-		} elseif ($exponent != 0) {
-			$float_value = pow(2, ($exponent - (pow(2, $exponent_bits - 1) - 1))) * (1 + getid3_lib::DecimalBinary2Float($fraction_string));
-			if ($sign_bit == '1') {
-				$float_value *= -1;
-			}
-		}
-		return (float) $float_value;
-	}
-
-
-
-	public static function LittleEndian2Float($byte_word) {
-
-		return getid3_lib::BigEndian2Float(strrev($byte_word));
-	}
-
-
-
-	public static function DecimalBinary2Float($binary_numerator) {
-		$numerator   = bindec($binary_numerator);
-		$denominator = bindec('1'.str_repeat('0', strlen($binary_numerator)));
-		return ($numerator / $denominator);
-	}
-
-
-	public static function PrintHexBytes($string, $hex=true, $spaces=true, $html_safe=true) {
+        $sign_bit = $bit_word{0};
+
+        switch (strlen($byte_word) * 8) {
+            case 32:
+                $exponent_bits = 8;
+                $fraction_bits = 23;
+                break;
+
+            case 64:
+                $exponent_bits = 11;
+                $fraction_bits = 52;
+                break;
+
+            case 80:
+                // 80-bit Apple SANE format
+                // http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
+                $exponent_string = substr($bit_word, 1, 15);
+                $is_normalized = intval($bit_word{16});
+                $fraction_string = substr($bit_word, 17, 63);
+                $exponent = pow(2, getid3_lib::Bin2Dec($exponent_string) - 16383);
+                $fraction = $is_normalized + getid3_lib::DecimalBinary2Float($fraction_string);
+                $float_value = $exponent * $fraction;
+                if ($sign_bit == '1') {
+                    $float_value *= -1;
+                }
+                return $float_value;
+                break;
+
+            default:
+                return false;
+                break;
+        }
+        $exponent_string = substr($bit_word, 1, $exponent_bits);
+        $fraction_string = substr($bit_word, $exponent_bits + 1, $fraction_bits);
+        $exponent = bindec($exponent_string);
+        $fraction = bindec($fraction_string);
+
+        if (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction != 0)) {
+            // Not a Number
+            $float_value = false;
+        } elseif (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction == 0)) {
+            if ($sign_bit == '1') {
+                $float_value = '-infinity';
+            } else {
+                $float_value = '+infinity';
+            }
+        } elseif (($exponent == 0) && ($fraction == 0)) {
+            if ($sign_bit == '1') {
+                $float_value = -0;
+            } else {
+                $float_value = 0;
+            }
+            $float_value = ($sign_bit ? 0 : -0);
+        } elseif (($exponent == 0) && ($fraction != 0)) {
+            // These are 'unnormalized' values
+            $float_value = pow(2, (-1 * (pow(2, $exponent_bits - 1) - 2))) * getid3_lib::DecimalBinary2Float($fraction_string);
+            if ($sign_bit == '1') {
+                $float_value *= -1;
+            }
+        } elseif ($exponent != 0) {
+            $float_value = pow(2, ($exponent - (pow(2, $exponent_bits - 1) - 1))) * (1 + getid3_lib::DecimalBinary2Float($fraction_string));
+            if ($sign_bit == '1') {
+                $float_value *= -1;
+            }
+        }
+        return (float) $float_value;
+    }
+
+
+
+    public static function LittleEndian2Float($byte_word) {
+
+        return getid3_lib::BigEndian2Float(strrev($byte_word));
+    }
+
+
+
+    public static function DecimalBinary2Float($binary_numerator) {
+        $numerator   = bindec($binary_numerator);
+        $denominator = bindec('1'.str_repeat('0', strlen($binary_numerator)));
+        return ($numerator / $denominator);
+    }
+
+
+    public static function PrintHexBytes($string, $hex=true, $spaces=true, $html_safe=true) {
 
         $return_string = '';
         for ($i = 0; $i < strlen($string); $i++) {

main/inc/lib/magpierss/extlib/Snoopy.class.inc

Indentation +666 added lines, -666 removed lines

@@ -36,81 +36,81 @@ 
 *************************************************/
 
 class Snoopy {
-	/**** Public variables ****/
+    /**** Public variables ****/
 	
-	/* user definable vars */
-
-	public $host			=	"www.php.net";		// host name we are connecting to
-	public $port			=	80;					// port we are connecting to
-	public $proxy_host		=	"";					// proxy host to use
-	public $proxy_port		=	"";					// proxy port to use
-	public $agent			=	"Snoopy v1.0";		// agent we masquerade as
-	public $referer		=	"";					// referer info to pass
-	public $cookies		=	array();			// array of cookies to pass
-												// $cookies["username"]="joe";
-	public	$rawheaders		=	array();			// array of raw headers to send
-												// $rawheaders["Content-type"]="text/html";
-
-	public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	public $lastredirectaddr	=	"";				// contains address of last redirected address
-	public	$offsiteok		=	true;				// allows redirection off-site
-	public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	public $expandlinks	=	true;				// expand links to fully qualified URLs.
-												// this only applies to fetchlinks()
-												// or submitlinks()
-	public $passcookies	=	true;				// pass set cookies back through redirects
-												// NOTE: this currently does not respect
-												// dates, domains or paths.
+    /* user definable vars */
+
+    public $host			=	"www.php.net";		// host name we are connecting to
+    public $port			=	80;					// port we are connecting to
+    public $proxy_host		=	"";					// proxy host to use
+    public $proxy_port		=	"";					// proxy port to use
+    public $agent			=	"Snoopy v1.0";		// agent we masquerade as
+    public $referer		=	"";					// referer info to pass
+    public $cookies		=	array();			// array of cookies to pass
+                                                // $cookies["username"]="joe";
+    public	$rawheaders		=	array();			// array of raw headers to send
+                                                // $rawheaders["Content-type"]="text/html";
+
+    public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
+    public $lastredirectaddr	=	"";				// contains address of last redirected address
+    public	$offsiteok		=	true;				// allows redirection off-site
+    public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
+    public $expandlinks	=	true;				// expand links to fully qualified URLs.
+                                                // this only applies to fetchlinks()
+                                                // or submitlinks()
+    public $passcookies	=	true;				// pass set cookies back through redirects
+                                                // NOTE: this currently does not respect
+                                                // dates, domains or paths.
 	
-	public	$user			=	"";					// user for http authentication
-	public	$pass			=	"";					// password for http authentication
+    public	$user			=	"";					// user for http authentication
+    public	$pass			=	"";					// password for http authentication
 	
-	// http accept types
-	public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+    // http accept types
+    public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 	
-	public $results		=	"";					// where the content is put
+    public $results		=	"";					// where the content is put
 		
-	public $error			=	"";					// error messages sent here
-	public	$response_code	=	"";					// response code returned from server
-	public	$headers		=	array();			// headers returned from server sent here
-	public	$maxlength		=	500000;				// max return data length (body)
-	public $read_timeout	=	0;					// timeout on read operations, in seconds
-												// supported only since PHP 4 Beta 4
-												// set to 0 to disallow timeouts
-	public $timed_out		=	false;				// if a read operation timed out
-	public	$status			=	0;					// http request status
+    public $error			=	"";					// error messages sent here
+    public	$response_code	=	"";					// response code returned from server
+    public	$headers		=	array();			// headers returned from server sent here
+    public	$maxlength		=	500000;				// max return data length (body)
+    public $read_timeout	=	0;					// timeout on read operations, in seconds
+                                                // supported only since PHP 4 Beta 4
+                                                // set to 0 to disallow timeouts
+    public $timed_out		=	false;				// if a read operation timed out
+    public	$status			=	0;					// http request status
 	
-	public	$curl_path		=	"/usr/bin/curl";
-												// Snoopy will use cURL for fetching
-												// SSL content if a full system path to
-												// the cURL binary is supplied here.
-												// set to false if you do not have
-												// cURL installed. See http://curl.haxx.se
-												// for details on installing cURL.
-												// Snoopy does *not* use the cURL
-												// library functions built into php,
-												// as these functions are not stable
-												// as of this Snoopy release.
+    public	$curl_path		=	"/usr/bin/curl";
+                                                // Snoopy will use cURL for fetching
+                                                // SSL content if a full system path to
+                                                // the cURL binary is supplied here.
+                                                // set to false if you do not have
+                                                // cURL installed. See http://curl.haxx.se
+                                                // for details on installing cURL.
+                                                // Snoopy does *not* use the cURL
+                                                // library functions built into php,
+                                                // as these functions are not stable
+                                                // as of this Snoopy release.
 	
-	// send Accept-encoding: gzip?
-	public $use_gzip		= true;	
+    // send Accept-encoding: gzip?
+    public $use_gzip		= true;	
 	
-	/**** Private variables ****/	
+    /**** Private variables ****/	
 	
-	private	$_maxlinelen	=	4096;				// max line length (headers)
+    private	$_maxlinelen	=	4096;				// max line length (headers)
 	
-	private $_httpmethod	=	"GET";				// default http request method
-	private $_httpversion	=	"HTTP/1.0";			// default http request version
-	private $_submit_method	=	"POST";				// default submit method
-	private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	private $_redirectdepth	=	0;					// increments on an http redirect
-	private $_frameurls		= 	array();			// frame src urls
-	private $_framedepth	=	0;					// increments on frame depth
+    private $_httpmethod	=	"GET";				// default http request method
+    private $_httpversion	=	"HTTP/1.0";			// default http request version
+    private $_submit_method	=	"POST";				// default submit method
+    private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
+    private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
+    private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
+    private $_redirectdepth	=	0;					// increments on an http redirect
+    private $_frameurls		= 	array();			// frame src urls
+    private $_framedepth	=	0;					// increments on frame depth
 	
-	private $_isproxy		=	false;				// set if using a proxy server
-	private $_fp_timeout	=	30;					// timeout for socket connection
+    private $_isproxy		=	false;				// set if using a proxy server
+    private $_fp_timeout	=	30;					// timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -121,136 +121,136 @@ 
 	Output:		$this->results	the output text from the fetch
 \*======================================================================*/
 
-	public function fetch($URI) {
-		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
-		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (!isset($fp)) { $fp = false; }
-		switch ($URI_PARTS["scheme"]) {
-			case "http":
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
-				{
-					if($this->_isproxy)
-					{
-						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
-					{
-						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
-						// no proxy, send only the path
-						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
-					}
+    public function fetch($URI) {
+        //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
+        $URI_PARTS = parse_url($URI);
+        if (!empty($URI_PARTS["user"]))
+            $this->user = $URI_PARTS["user"];
+        if (!empty($URI_PARTS["pass"]))
+            $this->pass = $URI_PARTS["pass"];
+        if (!isset($fp)) { $fp = false; }
+        switch ($URI_PARTS["scheme"]) {
+            case "http":
+                $this->host = $URI_PARTS["host"];
+                if(!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if($this->_connect($fp))
+                {
+                    if($this->_isproxy)
+                    {
+                        // using proxy, send entire URI
+                        $this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+                    }
+                    else
+                    {
+                        $path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
+                        // no proxy, send only the path
+                        $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
+                    }
 					
-					$this->_disconnect($fp);
-
-					if($this->_redirectaddr)
-					{
-						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
-						{
-							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
-							{
-								/* follow the redirect */
-								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								$this->fetch($this->_redirectaddr);
-							}
-						}
-					}
-
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-					{
-						$frameurls = $this->_frameurls;
-						$this->_frameurls = array();
+                    $this->_disconnect($fp);
+
+                    if($this->_redirectaddr)
+                    {
+                        /* url was redirected, check if we've hit the max depth */
+                        if($this->maxredirs > $this->_redirectdepth)
+                        {
+                            // only follow redirect if it's on this site, or offsiteok is true
+                            if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+                            {
+                                /* follow the redirect */
+                                $this->_redirectdepth++;
+                                $this->lastredirectaddr=$this->_redirectaddr;
+                                $this->fetch($this->_redirectaddr);
+                            }
+                        }
+                    }
+
+                    if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+                    {
+                        $frameurls = $this->_frameurls;
+                        $this->_frameurls = array();
 						
-						while(list(,$frameurl) = each($frameurls))
-						{
-							if($this->_framedepth < $this->maxframes)
-							{
-								$this->fetch($frameurl);
-								$this->_framedepth++;
-							}
-							else
-								break;
-						}
-					}					
-				}
-				else
-				{
-					return false;
-				}
-				return true;					
-				break;
-			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
-					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
-					return false;
-				}
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
-				{
-					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
-				{
-					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
-					// no proxy, send only the path
-					$this->_httpsrequest($path, $URI, $this->_httpmethod);
-				}
-
-				if($this->_redirectaddr)
-				{
-					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
-					{
-						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
-						{
-							/* follow the redirect */
-							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							$this->fetch($this->_redirectaddr);
-						}
-					}
-				}
-
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-				{
-					$frameurls = $this->_frameurls;
-					$this->_frameurls = array();
-
-					while(list(,$frameurl) = each($frameurls))
-					{
-						if($this->_framedepth < $this->maxframes)
-						{
-							$this->fetch($frameurl);
-							$this->_framedepth++;
-						}
-						else
-							break;
-					}
-				}					
-				return true;					
-				break;
-			default:
-				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
-				return false;
-				break;
-		}		
-		return true;
-	}
+                        while(list(,$frameurl) = each($frameurls))
+                        {
+                            if($this->_framedepth < $this->maxframes)
+                            {
+                                $this->fetch($frameurl);
+                                $this->_framedepth++;
+                            }
+                            else
+                                break;
+                        }
+                    }					
+                }
+                else
+                {
+                    return false;
+                }
+                return true;					
+                break;
+            case "https":
+                if(!$this->curl_path || (!is_executable($this->curl_path))) {
+                    $this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
+                    return false;
+                }
+                $this->host = $URI_PARTS["host"];
+                if(!empty($URI_PARTS["port"]))
+                    $this->port = $URI_PARTS["port"];
+                if($this->_isproxy)
+                {
+                    // using proxy, send entire URI
+                    $this->_httpsrequest($URI,$URI,$this->_httpmethod);
+                }
+                else
+                {
+                    $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
+                    // no proxy, send only the path
+                    $this->_httpsrequest($path, $URI, $this->_httpmethod);
+                }
+
+                if($this->_redirectaddr)
+                {
+                    /* url was redirected, check if we've hit the max depth */
+                    if($this->maxredirs > $this->_redirectdepth)
+                    {
+                        // only follow redirect if it's on this site, or offsiteok is true
+                        if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+                        {
+                            /* follow the redirect */
+                            $this->_redirectdepth++;
+                            $this->lastredirectaddr=$this->_redirectaddr;
+                            $this->fetch($this->_redirectaddr);
+                        }
+                    }
+                }
+
+                if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+                {
+                    $frameurls = $this->_frameurls;
+                    $this->_frameurls = array();
+
+                    while(list(,$frameurl) = each($frameurls))
+                    {
+                        if($this->_framedepth < $this->maxframes)
+                        {
+                            $this->fetch($frameurl);
+                            $this->_framedepth++;
+                        }
+                        else
+                            break;
+                    }
+                }					
+                return true;					
+                break;
+            default:
+                // not a valid protocol
+                $this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+                return false;
+                break;
+        }		
+        return true;
+    }
 
 
 
@@ -266,32 +266,32 @@ 
 	Output:		$match		an array of the links
 \*======================================================================*/
 
-	private function _striplinks($document)
-	{	
-		preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
+    private function _striplinks($document)
+    {	
+        preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
 						'isx",$document,$links);
 						
 
-		// catenate the non-empty matches from the conditional subpattern
+        // catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}				
+        while(list($key,$val) = each($links[2]))
+        {
+            if(!empty($val))
+                $match[] = $val;
+        }				
 		
-		while(list($key,$val) = each($links[3]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}		
+        while(list($key,$val) = each($links[3]))
+        {
+            if(!empty($val))
+                $match[] = $val;
+        }		
 		
-		// return the links
-		return $match;
-	}
+        // return the links
+        return $match;
+    }
 
 /*======================================================================*\
 	Function:	_stripform
@@ -300,16 +300,16 @@ 
 	Output:		$match		an array of the links
 \*======================================================================*/
 
-	private function _stripform($document)
-	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+    private function _stripform($document)
+    {	
+        preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
 		
-		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+        // catenate the matches
+        $match = implode("\r\n",$elements[0]);
 				
-		// return the links
-		return $match;
-	}
+        // return the links
+        return $match;
+    }
 
 	
 	
@@ -320,43 +320,43 @@ 
 	Output:		$text		the resulting text
 \*======================================================================*/
 
-	private function _striptext($document)
-	{
+    private function _striptext($document)
+    {
 		
-		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
-		// so, list your entities one by one here. I included some of the
-		// more common ones.
+        // I didn't use preg eval (//e) since that is only available in PHP 4.0.
+        // so, list your entities one by one here. I included some of the
+        // more common ones.
 								
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quote|#34);'i",					// replace html entities
-						"'&(amp|#38);'i",
-						"'&(lt|#60);'i",
-						"'&(gt|#62);'i",
-						"'&(nbsp|#160);'i",
-						"'&(iexcl|#161);'i",
-						"'&(cent|#162);'i",
-						"'&(pound|#163);'i",
-						"'&(copy|#169);'i"
-						);				
-		$replace = array(	"",
-							"",
-							"\\1",
-							"\"",
-							"&",
-							"<",
-							">",
-							" ",
-							chr(161),
-							chr(162),
-							chr(163),
-							chr(169));
+        $search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
+                        "'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
+                        "'([\r\n])[\s]+'",					// strip out white space
+                        "'&(quote|#34);'i",					// replace html entities
+                        "'&(amp|#38);'i",
+                        "'&(lt|#60);'i",
+                        "'&(gt|#62);'i",
+                        "'&(nbsp|#160);'i",
+                        "'&(iexcl|#161);'i",
+                        "'&(cent|#162);'i",
+                        "'&(pound|#163);'i",
+                        "'&(copy|#169);'i"
+                        );				
+        $replace = array(	"",
+                            "",
+                            "\\1",
+                            "\"",
+                            "&",
+                            "<",
+                            ">",
+                            " ",
+                            chr(161),
+                            chr(162),
+                            chr(163),
+                            chr(169));
 					
-		$text = preg_replace($search,$replace,$document);
+        $text = preg_replace($search,$replace,$document);
 								
-		return $text;
-	}
+        return $text;
+    }
 
 /*======================================================================*\
 	Function:	_expandlinks
@@ -366,29 +366,29 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	private function _expandlinks($links,$URI)
-	{
+    private function _expandlinks($links,$URI)
+    {
 		
-		preg_match("/^[^\?]+/",$URI,$match);
+        preg_match("/^[^\?]+/",$URI,$match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+        $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
 				
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
-							"|^(?!http://)(\/)?(?!mailto:)|i",
-							"|/\./|",
-							"|/[^\/]+/\.\./|"
-						);
+        $search = array( 	"|^http://".preg_quote($this->host)."|i",
+                            "|^(?!http://)(\/)?(?!mailto:)|i",
+                            "|/\./|",
+                            "|/[^\/]+/\.\./|"
+                        );
 						
-		$replace = array(	"",
-							$match."/",
-							"/",
-							"/"
-						);			
+        $replace = array(	"",
+                            $match."/",
+                            "/",
+                            "/"
+                        );			
 				
-		$expandedLinks = preg_replace($search,$replace,$links);
+        $expandedLinks = preg_replace($search,$replace,$links);
 
-		return $expandedLinks;
-	}
+        return $expandedLinks;
+    }
 
 /*======================================================================*\
 	Function:	_httprequest
@@ -400,179 +400,179 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+    private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+    {
+        if($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
 			
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
+        $URI_PARTS = parse_url($URI);
+        if(empty($url))
+            $url = "/";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
+        if(!empty($this->agent))
+            $headers .= "User-Agent: ".$this->agent."\r\n";
+        if(!empty($this->host) && !isset($this->rawheaders['Host']))
+            $headers .= "Host: ".$this->host."\r\n";
+        if(!empty($this->accept))
+            $headers .= "Accept: ".$this->accept."\r\n";
 		
-		if($this->use_gzip) {
-			// make sure PHP was built with --with-zlib
-			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
-			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
-			   trigger_error(
-			   	"use_gzip is on, but PHP was built without zlib support.".
-				"  Requesting file(s) without gzip encoding.", 
-				E_USER_NOTICE);
-			}
-		}
+        if($this->use_gzip) {
+            // make sure PHP was built with --with-zlib
+            // and we can handle gzipp'ed data
+            if ( function_exists(gzinflate) ) {
+                $headers .= "Accept-encoding: gzip\r\n";
+            }
+            else {
+                trigger_error(
+                    "use_gzip is on, but PHP was built without zlib support.".
+                "  Requesting file(s) without gzip encoding.", 
+                E_USER_NOTICE);
+            }
+        }
 		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+        if(!empty($this->referer))
+            $headers .= "Referer: ".$this->referer."\r\n";
+        if(!empty($this->cookies))
+        {			
+            if(!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
 	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
-			} 
-		}
-		if(!empty($this->rawheaders))
-		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
-		}
-		if(!empty($content_type)) {
-			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
-			$headers .= "\r\n";
-		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
-
-		$headers .= "\r\n";
+            reset($this->cookies);
+            if ( count($this->cookies) > 0 ) {
+                $cookie_headers .= 'Cookie: ';
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+                $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
+                }
+                $headers .= substr($cookie_headers,0,-2) . "\r\n";
+            } 
+        }
+        if(!empty($this->rawheaders))
+        {
+            if(!is_array($this->rawheaders))
+                $this->rawheaders = (array)$this->rawheaders;
+            while(list($headerKey,$headerVal) = each($this->rawheaders))
+                $headers .= $headerKey.": ".$headerVal."\r\n";
+        }
+        if(!empty($content_type)) {
+            $headers .= "Content-type: $content_type";
+            if ($content_type == "multipart/form-data")
+                $headers .= "; boundary=".$this->_mime_boundary;
+            $headers .= "\r\n";
+        }
+        if(!empty($body))	
+            $headers .= "Content-length: ".strlen($body)."\r\n";
+        if(!empty($this->user) || !empty($this->pass))	
+            $headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
+
+        $headers .= "\r\n";
 		
-		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
-		$this->timed_out = false;
+        // set the read timeout if needed
+        if ($this->read_timeout > 0)
+            socket_set_timeout($fp, $this->read_timeout);
+        $this->timed_out = false;
 		
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+        fwrite($fp,$headers.$body,strlen($headers.$body));
 		
-		$this->_redirectaddr = false;
-		unset($this->headers);
+        $this->_redirectaddr = false;
+        unset($this->headers);
 		
-		// content was returned gzip encoded?
-		$is_gzipped = false;
+        // content was returned gzip encoded?
+        $is_gzipped = false;
 						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
-		{
-			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-			{
-				$this->status=-100;
-				return false;
-			}
+        while($currentHeader = fgets($fp,$this->_maxlinelen))
+        {
+            if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+            {
+                $this->status=-100;
+                return false;
+            }
 				
-		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
+        //	if($currentHeader == "\r\n")
+            if(preg_match("/^\r?\n$/", $currentHeader) )
+                    break;
 						
-			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
-			{
-				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
-				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
+            // if a header begins with Location: or URI:, set the redirect
+            if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+            {
+                // get URL portion of the redirect
+                preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
+                // look for :// in the Location header to see if hostname is included
+                if(!preg_match("|\:\/\/|",$matches[2]))
+                {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+                    // eliminate double slash
+                    if(!preg_match("|^/|",$matches[2]))
+                            $this->_redirectaddr .= "/".$matches[2];
+                    else
+                            $this->_redirectaddr .= $matches[2];
+                }
+                else
+                    $this->_redirectaddr = $matches[2];
+            }
 		
-			if(preg_match("|^HTTP/|",$currentHeader))
-			{
+            if(preg_match("|^HTTP/|",$currentHeader))
+            {
                 if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
-				{
-					$this->status= $status[1];
+                {
+                    $this->status= $status[1];
                 }				
-				$this->response_code = $currentHeader;
-			}
+                $this->response_code = $currentHeader;
+            }
 			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
-				$is_gzipped = true;
-			}
+            if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+                $is_gzipped = true;
+            }
 			
-			$this->headers[] = $currentHeader;
-		}
-
-		# $results = fread($fp, $this->maxlength);
-		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
-		    $results .= $data;
-		    if (
-		        strlen($results) > $this->maxlength ) {
-		        break;
-		    }
-		}
+            $this->headers[] = $currentHeader;
+        }
+
+        # $results = fread($fp, $this->maxlength);
+        $results = "";
+        while ( $data = fread($fp, $this->maxlength) ) {
+            $results .= $data;
+            if (
+                strlen($results) > $this->maxlength ) {
+                break;
+            }
+        }
 		
-		// gunzip
-		if ( $is_gzipped ) {
-			// per http://www.php.net/manual/en/function.gzencode.php
-			$results = substr($results, 10);
-			$results = gzinflate($results);
-		}
+        // gunzip
+        if ( $is_gzipped ) {
+            // per http://www.php.net/manual/en/function.gzencode.php
+            $results = substr($results, 10);
+            $results = gzinflate($results);
+        }
 		
-		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-		{
-			$this->status=-100;
-			return false;
-		}
+        if ($this->read_timeout > 0 && $this->_check_timeout($fp))
+        {
+            $this->status=-100;
+            return false;
+        }
 		
-		// check if there is a a redirect meta tag
+        // check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
-		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
-		}
-
-		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
-		{
-			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
-		}
-		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
+        if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+        {
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+        }
+
+        // have we hit our frame depth and is there frame src to fetch?
+        if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+        {
+            $this->results[] = $results;
+            for($x=0; $x<count($match[1]); $x++)
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+        }
+        // have we already fetched framed content?
+        elseif(is_array($this->results))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
 		
-		return true;
-	}
+        return true;
+    }
 
 /*======================================================================*\
 	Function:	_httpsrequest
@@ -583,163 +583,163 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+    private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+    {
+        if($this->passcookies && $this->_redirectaddr)
+            $this->setcookies();
 
-		$headers = array();		
+        $headers = array();		
 					
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		// GET ... header not needed for curl
-		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+        $URI_PARTS = parse_url($URI);
+        if(empty($url))
+            $url = "/";
+        // GET ... header not needed for curl
+        //$headers[] = $http_method." ".$url." ".$this->_httpversion;		
+        if(!empty($this->agent))
+            $headers[] = "User-Agent: ".$this->agent;
+        if(!empty($this->host))
+            $headers[] = "Host: ".$this->host;
+        if(!empty($this->accept))
+            $headers[] = "Accept: ".$this->accept;
+        if(!empty($this->referer))
+            $headers[] = "Referer: ".$this->referer;
+        if(!empty($this->cookies))
+        {			
+            if(!is_array($this->cookies))
+                $this->cookies = (array)$this->cookies;
 	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers[] = substr($cookie_str,0,-2);
-			}
-		}
-		if(!empty($this->rawheaders))
-		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
-		}
-		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
+            reset($this->cookies);
+            if ( count($this->cookies) > 0 ) {
+                $cookie_str = 'Cookie: ';
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+                $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
+                }
+                $headers[] = substr($cookie_str,0,-2);
+            }
+        }
+        if(!empty($this->rawheaders))
+        {
+            if(!is_array($this->rawheaders))
+                $this->rawheaders = (array)$this->rawheaders;
+            while(list($headerKey,$headerVal) = each($this->rawheaders))
+                $headers[] = $headerKey.": ".$headerVal;
+        }
+        if(!empty($content_type)) {
+            if ($content_type == "multipart/form-data")
+                $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+            else
+                $headers[] = "Content-type: $content_type";
+        }
+        if(!empty($body))	
+            $headers[] = "Content-length: ".strlen($body);
+        if(!empty($this->user) || !empty($this->pass))	
+            $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
-			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
-		}
+        for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+            $cmdline_params .= " -H \"".$headers[$curr_header]."\"";
+        }
 			  	                         
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
+        if(!empty($body))
+            $cmdline_params .= " -d \"$body\"";
 		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
+        if($this->read_timeout > 0)
+            $cmdline_params .= " -m ".$this->read_timeout;
 		
-		$headerfile = uniqid(time());
+        $headerfile = uniqid(time());
 		
-		# accept self-signed certs
-		$cmdline_params .= " -k";
+        # accept self-signed certs
+        $cmdline_params .= " -k";
         $results = array();
         $return = 0;
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
+        exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
 		
-		if($return)
-		{
-			$this->error = "Error: cURL could not retrieve the document, error $return.";
-			return false;
-		}
+        if($return)
+        {
+            $this->error = "Error: cURL could not retrieve the document, error $return.";
+            return false;
+        }
 			
 			
-		$results = implode("\r\n",$results);
+        $results = implode("\r\n",$results);
 		
-		$result_headers = file("/tmp/$headerfile");
+        $result_headers = file("/tmp/$headerfile");
 						
-		$this->_redirectaddr = false;
-		unset($this->headers);
+        $this->_redirectaddr = false;
+        unset($this->headers);
 						
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
-		{
+        for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+        {
 			
-			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
-			{
-				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
-				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
+            // if a header begins with Location: or URI:, set the redirect
+            if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+            {
+                // get URL portion of the redirect
+                preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
+                // look for :// in the Location header to see if hostname is included
+                if(!preg_match("|\:\/\/|",$matches[2]))
+                {
+                    // no host in the path, so prepend
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
+                    // eliminate double slash
+                    if(!preg_match("|^/|",$matches[2]))
+                            $this->_redirectaddr .= "/".$matches[2];
+                    else
+                            $this->_redirectaddr .= $matches[2];
+                }
+                else
+                    $this->_redirectaddr = $matches[2];
+            }
 		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
-			{
-			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
-			    {
-				$this->status= $match[1];
-                	    }
-			}
-			$this->headers[] = $result_headers[$currentHeader];
-		}
-
-		// check if there is a a redirect meta tag
+            if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+            {
+                $this->response_code = $result_headers[$currentHeader];
+                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+                {
+                $this->status= $match[1];
+                        }
+            }
+            $this->headers[] = $result_headers[$currentHeader];
+        }
+
+        // check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
-		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
-		}
-
-		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
-		{
-			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
-		}
-		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
-
-		unlink("/tmp/$headerfile");
+        if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+        {
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+        }
+
+        // have we hit our frame depth and is there frame src to fetch?
+        if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+        {
+            $this->results[] = $results;
+            for($x=0; $x<count($match[1]); $x++)
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+        }
+        // have we already fetched framed content?
+        elseif(is_array($this->results))
+            $this->results[] = $results;
+        // no framed content
+        else
+            $this->results = $results;
+
+        unlink("/tmp/$headerfile");
 		
-		return true;
-	}
+        return true;
+    }
 
 /*======================================================================*\
 	Function:	setcookies()
 	Purpose:	set cookies for a redirection
 \*======================================================================*/
 	
-	public function setcookies()
-	{
-		for($x=0; $x<count($this->headers); $x++)
-		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
-		}
-	}
+    public function setcookies()
+    {
+        for($x=0; $x<count($this->headers); $x++)
+        {
+        if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+            $this->cookies[$match[1]] = $match[2];
+        }
+    }
 
 	
 /*======================================================================*\
@@ -748,17 +748,17 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 
-	private function _check_timeout($fp)
-	{
-		if ($this->read_timeout > 0) {
-			$fp_status = socket_get_status($fp);
-			if ($fp_status["timed_out"]) {
-				$this->timed_out = true;
-				return true;
-			}
-		}
-		return false;
-	}
+    private function _check_timeout($fp)
+    {
+        if ($this->read_timeout > 0) {
+            $fp_status = socket_get_status($fp);
+            if ($fp_status["timed_out"]) {
+                $this->timed_out = true;
+                return true;
+            }
+        }
+        return false;
+    }
 
 /*======================================================================*\
 	Function:	_connect
@@ -766,62 +766,62 @@ 
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
-	private function _connect(&$fp)
-	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
-			{
-				$this->_isproxy = true;
-				$host = $this->proxy_host;
-				$port = $this->proxy_port;
-			}
-		else
-		{
-			$host = $this->host;
-			$port = $this->port;
-		}
+    private function _connect(&$fp)
+    {
+        if(!empty($this->proxy_host) && !empty($this->proxy_port))
+            {
+                $this->_isproxy = true;
+                $host = $this->proxy_host;
+                $port = $this->proxy_port;
+            }
+        else
+        {
+            $host = $this->host;
+            $port = $this->port;
+        }
 	
-		$this->status = 0;
+        $this->status = 0;
 		
-		if($fp = fsockopen(
-					$host,
-					$port,
-					$errno,
-					$errstr,
-					$this->_fp_timeout
-					))
-		{
-			// socket connection succeeded
-
-			return true;
-		}
-		else
-		{
-			// socket connection failed
-			$this->status = $errno;
-			switch($errno)
-			{
-				case -3:
-					$this->error="socket creation failed (-3)";
-				case -4:
-					$this->error="dns lookup failure (-4)";
-				case -5:
-					$this->error="connection refused or timed out (-5)";
-				default:
-					$this->error="connection failed (".$errno.")";
-			}
-			return false;
-		}
-	}
+        if($fp = fsockopen(
+                    $host,
+                    $port,
+                    $errno,
+                    $errstr,
+                    $this->_fp_timeout
+                    ))
+        {
+            // socket connection succeeded
+
+            return true;
+        }
+        else
+        {
+            // socket connection failed
+            $this->status = $errno;
+            switch($errno)
+            {
+                case -3:
+                    $this->error="socket creation failed (-3)";
+                case -4:
+                    $this->error="dns lookup failure (-4)";
+                case -5:
+                    $this->error="connection refused or timed out (-5)";
+                default:
+                    $this->error="connection failed (".$errno.")";
+            }
+            return false;
+        }
+    }
 /*======================================================================*\
 	Function:	_disconnect
 	Purpose:	disconnect a socket connection
 	Input:		$fp	file pointer
 \*======================================================================*/
 	
-	private function _disconnect($fp)
-	{
-		return(fclose($fp));
-	}
+    private function _disconnect($fp)
+    {
+        return(fclose($fp));
+    }
 
 	
 /*======================================================================*\
@@ -832,65 +832,65 @@ 
 	Output:		post body
 \*======================================================================*/
 	
-	private function _prepare_post_body($formvars, $formfiles)
-	{
-		settype($formvars, "array");
-		settype($formfiles, "array");
+    private function _prepare_post_body($formvars, $formfiles)
+    {
+        settype($formvars, "array");
+        settype($formfiles, "array");
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+        if (count($formvars) == 0 && count($formfiles) == 0)
+            return;
 		
-		switch ($this->_submit_type) {
-			case "application/x-www-form-urlencoded":
-				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
-					if (is_array($val) || is_object($val)) {
-						while (list($cur_key, $cur_val) = each($val)) {
-							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
-						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
-				}
-				break;
-
-			case "multipart/form-data":
-				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
+        switch ($this->_submit_type) {
+            case "application/x-www-form-urlencoded":
+                reset($formvars);
+                while(list($key,$val) = each($formvars)) {
+                    if (is_array($val) || is_object($val)) {
+                        while (list($cur_key, $cur_val) = each($val)) {
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
+                        }
+                    } else
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
+                }
+                break;
+
+            case "multipart/form-data":
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 				
-				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
-					if (is_array($val) || is_object($val)) {
-						while (list($cur_key, $cur_val) = each($val)) {
-							$postdata .= "--".$this->_mime_boundary."\r\n";
-							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
-							$postdata .= "$cur_val\r\n";
-						}
-					} else {
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
-						$postdata .= "$val\r\n";
-					}
-				}
+                reset($formvars);
+                while(list($key,$val) = each($formvars)) {
+                    if (is_array($val) || is_object($val)) {
+                        while (list($cur_key, $cur_val) = each($val)) {
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
+                            $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
+                            $postdata .= "$cur_val\r\n";
+                        }
+                    } else {
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
+                        $postdata .= "$val\r\n";
+                    }
+                }
 				
-				reset($formfiles);
-				while (list($field_name, $file_names) = each($formfiles)) {
-					settype($file_names, "array");
-					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
-
-						$fp = fopen($file_name, "r");
-						$file_content = fread($fp, filesize($file_name));
-						fclose($fp);
-						$base_name = basename($file_name);
-
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
-						$postdata .= "$file_content\r\n";
-					}
-				}
-				$postdata .= "--".$this->_mime_boundary."--\r\n";
-				break;
-		}
-
-		return $postdata;
-	}
+                reset($formfiles);
+                while (list($field_name, $file_names) = each($formfiles)) {
+                    settype($file_names, "array");
+                    while (list(, $file_name) = each($file_names)) {
+                        if (!is_readable($file_name)) continue;
+
+                        $fp = fopen($file_name, "r");
+                        $file_content = fread($fp, filesize($file_name));
+                        fclose($fp);
+                        $base_name = basename($file_name);
+
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
+                        $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
+                        $postdata .= "$file_content\r\n";
+                    }
+                }
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
+                break;
+        }
+
+        return $postdata;
+    }
 }
\ No newline at end of file

main/inc/lib/banner.lib.php

Indentation +20 added lines, -20 removed lines

@@ -42,20 +42,20 @@ 
     $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
     $navigation['myprofile']['title'] = get_lang('ModifyProfile');
     $navigation['myprofile']['key'] = 'profile';
-	// Link to my agenda
+    // Link to my agenda
     $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal';
     $navigation['myagenda']['title'] = get_lang('MyAgenda');
     $navigation['myagenda']['key'] = 'agenda';
 
-	// Gradebook
-	if (api_get_setting('gradebook_enable') == 'true') {
+    // Gradebook
+    if (api_get_setting('gradebook_enable') == 'true') {
         $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' );
         $navigation['mygradebook']['title'] = get_lang('MyGradebook');
         $navigation['mygradebook']['key'] = 'gradebook';
-	}
+    }
 
-	// Reporting
-	if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
+    // Reporting
+    if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) {
         // Link to my space
         $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':'');
         $navigation['session_my_space']['title'] = get_lang('MySpace');
@@ -79,21 +79,21 @@ 
         $navigation['session_my_progress']['key'] = 'my-progress';
     }
 
-	// Social
-	if (api_get_setting('allow_social_tool')=='true') {
+    // Social
+    if (api_get_setting('allow_social_tool')=='true') {
         $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php';
         $navigation['social']['title'] = get_lang('SocialNetwork');
         $navigation['social']['key'] = 'social-network';
-	}
+    }
 
-	// Dashboard
-	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
+    // Dashboard
+    if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php';
         $navigation['dashboard']['title'] = get_lang('Dashboard');
         $navigation['dashboard']['key'] = 'dashboard';
-	}
+    }
 
-	// Reports
+    // Reports
     /*
 	if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) {
         $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php';
@@ -116,14 +116,14 @@ 
     }
     // End Custom Tabs
 
-	// Platform administration
-	if (api_is_platform_admin(true)) {
+    // Platform administration
+    if (api_is_platform_admin(true)) {
         $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/';
         $navigation['platform_admin']['title'] = get_lang('PlatformAdmin');
         $navigation['platform_admin']['key'] = 'admin';
-	}
+    }
 
-	return $navigation;
+    return $navigation;
 }
 
 /**
@@ -351,7 +351,7 @@ 
             }
         }
 
-		// Reports
+        // Reports
         if (!empty($possible_tabs['reports'])) {
             if (api_get_setting('show_tabs', 'reports') == 'true') {
                 if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) {
@@ -492,7 +492,7 @@ 
 
     $menu = null;
     if (!empty($lis)) {
-         $menu .= $lis;
+            $menu .= $lis;
     }
     return $menu;
 }
@@ -548,7 +548,7 @@ 
         $navigation_item_my_courses['title'] = get_lang('MyCourses');
         $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php';
         $navigation[] = $navigation_item_my_courses;
-        */
+         */
         $navigation[] = $navigation_item;
     }
 

main/inc/lib/image.lib.php

Indentation +120 added lines, -120 removed lines

@@ -47,7 +47,7 @@ 
             if ($height >= $max_size_for_picture) {
                 // scale width
                 $new_width = round($width * ($max_size_for_picture / $height));
-                 $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
+                    $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
             }
         }
     }
@@ -149,7 +149,7 @@ 
 
     public function __construct($path)
     {
-          parent::__construct($path);
+            parent::__construct($path);
     }
 
     public function set_image_wrapper()
@@ -184,19 +184,19 @@ 
         }
     }
 
-	public function get_image_size()
+    public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
-	    if ($this->image_validated) {
+        $imagesize = array('width'=>0,'height'=>0);
+        if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
-	    }
-	    return $imagesize;
-	}
+        }
+        return $imagesize;
+    }
 
-	//@todo implement border logic case for Imagick
-	public function resize($thumbw, $thumbh, $border, $specific_size = false)
+    //@todo implement border logic case for Imagick
+    public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
 
         if ($specific_size) {
             $width = $thumbw;
@@ -206,10 +206,10 @@ 
             $width  = (int)($this->width * $scale);
             $height = (int)($this->height * $scale);
         }
-		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
-		$this->width  = $thumbw;
-		$this->height = $thumbh;
-	}
+        $result = $this->image->resizeImage($width, $height, $this->filter, 1);
+        $this->width  = $thumbw;
+        $this->height = $thumbh;
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -224,8 +224,8 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->image->cropimage($width, $height, $x, $y);
-		$this->width  = $width;
-		$this->height = $height;
+        $this->width  = $width;
+        $this->height = $height;
     }
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
@@ -235,35 +235,35 @@ 
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				break;
-		}
-		$result = false;
-		try {
-		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                break;
+        }
+        $result = false;
+        try {
+            $result = $this->image->writeImage($file);
+        } catch(ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
-		if (!$file) {
-		    echo $this->image;
-		    $this->image->clear();
+        if (!$file) {
+            echo $this->image;
+            $this->image->clear();
             $this->image->destroy();
-		} else {
-		    $this->image->clear();
+        } else {
+            $this->image->clear();
             $this->image->destroy();
-		    return $result;
-		}
-	}
+            return $result;
+        }
+    }
 
 }
 
@@ -285,21 +285,21 @@ 
         $this->fill_image_info();
 
         switch ($this->type) {
-        	case 0:
-        		$handler = false;
-        		break;
-		    case 1 :
+            case 0:
+                $handler = false;
+                break;
+            case 1 :
                 $handler = @imagecreatefromgif($this->path);
                 $this->type = 'gif';
                 break;
-		    case 2 :
+            case 2 :
                 $handler = @imagecreatefromjpeg($this->path);
                 $this->type = 'jpg';
                 break;
-		    case 3 :
-		        $handler = @imagecreatefrompng($this->path);
-		        $this->type = 'png';
-		        break;
+            case 3 :
+                $handler = @imagecreatefrompng($this->path);
+                $this->type = 'png';
+                break;
         }
         if ($handler) {
             $this->image_validated = true;
@@ -313,29 +313,29 @@ 
     {
         $return_array = array('width'=>0,'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+            $return_array = array('width'=>$this->width,'height'=>$this->height);
         }
         return $return_array;
-	}
+    }
 
     public function fill_image_info()
     {
-    	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
-			$this->width    = $image_info[0];
-			$this->height   = $image_info[1];
-			$this->type     = $image_info[2];
-    	} else {
-    		$this->width    = 0;
-    		$this->height   = 0;
-    		$this->type     = 0;
-    	}
+        if (file_exists($this->path)) {
+            $image_info     = getimagesize($this->path);
+            $this->width    = $image_info[0];
+            $this->height   = $image_info[1];
+            $this->type     = $image_info[2];
+        } else {
+            $this->width    = 0;
+            $this->height   = 0;
+            $this->type     = 0;
+        }
     }
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;
-		if ($border == 1) {
+        if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -344,17 +344,17 @@ 
                 $width = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
-			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			if (!empty($this->color)) {
-				@imagefill($dst_img, 0, 0, $this->color);
-			}
-			$this->width = $thumbw;
-			$this->height = $thumbh;
-		} elseif ($border == 0) {
+            $deltaw = (int)(($thumbw - $width) / 2);
+            $deltah = (int)(($thumbh - $height) / 2);
+            $dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            if (!empty($this->color)) {
+                @imagefill($dst_img, 0, 0, $this->color);
+            }
+            $this->width = $thumbw;
+            $this->height = $thumbh;
+        } elseif ($border == 0) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -363,19 +363,19 @@ 
                 $width  = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = 0;
-			$deltah = 0;
-			$dst_img = @ImageCreateTrueColor($width, $height);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			$this->width = $width;
-			$this->height = $height;
-		}
-		$src_img = $this->bg;
-		@ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
-		$this->bg = $dst_img;
-		@imagedestroy($src_img);
-	}
+            $deltaw = 0;
+            $deltah = 0;
+            $dst_img = @ImageCreateTrueColor($width, $height);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            $this->width = $width;
+            $this->height = $height;
+        }
+        $src_img = $this->bg;
+        @ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
+        $this->bg = $dst_img;
+        @imagedestroy($src_img);
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -389,7 +389,7 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->width = $width;
-		$this->height = $height;
+        $this->height = $height;
         $src = null;
         $dest = @imagecreatetruecolor($width, $height);
         $type = $this->type;
@@ -400,56 +400,56 @@ 
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagejpeg($dest, $this->path);
                 break;
-		    case 'png' :
+            case 'png' :
                 $src = @imagecreatefrompng($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagepng($dest, $this->path);
                 break;
-		    case 'gif' :
-		        $src = @imagecreatefromgif($this->path);
+            case 'gif' :
+                $src = @imagecreatefromgif($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagegif($dest, $this->path);
-		        break;
+                break;
             default: return 0;
         }
         @imagedestroy($dest);
         @imagedestroy($src);
     }
 
-	public function send_image($file = '', $compress = -1, $convert_file_to = null)
+    public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
-				return imagejpeg($this->bg, $file, $compress);
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagepng($this->bg, $file, $compress);
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagegif($this->bg, $file, $compress);
-				break;
-			default: return 0;
-		}
-		// TODO: Occupied memory is not released, because the following fragment of code is actually dead.
-		@imagedestroy($this->bg);
-	}
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                if ($compress == -1) $compress = 100;
+                return imagejpeg($this->bg, $file, $compress);
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagepng($this->bg, $file, $compress);
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagegif($this->bg, $file, $compress);
+                break;
+            default: return 0;
+        }
+        // TODO: Occupied memory is not released, because the following fragment of code is actually dead.
+        @imagedestroy($this->bg);
+    }
 
     /**
      * Convert image to black & white

main/inc/lib/timeline.lib.php

Indentation +23 added lines, -23 removed lines

@@ -25,10 +25,10 @@ 
     );
     public $is_course_model = true;
 
-	public function __construct()
+    public function __construct()
     {
         $this->table =  Database::get_course_table(TABLE_TIMELINE);
-	}
+    }
 
     /**
      * Get the count of elements
@@ -52,16 +52,16 @@ 
     /**
      * Displays the title + grid
      */
-	public function listing()
+    public function listing()
     {
-		// action links
-		$html = '<div class="actions">';
+        // action links
+        $html = '<div class="actions">';
         //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';
-		$html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
-		$html .= '</div>';
+        $html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>';
+        $html .= '</div>';
         $html .= Display::grid_html('timelines');
         return $html;
-	}
+    }
 
     public function get_status_list()
     {
@@ -89,7 +89,7 @@ 
 
         $form->addElement('text', 'headline', get_lang('Name'), array('size' => '70'));
         //$form->addHtmlEditor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'Careers','Width' => '100%', 'Height' => '250'));
-	    $status_list = $this->get_status_list();
+        $status_list = $this->get_status_list();
         $form->addElement('select', 'status', get_lang('Status'), $status_list);
         if ($action == 'edit') {
             //$form->addElement('text', 'created_at', get_lang('CreatedAt'));
@@ -173,7 +173,7 @@ 
 
         // Setting the rules
         $form->addRule('headline', get_lang('ThisFieldIsRequired'), 'required');
-		return $form;
+        return $form;
 
     }
 
@@ -184,11 +184,11 @@ 
     public function save_item($params)
     {
         $params['c_id'] = api_get_course_int_id();
-	    $id = parent::save($params);
-	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		}
-   		return $id;
+        $id = parent::save($params);
+        if (!empty($id)) {
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+            }
+            return $id;
     }
 
     /**
@@ -199,16 +199,16 @@ 
         $params['c_id'] = api_get_course_int_id();
         $params['parent_id'] = '0';
         $params['type'] = 'default';
-	    $id = parent::save($params);
-	    if (!empty($id)) {
-	    	//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
-   		}
-   		return $id;
+        $id = parent::save($params);
+        if (!empty($id)) {
+            //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+            }
+            return $id;
     }
 
     public function delete($id) {
-	    parent::delete($id);
-	    //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
+        parent::delete($id);
+        //event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
     }
 
     public function get_url($id) {
@@ -247,7 +247,7 @@ 
         $item['asset'] = array( 'media'     => $item['media'],
                                 'credit'    => $item['media_credit'],
                                 'caption'   => $item['media_caption'],
-         );
+            );
 
         //Cleaning items
         unset($item['id']);

main/inc/lib/urlmanager.lib.php

Indentation +66 added lines, -66 removed lines

@@ -11,15 +11,15 @@ 
 class UrlManager
 {
     /**
-    * Creates a new url access
-    *
-    * @author Julio Montoya <gugli100@gmail.com>,
-    *
-    * @param	string	$url The URL of the site
-    * @param	string  $description The description of the site
-    * @param	int		$active is active or not
-    * @return boolean if success
-    */
+     * Creates a new url access
+     *
+     * @author Julio Montoya <gugli100@gmail.com>,
+     *
+     * @param	string	$url The URL of the site
+     * @param	string  $description The description of the site
+     * @param	int		$active is active or not
+     * @return boolean if success
+     */
     public static function add($url, $description, $active)
     {
         $tms = time();
@@ -36,15 +36,15 @@ 
     }
 
     /**
-    * Updates an URL access
-    * @author Julio Montoya <gugli100@gmail.com>,
-    *
-    * @param	int 	$url_id The url id
-    * @param	string 	$url
-    * @param	string  $description The description of the site
-    * @param	int		$active is active or not
-    * @return 	boolean if success
-    */
+     * Updates an URL access
+     * @author Julio Montoya <gugli100@gmail.com>,
+     *
+     * @param	int 	$url_id The url id
+     * @param	string 	$url
+     * @param	string  $description The description of the site
+     * @param	int		$active is active or not
+     * @return 	boolean if success
+     */
     public static function update($url_id, $url, $description, $active)
     {
         $url_id = intval($url_id);
@@ -63,12 +63,12 @@ 
     }
 
     /**
-    * Deletes an url
-    * @author Julio Montoya
-    * @param int $id url id
+     * Deletes an url
+     * @author Julio Montoya
+     * @param int $id url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete($id)
     {
         $id = intval($id);
@@ -200,12 +200,12 @@ 
     }
 
     /**
-    * Gets the inner join of access_url and the course table
-    *
-    * @author Julio Montoya
-    * @param int  access url id
-    * @return array   Database::store_result of the result
-    **/
+     * Gets the inner join of access_url and the course table
+     *
+     * @author Julio Montoya
+     * @param int  access url id
+     * @return array   Database::store_result of the result
+     **/
     public static function get_url_rel_course_data($access_url_id = null)
     {
         $where = '';
@@ -362,12 +362,12 @@ 
     }
 
     /**
-    * Checks the relationship between an URL and a User (return the num_rows)
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a User (return the num_rows)
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
+     * @return boolean true if success
+     * */
     public static function relation_url_user_exist($user_id, $url_id)
     {
         $table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -377,15 +377,15 @@ 
         $num = Database::num_rows($result);
 
         return $num;
-	}
+    }
 
     /**
-    * Checks the relationship between an URL and a Course (return the num_rows)
-    * @author Julio Montoya
-    * @param int $courseId
-    * @param int $urlId
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a Course (return the num_rows)
+     * @author Julio Montoya
+     * @param int $courseId
+     * @param int $urlId
+     * @return boolean true if success
+     * */
     public static function relation_url_course_exist($courseId, $urlId)
     {
         $table_url_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -420,12 +420,12 @@ 
     }
 
     /**
-    * Checks the relationship between an URL and a Session (return the num_rows)
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
-    * @return boolean true if success
-    * */
+     * Checks the relationship between an URL and a Session (return the num_rows)
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
+     * @return boolean true if success
+     * */
     public static function relation_url_session_exist($session_id, $url_id)
     {
         $table_url_rel_session= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
@@ -737,13 +737,13 @@ 
     }
 
     /**
-    * Deletes an url and user relationship
-    * @author Julio Montoya
-    * @param int user id
-    * @param int url id
+     * Deletes an url and user relationship
+     * @author Julio Montoya
+     * @param int user id
+     * @param int url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_user($user_id, $url_id)
     {
         $table_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -758,13 +758,13 @@ 
     }
 
     /**
-    * Deletes an url and course relationship
-    * @author Julio Montoya
-    * @param  int  $courseId
-    * @param  int  $urlId
+     * Deletes an url and course relationship
+     * @author Julio Montoya
+     * @param  int  $courseId
+     * @param  int  $urlId
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_course($courseId, $urlId)
     {
         $table_url_rel_course= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
@@ -814,13 +814,13 @@ 
     }
 
     /**
-    * Deletes an url and session relationship
-    * @author Julio Montoya
-    * @param  char  course code
-    * @param  int url id
+     * Deletes an url and session relationship
+     * @author Julio Montoya
+     * @param  char  course code
+     * @param  int url id
      *
-    * @return boolean true if success
-    * */
+     * @return boolean true if success
+     * */
     public static function delete_url_rel_session($session_id, $url_id)
     {
         $table_url_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);

main/inc/lib/kses-0.2.2/kses_original.php

Indentation +166 added lines, -166 removed lines

@@ -31,8 +31,8 @@ 
 
 
 function kses($string, $allowed_html, $allowed_protocols =
-               array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
-                     'gopher', 'mailto'))
+                array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
+                        'gopher', 'mailto'))
 ###############################################################################
 # This function makes sure that only the allowed HTML element names, attribute
 # names and attribute values plus only sane HTML entities will occur in
@@ -40,12 +40,12 @@ 
 # call this function.
 ###############################################################################
 {
-  $string = kses_no_null($string);
-  $string = kses_js_entities($string);
-  $string = kses_normalize_entities($string);
-  $string = kses_hook($string);
-  $allowed_html_fixed = kses_array_lc($allowed_html);
-  return kses_split($string, $allowed_html_fixed, $allowed_protocols);
+    $string = kses_no_null($string);
+    $string = kses_js_entities($string);
+    $string = kses_normalize_entities($string);
+    $string = kses_hook($string);
+    $allowed_html_fixed = kses_array_lc($allowed_html);
+    return kses_split($string, $allowed_html_fixed, $allowed_protocols);
 } # function kses
 
 
@@ -54,7 +54,7 @@ 
 # You add any kses hooks here.
 ###############################################################################
 {
-  return $string;
+    return $string;
 } # function kses_hook
 
 
@@ -63,7 +63,7 @@ 
 # This function returns kses' version number.
 ###############################################################################
 {
-  return '0.2.2';
+    return '0.2.2';
 } # function kses_version
 
 
@@ -73,13 +73,13 @@ 
 # matches stray ">" characters.
 ###############################################################################
 {
-  return preg_replace('%(<'.   # EITHER: <
-                      '[^>]*'. # things that aren't >
-                      '(>|$)'. # > or end of string
-                      '|>)%e', # OR: just a >
-                      "kses_split2('\\1', \$allowed_html, ".
-                      '$allowed_protocols)',
-                      $string);
+    return preg_replace('%(<'.   # EITHER: <
+                        '[^>]*'. # things that aren't >
+                        '(>|$)'. # > or end of string
+                        '|>)%e', # OR: just a >
+                        "kses_split2('\\1', \$allowed_html, ".
+                        '$allowed_protocols)',
+                        $string);
 } # function kses_split
 
 
@@ -91,30 +91,30 @@ 
 # attribute list.
 ###############################################################################
 {
-  $string = kses_stripslashes($string);
+    $string = kses_stripslashes($string);
 
-  if (substr($string, 0, 1) != '<')
+    if (substr($string, 0, 1) != '<')
     return '&gt;';
     # It matched a ">" character
 
-  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
     return '';
     # It's seriously malformed
 
-  $slash = trim($matches[1]);
-  $elem = $matches[2];
-  $attrlist = $matches[3];
+    $slash = trim($matches[1]);
+    $elem = $matches[2];
+    $attrlist = $matches[3];
 
-  if (!@isset($allowed_html[strtolower($elem)]))
+    if (!@isset($allowed_html[strtolower($elem)]))
     return '';
     # They are using a not allowed HTML element
 
-  if ($slash != '')
+    if ($slash != '')
     return "<$slash$elem>";
-  # No attributes are allowed for closing elements
+    # No attributes are allowed for closing elements
 
-  return kses_attr("$slash$elem", $attrlist, $allowed_html,
-                   $allowed_protocols);
+    return kses_attr("$slash$elem", $attrlist, $allowed_html,
+                    $allowed_protocols);
 } # function kses_split2
 
 
@@ -130,56 +130,56 @@ 
 {
 # Is there a closing XHTML slash at the end of the attributes?
 
-  $xhtml_slash = '';
-  if (preg_match('%\s/\s*$%', $attr))
+    $xhtml_slash = '';
+    if (preg_match('%\s/\s*$%', $attr))
     $xhtml_slash = ' /';
 
 # Are any attributes allowed at all for this element?
 
-  if (@count($allowed_html[strtolower($element)]) == 0)
+    if (@count($allowed_html[strtolower($element)]) == 0)
     return "<$element$xhtml_slash>";
 
 # Split it
 
-  $attrarr = kses_hair($attr, $allowed_protocols);
+    $attrarr = kses_hair($attr, $allowed_protocols);
 
 # Go through $attrarr, and save the allowed attributes for this element
 # in $attr2
 
-  $attr2 = '';
+    $attr2 = '';
 
-  foreach ($attrarr as $arreach)
-  {
+    foreach ($attrarr as $arreach)
+    {
     if (!@isset($allowed_html[strtolower($element)]
                             [strtolower($arreach['name'])]))
-      continue; # the attribute is not allowed
+        continue; # the attribute is not allowed
 
     $current = $allowed_html[strtolower($element)]
                             [strtolower($arreach['name'])];
 
     if (!is_array($current))
-      $attr2 .= ' '.$arreach['whole'];
+        $attr2 .= ' '.$arreach['whole'];
     # there are no checks
 
     else
     {
     # there are some checks
-      $ok = true;
-      foreach ($current as $currkey => $currval)
+        $ok = true;
+        foreach ($current as $currkey => $currval)
         if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
-                                 $currkey, $currval))
+                                    $currkey, $currval))
         { $ok = false; break; }
 
-      if ($ok)
+        if ($ok)
         $attr2 .= ' '.$arreach['whole']; # it passed them
     } # if !is_array($current)
-  } # foreach
+    } # foreach
 
 # Remove any "<" or ">" characters
 
-  $attr2 = preg_replace('/[<>]/', '', $attr2);
+    $attr2 = preg_replace('/[<>]/', '', $attr2);
 
-  return "<$element$attr2$xhtml_slash>";
+    return "<$element$attr2$xhtml_slash>";
 } # function kses_attr
 
 
@@ -193,96 +193,96 @@ 
 # from attribute values.
 ###############################################################################
 {
-  $attrarr = array();
-  $mode = 0;
-  $attrname = '';
+    $attrarr = array();
+    $mode = 0;
+    $attrname = '';
 
 # Loop through the whole attribute list
 
-  while (strlen($attr) != 0)
-  {
+    while (strlen($attr) != 0)
+    {
     $working = 0; # Was the last operation successful?
 
     switch ($mode)
     {
-      case 0: # attribute name, href for instance
+        case 0: # attribute name, href for instance
 
         if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
         {
-          $attrname = $match[1];
-          $working = $mode = 1;
-          $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
+            $attrname = $match[1];
+            $working = $mode = 1;
+            $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
         }
 
         break;
 
-      case 1: # equals sign or valueless ("selected")
+        case 1: # equals sign or valueless ("selected")
 
         if (preg_match('/^\s*=\s*/', $attr)) # equals sign
         {
-          $working = 1; $mode = 2;
-          $attr = preg_replace('/^\s*=\s*/', '', $attr);
-          break;
+            $working = 1; $mode = 2;
+            $attr = preg_replace('/^\s*=\s*/', '', $attr);
+            break;
         }
 
         if (preg_match('/^\s+/', $attr)) # valueless
         {
-          $working = 1; $mode = 0;
-          $attrarr[] = array
+            $working = 1; $mode = 0;
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => '',
-                         'whole' => $attrname,
-                         'vless' => 'y');
-          $attr = preg_replace('/^\s+/', '', $attr);
+                            'value' => '',
+                            'whole' => $attrname,
+                            'vless' => 'y');
+            $attr = preg_replace('/^\s+/', '', $attr);
         }
 
         break;
 
-      case 2: # attribute value, a URL after href= for instance
+        case 2: # attribute value, a URL after href= for instance
 
         if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
-         # "value"
+            # "value"
         {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+            $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname=\"$thisval\"",
-                         'vless' => 'n');
-          $working = 1; $mode = 0;
-          $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
-          break;
+                            'value' => $thisval,
+                            'whole' => "$attrname=\"$thisval\"",
+                            'vless' => 'n');
+            $working = 1; $mode = 0;
+            $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+            break;
         }
 
         if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
-         # 'value'
+            # 'value'
         {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+            $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname='$thisval'",
-                         'vless' => 'n');
-          $working = 1; $mode = 0;
-          $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
-          break;
+                            'value' => $thisval,
+                            'whole' => "$attrname='$thisval'",
+                            'vless' => 'n');
+            $working = 1; $mode = 0;
+            $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+            break;
         }
 
         if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
-         # value
+            # value
         {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+            $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname=\"$thisval\"",
-                         'vless' => 'n');
-                         # We add quotes to conform to W3C's HTML spec.
-          $working = 1; $mode = 0;
-          $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+                            'value' => $thisval,
+                            'whole' => "$attrname=\"$thisval\"",
+                            'vless' => 'n');
+                            # We add quotes to conform to W3C's HTML spec.
+            $working = 1; $mode = 0;
+            $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
         }
 
         break;
@@ -290,21 +290,21 @@ 
 
     if ($working == 0) # not well formed, remove and try again
     {
-      $attr = kses_html_error($attr);
-      $mode = 0;
+        $attr = kses_html_error($attr);
+        $mode = 0;
     }
-  } # while
+    } # while
 
-  if ($mode == 1)
-  # special case, for when the attribute list ends with a valueless
-  # attribute like "selected"
+    if ($mode == 1)
+    # special case, for when the attribute list ends with a valueless
+    # attribute like "selected"
     $attrarr[] = array
-                  ('name'  => $attrname,
-                   'value' => '',
-                   'whole' => $attrname,
-                   'vless' => 'y');
+                    ('name'  => $attrname,
+                    'value' => '',
+                    'whole' => $attrname,
+                    'vless' => 'y');
 
-  return $attrarr;
+    return $attrarr;
 } # function kses_hair
 
 
@@ -315,10 +315,10 @@ 
 # with even more checks to come soon.
 ###############################################################################
 {
-  $ok = true;
+    $ok = true;
 
-  switch (strtolower($checkname))
-  {
+    switch (strtolower($checkname))
+    {
     case 'maxlen':
     # The maxlen check makes sure that the attribute value has a length not
     # greater than the given value. This can be used to avoid Buffer Overflows
@@ -326,7 +326,7 @@ 
 
       if (strlen($value) > $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'minlen':
     # The minlen check makes sure that the attribute value has a length not
@@ -334,7 +334,7 @@ 
 
       if (strlen($value) < $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'maxval':
     # The maxval check does two things: it checks that the attribute value is
@@ -345,9 +345,9 @@ 
 
       if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
         $ok = false;
-      if ($value > $checkvalue)
+        if ($value > $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'minval':
     # The minval check checks that the attribute value is a positive integer,
@@ -355,9 +355,9 @@ 
 
       if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
         $ok = false;
-      if ($value < $checkvalue)
+        if ($value < $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'valueless':
     # The valueless check checks if the attribute has a value
@@ -367,10 +367,10 @@ 
 
       if (strtolower($checkvalue) != $vless)
         $ok = false;
-      break;
-  } # switch
+        break;
+    } # switch
 
-  return $ok;
+    return $ok;
 } # function kses_check_attr_val
 
 
@@ -382,17 +382,17 @@ 
 # fooled by a string like "javascript:javascript:alert(57)".
 ###############################################################################
 {
-  $string = kses_no_null($string);
-  $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-  $string2 = $string.'a';
+    $string = kses_no_null($string);
+    $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+    $string2 = $string.'a';
 
-  while ($string != $string2)
-  {
+    while ($string != $string2)
+    {
     $string2 = $string;
     $string = kses_bad_protocol_once($string, $allowed_protocols);
-  } # while
+    } # while
 
-  return $string;
+    return $string;
 } # function kses_bad_protocol
 
 
@@ -401,10 +401,10 @@ 
 # This function removes any NULL characters in $string.
 ###############################################################################
 {
-  $string = preg_replace('/\0+/', '', $string);
-  $string = preg_replace('/(\\\\0)+/', '', $string);
+    $string = preg_replace('/\0+/', '', $string);
+    $string = preg_replace('/(\\\\0)+/', '', $string);
 
-  return $string;
+    return $string;
 } # function kses_no_null
 
 
@@ -415,7 +415,7 @@ 
 # preg_replace(//e) seems to require this.
 ###############################################################################
 {
-  return preg_replace('%\\\\"%', '"', $string);
+    return preg_replace('%\\\\"%', '"', $string);
 } # function kses_stripslashes
 
 
@@ -424,21 +424,21 @@ 
 # This function goes through an array, and changes the keys to all lower case.
 ###############################################################################
 {
-  $outarray = array();
+    $outarray = array();
 
-  foreach ($inarray as $inkey => $inval)
-  {
+    foreach ($inarray as $inkey => $inval)
+    {
     $outkey = strtolower($inkey);
     $outarray[$outkey] = array();
 
     foreach ($inval as $inkey2 => $inval2)
     {
-      $outkey2 = strtolower($inkey2);
-      $outarray[$outkey][$outkey2] = $inval2;
+        $outkey2 = strtolower($inkey2);
+        $outarray[$outkey][$outkey2] = $inval2;
     } # foreach $inval
-  } # foreach $inarray
+    } # foreach $inarray
 
-  return $outarray;
+    return $outarray;
 } # function kses_array_lc
 
 
@@ -448,7 +448,7 @@ 
 # Netscape 4.
 ###############################################################################
 {
-  return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
+    return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
 } # function kses_js_entities
 
 
@@ -459,7 +459,7 @@ 
 # quotes and apostrophes as well.
 ###############################################################################
 {
-  return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
+    return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
 } # function kses_html_error
 
 
@@ -469,12 +469,12 @@ 
 # handling whitespace and HTML entities.
 ###############################################################################
 {
-	$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-	if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
-	{
-		$string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
-	}
-	return $string;
+    $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
+    if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+    {
+        $string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+    }
+    return $string;
 } # function kses_bad_protocol_once
 
 
@@ -484,24 +484,24 @@ 
 # list or not, and returns different data depending on the answer.
 ###############################################################################
 {
-  $string2 = kses_decode_entities($string);
-  $string2 = preg_replace('/\s/', '', $string2);
-  $string2 = kses_no_null($string2);
-  $string2 = preg_replace('/\xad+/', '', $string2);
-   # deals with Opera "feature"
-  $string2 = strtolower($string2);
-
-  $allowed = false;
-  foreach ($allowed_protocols as $one_protocol)
+    $string2 = kses_decode_entities($string);
+    $string2 = preg_replace('/\s/', '', $string2);
+    $string2 = kses_no_null($string2);
+    $string2 = preg_replace('/\xad+/', '', $string2);
+    # deals with Opera "feature"
+    $string2 = strtolower($string2);
+
+    $allowed = false;
+    foreach ($allowed_protocols as $one_protocol)
     if (strtolower($one_protocol) == $string2)
     {
-      $allowed = true;
-      break;
+        $allowed = true;
+        break;
     }
 
-  if ($allowed)
+    if ($allowed)
     return "$string2:";
-  else
+    else
     return '';
 } # function kses_bad_protocol_once2
 
@@ -514,18 +514,18 @@ 
 {
 # Disarm all entities by converting & to &amp;
 
-  $string = str_replace('&', '&amp;', $string);
+    $string = str_replace('&', '&amp;', $string);
 
 # Change back the allowed entities in our entity whitelist
 
-  $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
-                         '&\\1;', $string);
-  $string = preg_replace('/&amp;#0*([0-9]{1,5});/e',
-                         'kses_normalize_entities2("\\1")', $string);
-  $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
-                         '&#\\1\\2;', $string);
+    $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
+                            '&\\1;', $string);
+    $string = preg_replace('/&amp;#0*([0-9]{1,5});/e',
+                            'kses_normalize_entities2("\\1")', $string);
+    $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
+                            '&#\\1\\2;', $string);
 
-  return $string;
+    return $string;
 } # function kses_normalize_entities
 
 
@@ -535,7 +535,7 @@ 
 # and nothing more for &#number; entities.
 ###############################################################################
 {
-  return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
+    return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
 } # function kses_normalize_entities2
 
 
@@ -546,11 +546,11 @@ 
 # URL protocol whitelisting system anyway.
 ###############################################################################
 {
-  $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-  $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))',
-                         $string);
+    $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
+    $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))',
+                            $string);
 
-  return $string;
+    return $string;
 } # function kses_decode_entities
 
 ?>

main/inc/lib/kses-0.2.2/kses.php

Indentation +6 added lines, -6 removed lines

@@ -97,8 +97,8 @@ 
  * @return string
  */
 function kses($string, $allowed_html, $allowed_protocols =
-               array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
-                     'gopher', 'mailto'))
+                array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
+                        'gopher', 'mailto'))
 {
     $string = kses_no_null($string);
     $string = kses_js_entities($string);
@@ -218,7 +218,7 @@ 
     // No attributes are allowed for closing elements
 
     return kses_attr("$slash$elem", $attrlist, $allowed_html,
-                   $allowed_protocols);
+                    $allowed_protocols);
 }
 
 /**
@@ -261,11 +261,11 @@ 
     foreach ($attrarr as $arreach)
     {
         if (!@isset($allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])]))
+                                [strtolower($arreach['name'])]))
             continue; // the attribute is not allowed
 
         $current = $allowed_html[strtolower($element)]
-                              [strtolower($arreach['name'])];
+                                [strtolower($arreach['name'])];
         if ($current == '')
             continue; // the attribute is not allowed
 
@@ -279,7 +279,7 @@ 
             $ok = true;
             foreach ($current as $currkey => $currval)
                 if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
-                                 $currkey, $currval))
+                                    $currkey, $currval))
                 { $ok = false; break; }
 
             if ( strtolower($arreach['name']) == 'style' ) {

main/inc/lib/kses-0.2.2/oop/php5.class.kses.php

Indentation +1140 added lines, -1140 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-	/*
+    /*
 	 * ==========================================================================================
 	 *
 	 * This program is free software and open source software; you can redistribute
@@ -21,1146 +21,1146 @@ 
 	 * ==========================================================================================
 	 */
 
-	/**
-	*	Class file for PHP5 OOP version of kses
-	*
-	*	This is an updated version of kses to work with PHP5 that works under E_STRICT.
-	*
-	*	This version is a bit of a rewrite to match my own coding style and use some of the
-	*	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
-	*	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
-	*	minor changes that do not break compatibility will be indicated in the second or third
-	*	digits.  Anything that breaks compatibility will change the major version number.
-	*
-	*	PHP5 specific changes:
-	*	+ Private methods are now in place
-	*	+ __construct() is now used rather then the standard class name 'kses()'
-	*	+ Kses will not load in any version less that PHP5
-	*	Other modifications:
-	*	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
-	*	+ Method names have been changed to reflect status as verbs
-	*	+ One line methods have been folded into the code
-	*	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
-	*	+ Kses5 now works in E_STRICT
-	*	+ Version number is 1.0.0 to reflect serious code changes
-	*	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
-	*	+ Deprecated _hook(), Protocols()
-	*
-	*	@package    kses
-	*	@subpackage kses5
-	*/
-
-	if(substr(phpversion(), 0, 1) < 5)
-	{
-		die("Class kses requires PHP 5 or higher.");
-	}
-
-	/**
-	*	Only install KSES5 once
-	*/
-	if(!defined('KSES_CLASS_PHP5'))
-	{
-		define('KSES_CLASS_PHP5', true);
-
-	/**
-	*	Kses strips evil scripts!
-	*
-	*	This class provides the capability for removing unwanted HTML/XHTML, attributes from
-	*	tags, and protocols contained in links.  The net result is a much more powerful tool
-	*	than the PHP internal strip_tags()
-	*
-	*	This is a fork of a slick piece of procedural code called 'kses' written by Ulf Harnhammar.
-	*
-	*	The original class for PHP4 was basically a wrapper around all of the functions in
-	*	the procedural code written by Ulf, and was released 7/25/2003.
-	*
-	*	This version is a bit of a rewrite to match my own coding style and use some of the
-	*	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
-	*	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
-	*	minor changes that do not break compatibility will be indicated in the second or third
-	*	digits.  Anything that breaks compatibility will change the major version number.
-	*
-	*	PHP5 specific changes:
-	*	+ Private methods are now in place
-	*	+ __construct() is now used rather then the standard class name 'kses()'
-	*	+ Kses5 will not load in any version less that PHP5
-	*	Other modifications:
-	*	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
-	*	+ Method names have been changed to reflect status as verbs
-	*	+ One line methods have been folded into the code
-	*	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
-	*	+ Kses now works in E_STRICT
-	*	+ Initial Version number set to 1.0.0 to reflect serious code changes
-	*	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
-	*	+ Deprecated _hook(), Protocols()
-	*	+ Integrated code from kses 0.2.2 into class.
-	*	+ Added methods DumpProtocols(), DumpMethods()
-	*
-	*	@author     Richard R. V�squez, Jr. (Original procedural code by Ulf H�rnhammar)
-	*	@link       http://sourceforge.net/projects/kses/ Home Page for Kses
-	*	@link       http://chaos.org/contact/ Contact page with current email address for Richard Vasquez
-	*	@copyright  Richard R. V�squez, Jr. 2005
-	*	@version    PHP5 OOP 1.0.2
-	*	@license    http://www.gnu.org/licenses/gpl.html GNU Public License
-	*	@package    kses
-	*/
-		class kses5
-		{
-			/**#@+
+    /**
+     *	Class file for PHP5 OOP version of kses
+     *
+     *	This is an updated version of kses to work with PHP5 that works under E_STRICT.
+     *
+     *	This version is a bit of a rewrite to match my own coding style and use some of the
+     *	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
+     *	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
+     *	minor changes that do not break compatibility will be indicated in the second or third
+     *	digits.  Anything that breaks compatibility will change the major version number.
+     *
+     *	PHP5 specific changes:
+     *	+ Private methods are now in place
+     *	+ __construct() is now used rather then the standard class name 'kses()'
+     *	+ Kses will not load in any version less that PHP5
+     *	Other modifications:
+     *	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
+     *	+ Method names have been changed to reflect status as verbs
+     *	+ One line methods have been folded into the code
+     *	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
+     *	+ Kses5 now works in E_STRICT
+     *	+ Version number is 1.0.0 to reflect serious code changes
+     *	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
+     *	+ Deprecated _hook(), Protocols()
+     *
+     *	@package    kses
+     *	@subpackage kses5
+     */
+
+    if(substr(phpversion(), 0, 1) < 5)
+    {
+        die("Class kses requires PHP 5 or higher.");
+    }
+
+    /**
+     *	Only install KSES5 once
+     */
+    if(!defined('KSES_CLASS_PHP5'))
+    {
+        define('KSES_CLASS_PHP5', true);
+
+    /**
+     *	Kses strips evil scripts!
+     *
+     *	This class provides the capability for removing unwanted HTML/XHTML, attributes from
+     *	tags, and protocols contained in links.  The net result is a much more powerful tool
+     *	than the PHP internal strip_tags()
+     *
+     *	This is a fork of a slick piece of procedural code called 'kses' written by Ulf Harnhammar.
+     *
+     *	The original class for PHP4 was basically a wrapper around all of the functions in
+     *	the procedural code written by Ulf, and was released 7/25/2003.
+     *
+     *	This version is a bit of a rewrite to match my own coding style and use some of the
+     *	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
+     *	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
+     *	minor changes that do not break compatibility will be indicated in the second or third
+     *	digits.  Anything that breaks compatibility will change the major version number.
+     *
+     *	PHP5 specific changes:
+     *	+ Private methods are now in place
+     *	+ __construct() is now used rather then the standard class name 'kses()'
+     *	+ Kses5 will not load in any version less that PHP5
+     *	Other modifications:
+     *	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
+     *	+ Method names have been changed to reflect status as verbs
+     *	+ One line methods have been folded into the code
+     *	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
+     *	+ Kses now works in E_STRICT
+     *	+ Initial Version number set to 1.0.0 to reflect serious code changes
+     *	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
+     *	+ Deprecated _hook(), Protocols()
+     *	+ Integrated code from kses 0.2.2 into class.
+     *	+ Added methods DumpProtocols(), DumpMethods()
+     *
+     *	@author     Richard R. V�squez, Jr. (Original procedural code by Ulf H�rnhammar)
+     *	@link       http://sourceforge.net/projects/kses/ Home Page for Kses
+     *	@link       http://chaos.org/contact/ Contact page with current email address for Richard Vasquez
+     *	@copyright  Richard R. V�squez, Jr. 2005
+     *	@version    PHP5 OOP 1.0.2
+     *	@license    http://www.gnu.org/licenses/gpl.html GNU Public License
+     *	@package    kses
+     */
+        class kses5
+        {
+            /**#@+
 			 *	@access private
 			 *	@var array
 			 */
-			private $allowed_protocols;
-			private $allowed_html;
-			/**#@-*/
-
-			/**
-			 *	Constructor for kses.
-			 *
-			 *	This sets a default collection of protocols allowed in links, and creates an
-			 *	empty set of allowed HTML tags.
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function __construct()
-			{
-				/**
-				 *	You could add protocols such as ftp, new, gopher, mailto, irc, etc.
-				 *
-				 *	The base values the original kses provided were:
-				 *		'http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'
-				 */
-				$this->allowed_protocols = array('http', 'ftp', 'mailto');
-				$this->allowed_html      = array();
-			}
-
-			/**
-			 *	Basic task of kses - parses $string and strips it as required.
-			 *
-			 *	This method strips all the disallowed (X)HTML tags, attributes
-			 *	and protocols from the input $string.
-			 *
-			 *	@access public
-			 *	@param string $string String to be stripped of 'evil scripts'
-			 *	@return string The stripped string
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function Parse($string = "")
-			{
-				if (get_magic_quotes_gpc())
-				{
-					$string = stripslashes($string);
-				}
-				$string = $this->removeNulls($string);
-				//	Remove JavaScript entities from early Netscape 4 versions
-				$string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
-				$string = $this->normalizeEntities($string);
-				$string = $this->filterKsesTextHook($string);
-				$string = preg_replace('%(<' . '[^>]*' . '(>|$)' . '|>)%e', "\$this->stripTags('\\1')", $string);
-				return $string;
-			}
-
-			/**
-			 *	Allows for single/batch addition of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	The argument will be processed, and each string will be added
-			 *	via AddProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be added to the internal list of allowed protocols.
-			 *	@return bool Status of adding valid protocols.
-			 *	@see AddProtocol()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function AddProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses5::AddProtocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					foreach($protocol_data as $protocol)
-					{
-						$this->AddProtocol($protocol);
-					}
-					return true;
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->AddProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses5::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Allows for single/batch addition of protocols
-			 *
-			 *	@deprecated Use AddProtocols()
-			 *	@see AddProtocols()
-			 *	@return bool
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function Protocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses5::Protocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				return $this->AddProtocols(func_get_arg(0));
-			}
-
-			/**
-			 *	Adds a single protocol to $this->allowed_protocols.
-			 *
-			 *	This method accepts a string argument and adds it to
-			 *	the list of allowed protocols to keep when performing
-			 *	Parse().
-			 *
-			 *	@access public
-			 *	@param string $protocol The name of the protocol to be added.
-			 *	@return bool Status of adding valid protocol.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function AddProtocol($protocol = "")
-			{
-				if(!is_string($protocol))
-				{
-					trigger_error("kses5::AddProtocol() requires a string.", E_USER_WARNING);
-					return false;
-				}
-
-				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
-				{
-					$protocol = substr($protocol, 0, strlen($protocol) - 1);
-				}
-
-				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
-				{
-					trigger_error("kses5::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
-					return false;
-				}
-
-				//	prevent duplicate protocols from being added.
-				if(!in_array($protocol, $this->allowed_protocols))
-				{
-					array_push($this->allowed_protocols, $protocol);
-					sort($this->allowed_protocols);
-				}
-				return true;
-			}
-
-			/**
-			 *	Removes a single protocol from $this->allowed_protocols.
-			 *
-			 *	This method accepts a string argument and removes it from
-			 *	the list of allowed protocols to keep when performing
-			 *	Parse().
-			 *
-			 *	@access public
-			 *	@param string $protocol The name of the protocol to be removed.
-			 *	@return bool Status of removing valid protocol.
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function RemoveProtocol($protocol = "")
-			{
-				if(!is_string($protocol))
-				{
-					trigger_error("kses5::RemoveProtocol() requires a string.", E_USER_WARNING);
-					return false;
-				}
-
-				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
-				{
-					$protocol = substr($protocol, 0, strlen($protocol) - 1);
-				}
-
-				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
-				{
-					trigger_error("kses5::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
-					return false;
-				}
-
-				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
-				{
-					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
-					sort($this->allowed_protocols);
-				}
-
-				return true;
-			}
-
-			/**
-			 *	Allows for single/batch removal of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	The argument will be processed, and each string will be removed
-			 *	via RemoveProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
-			 *	@return bool Status of removing valid protocols.
-			 *	@see RemoveProtocol()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function RemoveProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					foreach($protocol_data as $protocol)
-					{
-						$this->RemoveProtocol($protocol);
-					}
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->RemoveProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses5::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Allows for single/batch replacement of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	Existing protocols will be removed, then the argument will be
-			 *	processed, and each string will be added via AddProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be the new internal list of allowed protocols.
-			 *	@return bool Status of replacing valid protocols.
-			 *	@since PHP5 OOP 1.0.1
-			 *	@see AddProtocol()
-			 */
-			public function SetProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses5::SetProtocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
-					{
-						$this->AddProtocol($protocol);
-					}
-					return true;
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->allowed_protocols = array();
-					$this->AddProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses5::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Raw dump of allowed protocols
-			 *
-			 *	This returns an indexed array of allowed protocols for a particular KSES
-			 *	instantiation.
-			 *
-			 *	@access public
-			 *	@return array The list of allowed protocols.
-			 *	@since PHP5 OOP 1.0.2
-			 */
-			public function DumpProtocols()
-			{
-				return $this->allowed_protocols;
-			}
-
-			/**
-			 *	Raw dump of allowed (X)HTML elements
-			 *
-			 *	This returns an indexed array of allowed (X)HTML elements and attributes
-			 *	for a particular KSES instantiation.
-			 *
-			 *	@access public
-			 *	@return array The list of allowed elements.
-			 *	@since PHP5 OOP 1.0.2
-			 */
-			public function DumpElements()
-			{
-				return $this->allowed_html;
-			}
-
-
-			/**
-			 *	Adds valid (X)HTML with corresponding attributes that will be kept when stripping 'evil scripts'.
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	@access public
-			 *	@param string $tag (X)HTML tag that will be allowed after stripping text.
-			 *	@param array $attribs Associative array of allowed attributes - key => attribute name - value => attribute parameter
-			 *	@return bool Status of Adding (X)HTML and attributes.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function AddHTML($tag = "", $attribs = array())
-			{
-				if(!is_string($tag))
-				{
-					trigger_error("kses5::AddHTML() requires the tag to be a string", E_USER_WARNING);
-					return false;
-				}
-
-				$tag = strtolower(trim($tag));
-				if($tag == "")
-				{
-					trigger_error("kses5::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
-					return false;
-				}
-
-				if(!is_array($attribs))
-				{
-					trigger_error("kses5::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
-					return false;
-				}
-
-				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
-				{
-					foreach($attribs as $idx1 => $val1)
-					{
-						$new_idx1 = strtolower($idx1);
-						$new_val1 = $attribs[$idx1];
-
-						if(is_array($new_val1) && count($attribs) > 0)
-						{
-							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
-							{
-								$new_idx2 = strtolower($idx2);
-								$tmp_val[$new_idx2] = $val2;
-							}
-							$new_val1 = $tmp_val;
-						}
-
-						$new_attribs[$new_idx1] = $new_val1;
-					}
-				}
-
-				$this->allowed_html[$tag] = $new_attribs;
-				return true;
-			}
-
-			/**
-			 *	This method removes any NULL characters in $string.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String without any NULL/chr(173)
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function removeNulls($string)
-			{
-				$string = preg_replace('/\0+/', '', $string);
-				$string = preg_replace('/(\\\\0)+/', '', $string);
-				return $string;
-			}
-
-			/**
-			 *	Normalizes HTML entities
-			 *
-			 *	This function normalizes HTML entities. It will convert "AT&T" to the correct
-			 *	"AT&amp;T", "&#00058;" to "&#58;", "&#XYZZY;" to "&amp;#XYZZY;" and so on.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String with normalized entities
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function normalizeEntities($string)
-			{
-				# Disarm all entities by converting & to &amp;
-				$string = str_replace('&', '&amp;', $string);
-
-				#	TODO: Change back (Keep?) the allowed entities in our entity white list
-
-				#	Keeps entities that start with [A-Za-z]
-				$string = preg_replace(
-					'/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
-					'&\\1;',
-					$string
-				);
-
-				#	Change numeric entities to valid 16 bit values
-
-				$string = preg_replace(
-					'/&amp;#0*([0-9]{1,5});/e',
-					'\$this->normalizeEntities16bit("\\1")',
-					$string
-				);
-
-				#	Change &XHHHHHHH (Hex digits) to 16 bit hex values
-				$string = preg_replace(
-					'/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
-					'&#\\1\\2;',
-					$string
-				);
-
-				return $string;
-			}
-
-			/**
-			 *	Helper method used by normalizeEntites()
-			 *
-			 *	This method helps normalizeEntities() to only accept 16 bit values
-			 *	and nothing more for &#number; entities.
-			 *
-			 *	This method helps normalize_entities() during a preg_replace()
-			 *	where a &#(0)*XXXXX; occurs.  The '(0)*XXXXXX' value is converted to
-			 *	a number and the result is returned as a numeric entity if the number
-			 *	is less than 65536.  Otherwise, the value is returned 'as is'.
-			 *
-			 *	@access private
-			 *	@param string $i
-			 *	@return string Normalized numeric entity
-			 *	@see normalizeEntities()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function normalizeEntities16bit($i)
-			{
-			  return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
-			}
-
-			/**
-			 *	Allows for additional user defined modifications to text.
-			 *
-			 *	This method allows for additional modifications to be performed on
-			 *	a string that's being run through Parse().  Currently, it returns the
-			 *	input string 'as is'.
-			 *
-			 *	This method is provided for users to extend the kses class for their own
-			 *	requirements.
-			 *
-			 *	@access public
-			 *	@param string $string String to perfrom additional modifications on.
-			 *	@return string User modified string.
-			 *	@see Parse()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function filterKsesTextHook($string)
-			{
-			  return $string;
-			}
-
-			/**
-			 *	Allows for additional user defined modifications to text.
-			 *
-			 *	@deprecated use filterKsesTextHook()
-			 *	@param string $string
-			 *	@return string
-			 *	@see filterKsesTextHook()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function _hook($string)
-			{
-				return $this->filterKsesTextHook($string);
-			}
-
-			/**
-			 *	This method goes through an array, and changes the keys to all lower case.
-			 *
-			 *	@access private
-			 *	@param array $in_array Associative array
-			 *	@return array Modified array
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function makeArrayKeysLowerCase($in_array)
-			{
-				$out_array = array();
-
-				if(is_array($in_array) && count($in_array) > 0)
-				{
-					foreach ($in_array as $in_key => $in_val)
-					{
-						$out_key = strtolower($in_key);
-						$out_array[$out_key] = array();
-
-						if(is_array($in_val) && count($in_val) > 0)
-						{
-							foreach ($in_val as $in_key2 => $in_val2)
-							{
-								$out_key2 = strtolower($in_key2);
-								$out_array[$out_key][$out_key2] = $in_val2;
-							}
-						}
-					}
-				}
-
-				return $out_array;
-			}
-
-			/**
-			 *	This method strips out disallowed and/or mangled (X)HTML tags along with assigned attributes.
-			 *
-			 *	This method does a lot of work. It rejects some very malformed things
-			 *	like <:::>. It returns an empty string if the element isn't allowed (look
-			 *	ma, no strip_tags()!). Otherwise it splits the tag into an element and an
-			 *	allowed attribute list.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string Modified string minus disallowed/mangled (X)HTML and attributes
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function stripTags($string)
-			{
-				$string = preg_replace('%\\\\"%', '"', $string);
-
-				if (substr($string, 0, 1) != '<')
-				{
-					# It matched a ">" character
-					return '&gt;';
-				}
-
-				if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-				{
-					# It's seriously malformed
-					return '';
-				}
-
-				$slash    = trim($matches[1]);
-				$elem     = $matches[2];
-				$attrlist = $matches[3];
-
-				if (
-					!isset($this->allowed_html[strtolower($elem)]) ||
-					!is_array($this->allowed_html[strtolower($elem)]))
-				{
-					#	Found an HTML element not in the white list
-					return '';
-				}
-
-				if ($slash != '')
-				{
-					return "<$slash$elem>";
-				}
-				# No attributes are allowed for closing elements
-
-				return $this->stripAttributes("$slash$elem", $attrlist);
-			}
-
-			/**
-			 *	This method strips out disallowed attributes for (X)HTML tags.
-			 *
-			 *	This method removes all attributes if none are allowed for this element.
-			 *	If some are allowed it calls combAttributes() to split them further, and then it
-			 *	builds up new HTML code from the data that combAttributes() returns. It also
-			 *	removes "<" and ">" characters, if there are any left. One more thing it
-			 *	does is to check if the tag has a closing XHTML slash, and if it does,
-			 *	it puts one in the returned code as well.
-			 *
-			 *	@access private
-			 *	@param string $element (X)HTML tag to check
-			 *	@param string $attr Text containing attributes to check for validity.
-			 *	@return string Resulting valid (X)HTML or ''
-			 *	@see combAttributes()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function stripAttributes($element, $attr)
-			{
-				# Is there a closing XHTML slash at the end of the attributes?
-				$xhtml_slash = '';
-				if (preg_match('%\s/\s*$%', $attr))
-				{
-					$xhtml_slash = ' /';
-				}
-
-				# Are any attributes allowed at all for this element?
-				if (
-					!isset($this->allowed_html[strtolower($element)]) ||
-					count($this->allowed_html[strtolower($element)]) == 0
-				)
-				{
-					return "<$element$xhtml_slash>";
-				}
-
-				# Split it
-				$attrarr = $this->combAttributes($attr);
-
-				# Go through $attrarr, and save the allowed attributes for this element
-				# in $attr2
-				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
-				{
-					foreach ($attrarr as $arreach)
-					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
-						{
-							continue;
-						}
-
-						$current = $this->allowed_html[strtolower($element)][strtolower($arreach['name'])];
-
-						if (!is_array($current))
-						{
-							# there are no checks
-							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
-						{
-							# there are some checks
-							$ok = true;
-							if(is_array($current) && count($current) > 0)
-							{
-								foreach ($current as $currkey => $currval)
-								{
-									if (!$this->checkAttributeValue($arreach['value'], $arreach['vless'], $currkey, $currval))
-									{
-										$ok = false;
-										break;
-									}
-								}
-							}
-
-							if ($ok)
-							{
-								# it passed them
-								$attr2 .= ' '.$arreach['whole'];
-							}
-						}
-					}
-				}
-
-				# Remove any "<" or ">" characters
-				$attr2 = preg_replace('/[<>]/', '', $attr2);
-				return "<$element$attr2$xhtml_slash>";
-			}
-
-			/**
-			 *	This method combs through an attribute list string and returns an associative array of attributes and values.
-			 *
-			 *	This method does a lot of work. It parses an attribute list into an array
-			 *	with attribute data, and tries to do the right thing even if it gets weird
-			 *	input. It will add quotes around attribute values that don't have any quotes
-			 *	or apostrophes around them, to make it easier to produce HTML code that will
-			 *	conform to W3C's HTML specification. It will also remove bad URL protocols
-			 *	from attribute values.
-			 *
-			 *	@access private
-			 *	@param string $attr Text containing tag attributes for parsing
-			 *	@return array Associative array containing data on attribute and value
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function combAttributes($attr)
-			{
-				$attrarr  = array();
-				$mode     = 0;
-				$attrname = '';
-
-				# Loop through the whole attribute list
-
-				while (strlen($attr) != 0)
-				{
-					# Was the last operation successful?
-					$working = 0;
-
-					switch ($mode)
-					{
-						case 0:	# attribute name, href for instance
-							if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
-							{
-								$attrname = $match[1];
-								$working = $mode = 1;
-								$attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
-							}
-							break;
-						case 1:	# equals sign or valueless ("selected")
-							if (preg_match('/^\s*=\s*/', $attr)) # equals sign
-							{
-								$working = 1;
-								$mode    = 2;
-								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
-								break;
-							}
-							if (preg_match('/^\s+/', $attr)) # valueless
-							{
-								$working   = 1;
-								$mode      = 0;
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => '',
-									'whole' => $attrname,
-									'vless' => 'y'
-								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
-							}
-							break;
-						case 2: # attribute value, a URL after href= for instance
-							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
-							{
-								$thisval   = $this->removeBadProtocols($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
-									'vless' => 'n'
-								);
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
-								break;
-							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
-							{
-								$thisval   = $this->removeBadProtocols($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => "$attrname='$thisval'",
-									'vless' => 'n'
-								);
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
-								break;
-							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
-							{
-								$thisval   = $this->removeBadProtocols($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
-									'vless' => 'n'
-								);
-								# We add quotes to conform to W3C's HTML spec.
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
-							}
-							break;
-					}
-
-					if ($working == 0) # not well formed, remove and try again
-					{
-						$attr = preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr);
-						$mode = 0;
-					}
-				}
-
-				# special case, for when the attribute list ends with a valueless
-				# attribute like "selected"
-				if ($mode == 1)
-				{
-					$attrarr[] = array(
-						'name'  => $attrname,
-						'value' => '',
-						'whole' => $attrname,
-						'vless' => 'y'
-					);
-				}
-
-				return $attrarr;
-			}
-
-			/**
-			 *	This method removes disallowed protocols.
-			 *
-			 *	This method removes all non-allowed protocols from the beginning of
-			 *	$string. It ignores whitespace and the case of the letters, and it does
-			 *	understand HTML entities. It does its work in a while loop, so it won't be
-			 *	fooled by a string like "javascript:javascript:alert(57)".
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function removeBadProtocols($string)
-			{
-				$string  = $this->RemoveNulls($string);
-				$string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-				$string2 = $string . 'a';
-
-				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
-				{
-					$string = $this->filterProtocols($string2[0]).trim($string2[1]);
-				}
-				return $string;
-			}
-
-			/**
-			 *	Helper method used by removeBadProtocols()
-			 *
-			 *	This function processes URL protocols, checks to see if they're in the white-
-			 *	list or not, and returns different data depending on the answer.
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@see removeBadProtocols()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function filterProtocols($string)
-			{
-				$string = $this->decodeEntities($string);
-				$string = preg_replace('/\s/', '', $string);
-				$string = $this->removeNulls($string);
-				$string = preg_replace('/\xad+/', '', $string2); # deals with Opera "feature"
-				$string = strtolower($string);
-
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
-				{
-					foreach ($this->allowed_protocols as $one_protocol)
-					{
-						if (strtolower($one_protocol) == $string)
-						{
-							return "$string:";
-						}
-					}
-				}
-
-				return '';
-			}
-
-			/**
-			 *	Controller method for performing checks on attribute values.
-			 *
-			 *	This method calls the appropriate method as specified by $checkname with
-			 *	the parameters $value, $vless, and $checkvalue, and returns the result
-			 *	of the call.
-			 *
-			 *	This method's functionality can be expanded by creating new methods
-			 *	that would match checkAttributeValue[$checkname].
-			 *
-			 *	Current checks implemented are: "maxlen", "minlen", "maxval", "minval" and "valueless"
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param string $vless Indicates whether the the value is supposed to be valueless
-			 *	@param string $checkname The check to be performed
-			 *	@param string $checkvalue The value that is to be checked against
-			 *	@return bool Indicates whether the check passed or not
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValue($value, $vless, $checkname, $checkvalue)
-			{
-				$ok = true;
-				$check_attribute_method_name  = 'checkAttributeValue' . ucfirst(strtolower($checkname));
-				if(method_exists($this, $check_attribute_method_name))
-				{
-					$ok = $this->$check_attribute_method_name($value, $checkvalue, $vless);
-				}
-
-				return $ok;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The maxlen check makes sure that the attribute value has a length not
-			 *	greater than the given value. This can be used to avoid Buffer Overflows
-			 *	in WWW clients and various Internet servers.
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The maximum value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMaxlen($value, $checkvalue)
-			{
-				if (strlen($value) > intval($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The minlen check makes sure that the attribute value has a length not
-			 *	smaller than the given value.
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The minimum value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMinlen($value, $checkvalue)
-			{
-				if (strlen($value) < intval($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The maxval check does two things: it checks that the attribute value is
-			 *	an integer from 0 and up, without an excessive amount of zeroes or
-			 *	whitespace (to avoid Buffer Overflows). It also checks that the attribute
-			 *	value is not greater than the given value.
-			 *
-			 *	This check can be used to avoid Denial of Service attacks.
-			 *
-			 *	@access private
-			 *	@param int $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The maximum numeric value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMaxval($value, $checkvalue)
-			{
-				if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				{
-					return false;
-				}
-				if (intval($value) > intval($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The minval check checks that the attribute value is a positive integer,
-			 *	and that it is not smaller than the given value.
-			 *
-			 *	@access private
-			 *	@param int $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The minimum numeric value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMinval($value, $checkvalue)
-			{
-				if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				{
-					return false;
-				}
-				if (intval($value) < ($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The valueless check checks if the attribute has a value
-			 *	(like <a href="blah">) or not (<option selected>). If the given value
-			 *	is a "y" or a "Y", the attribute must not have a value.
-			 *
-			 *	If the given value is an "n" or an "N", the attribute must have one.
-			 *
-			 *	@access private
-			 *	@param int $value The value of the attribute to be checked.
-			 *	@param mixed $checkvalue This variable is ignored for this test
-			 *	@param string $vless Flag indicating if this attribute is not supposed to have an attribute
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueValueless($value, $checkvalue, $vless)
-			{
-				if (strtolower($checkvalue) != $vless)
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Decodes numeric HTML entities
-			 *
-			 *	This method decodes numeric HTML entities (&#65; and &#x41;). It doesn't
-			 *	do anything with other entities like &auml;, but we don't need them in the
-			 *	URL protocol white listing system anyway.
-			 *
-			 *	@access private
-			 *	@param string $value The entitiy to be decoded.
-			 *	@return string Decoded entity
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function decodeEntities($string)
-			{
-				$string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-				$string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
-				return $string;
-			}
-
-			/**
-			 *	Returns PHP5 OOP version # of kses.
-			 *
-			 *	Since this class has been refactored and documented and proven to work,
-			 *	I'm fixing the version number at 1.0.0.
-			 *
-			 *	This version is syntax compatible with the PHP4 OOP version 0.0.2.  Future
-			 *	versions may not be syntax compatible.
-			 *
-			 *	@access public
-			 *	@return string Version number
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function Version()
-			{
-				return 'PHP5 OOP 1.0.2';
-			}
-		}
-	}
+            private $allowed_protocols;
+            private $allowed_html;
+            /**#@-*/
+
+            /**
+             *	Constructor for kses.
+             *
+             *	This sets a default collection of protocols allowed in links, and creates an
+             *	empty set of allowed HTML tags.
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function __construct()
+            {
+                /**
+                 *	You could add protocols such as ftp, new, gopher, mailto, irc, etc.
+                 *
+                 *	The base values the original kses provided were:
+                 *		'http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'
+                 */
+                $this->allowed_protocols = array('http', 'ftp', 'mailto');
+                $this->allowed_html      = array();
+            }
+
+            /**
+             *	Basic task of kses - parses $string and strips it as required.
+             *
+             *	This method strips all the disallowed (X)HTML tags, attributes
+             *	and protocols from the input $string.
+             *
+             *	@access public
+             *	@param string $string String to be stripped of 'evil scripts'
+             *	@return string The stripped string
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function Parse($string = "")
+            {
+                if (get_magic_quotes_gpc())
+                {
+                    $string = stripslashes($string);
+                }
+                $string = $this->removeNulls($string);
+                //	Remove JavaScript entities from early Netscape 4 versions
+                $string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
+                $string = $this->normalizeEntities($string);
+                $string = $this->filterKsesTextHook($string);
+                $string = preg_replace('%(<' . '[^>]*' . '(>|$)' . '|>)%e', "\$this->stripTags('\\1')", $string);
+                return $string;
+            }
+
+            /**
+             *	Allows for single/batch addition of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	The argument will be processed, and each string will be added
+             *	via AddProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be added to the internal list of allowed protocols.
+             *	@return bool Status of adding valid protocols.
+             *	@see AddProtocol()
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function AddProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses5::AddProtocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->AddProtocol($protocol);
+                    }
+                    return true;
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->AddProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses5::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Allows for single/batch addition of protocols
+             *
+             *	@deprecated Use AddProtocols()
+             *	@see AddProtocols()
+             *	@return bool
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function Protocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses5::Protocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                return $this->AddProtocols(func_get_arg(0));
+            }
+
+            /**
+             *	Adds a single protocol to $this->allowed_protocols.
+             *
+             *	This method accepts a string argument and adds it to
+             *	the list of allowed protocols to keep when performing
+             *	Parse().
+             *
+             *	@access public
+             *	@param string $protocol The name of the protocol to be added.
+             *	@return bool Status of adding valid protocol.
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function AddProtocol($protocol = "")
+            {
+                if(!is_string($protocol))
+                {
+                    trigger_error("kses5::AddProtocol() requires a string.", E_USER_WARNING);
+                    return false;
+                }
+
+                // Remove any inadvertent ':' at the end of the protocol.
+                if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+                {
+                    $protocol = substr($protocol, 0, strlen($protocol) - 1);
+                }
+
+                $protocol = strtolower(trim($protocol));
+                if($protocol == "")
+                {
+                    trigger_error("kses5::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
+                    return false;
+                }
+
+                //	prevent duplicate protocols from being added.
+                if(!in_array($protocol, $this->allowed_protocols))
+                {
+                    array_push($this->allowed_protocols, $protocol);
+                    sort($this->allowed_protocols);
+                }
+                return true;
+            }
+
+            /**
+             *	Removes a single protocol from $this->allowed_protocols.
+             *
+             *	This method accepts a string argument and removes it from
+             *	the list of allowed protocols to keep when performing
+             *	Parse().
+             *
+             *	@access public
+             *	@param string $protocol The name of the protocol to be removed.
+             *	@return bool Status of removing valid protocol.
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function RemoveProtocol($protocol = "")
+            {
+                if(!is_string($protocol))
+                {
+                    trigger_error("kses5::RemoveProtocol() requires a string.", E_USER_WARNING);
+                    return false;
+                }
+
+                // Remove any inadvertent ':' at the end of the protocol.
+                if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+                {
+                    $protocol = substr($protocol, 0, strlen($protocol) - 1);
+                }
+
+                $protocol = strtolower(trim($protocol));
+                if($protocol == "")
+                {
+                    trigger_error("kses5::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
+                    return false;
+                }
+
+                //	Ensures that the protocol exists before removing it.
+                if(in_array($protocol, $this->allowed_protocols))
+                {
+                    $this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
+                    sort($this->allowed_protocols);
+                }
+
+                return true;
+            }
+
+            /**
+             *	Allows for single/batch removal of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	The argument will be processed, and each string will be removed
+             *	via RemoveProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
+             *	@return bool Status of removing valid protocols.
+             *	@see RemoveProtocol()
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function RemoveProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->RemoveProtocol($protocol);
+                    }
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->RemoveProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses5::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Allows for single/batch replacement of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	Existing protocols will be removed, then the argument will be
+             *	processed, and each string will be added via AddProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be the new internal list of allowed protocols.
+             *	@return bool Status of replacing valid protocols.
+             *	@since PHP5 OOP 1.0.1
+             *	@see AddProtocol()
+             */
+            public function SetProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses5::SetProtocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    $this->allowed_protocols = array();
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->AddProtocol($protocol);
+                    }
+                    return true;
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->allowed_protocols = array();
+                    $this->AddProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses5::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Raw dump of allowed protocols
+             *
+             *	This returns an indexed array of allowed protocols for a particular KSES
+             *	instantiation.
+             *
+             *	@access public
+             *	@return array The list of allowed protocols.
+             *	@since PHP5 OOP 1.0.2
+             */
+            public function DumpProtocols()
+            {
+                return $this->allowed_protocols;
+            }
+
+            /**
+             *	Raw dump of allowed (X)HTML elements
+             *
+             *	This returns an indexed array of allowed (X)HTML elements and attributes
+             *	for a particular KSES instantiation.
+             *
+             *	@access public
+             *	@return array The list of allowed elements.
+             *	@since PHP5 OOP 1.0.2
+             */
+            public function DumpElements()
+            {
+                return $this->allowed_html;
+            }
+
+
+            /**
+             *	Adds valid (X)HTML with corresponding attributes that will be kept when stripping 'evil scripts'.
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	@access public
+             *	@param string $tag (X)HTML tag that will be allowed after stripping text.
+             *	@param array $attribs Associative array of allowed attributes - key => attribute name - value => attribute parameter
+             *	@return bool Status of Adding (X)HTML and attributes.
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function AddHTML($tag = "", $attribs = array())
+            {
+                if(!is_string($tag))
+                {
+                    trigger_error("kses5::AddHTML() requires the tag to be a string", E_USER_WARNING);
+                    return false;
+                }
+
+                $tag = strtolower(trim($tag));
+                if($tag == "")
+                {
+                    trigger_error("kses5::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
+                    return false;
+                }
+
+                if(!is_array($attribs))
+                {
+                    trigger_error("kses5::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
+                    return false;
+                }
+
+                $new_attribs = array();
+                if(is_array($attribs) && count($attribs) > 0)
+                {
+                    foreach($attribs as $idx1 => $val1)
+                    {
+                        $new_idx1 = strtolower($idx1);
+                        $new_val1 = $attribs[$idx1];
+
+                        if(is_array($new_val1) && count($attribs) > 0)
+                        {
+                            $tmp_val = array();
+                            foreach($new_val1 as $idx2 => $val2)
+                            {
+                                $new_idx2 = strtolower($idx2);
+                                $tmp_val[$new_idx2] = $val2;
+                            }
+                            $new_val1 = $tmp_val;
+                        }
+
+                        $new_attribs[$new_idx1] = $new_val1;
+                    }
+                }
+
+                $this->allowed_html[$tag] = $new_attribs;
+                return true;
+            }
+
+            /**
+             *	This method removes any NULL characters in $string.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String without any NULL/chr(173)
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function removeNulls($string)
+            {
+                $string = preg_replace('/\0+/', '', $string);
+                $string = preg_replace('/(\\\\0)+/', '', $string);
+                return $string;
+            }
+
+            /**
+             *	Normalizes HTML entities
+             *
+             *	This function normalizes HTML entities. It will convert "AT&T" to the correct
+             *	"AT&amp;T", "&#00058;" to "&#58;", "&#XYZZY;" to "&amp;#XYZZY;" and so on.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String with normalized entities
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function normalizeEntities($string)
+            {
+                # Disarm all entities by converting & to &amp;
+                $string = str_replace('&', '&amp;', $string);
+
+                #	TODO: Change back (Keep?) the allowed entities in our entity white list
+
+                #	Keeps entities that start with [A-Za-z]
+                $string = preg_replace(
+                    '/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
+                    '&\\1;',
+                    $string
+                );
+
+                #	Change numeric entities to valid 16 bit values
+
+                $string = preg_replace(
+                    '/&amp;#0*([0-9]{1,5});/e',
+                    '\$this->normalizeEntities16bit("\\1")',
+                    $string
+                );
+
+                #	Change &XHHHHHHH (Hex digits) to 16 bit hex values
+                $string = preg_replace(
+                    '/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
+                    '&#\\1\\2;',
+                    $string
+                );
+
+                return $string;
+            }
+
+            /**
+             *	Helper method used by normalizeEntites()
+             *
+             *	This method helps normalizeEntities() to only accept 16 bit values
+             *	and nothing more for &#number; entities.
+             *
+             *	This method helps normalize_entities() during a preg_replace()
+             *	where a &#(0)*XXXXX; occurs.  The '(0)*XXXXXX' value is converted to
+             *	a number and the result is returned as a numeric entity if the number
+             *	is less than 65536.  Otherwise, the value is returned 'as is'.
+             *
+             *	@access private
+             *	@param string $i
+             *	@return string Normalized numeric entity
+             *	@see normalizeEntities()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function normalizeEntities16bit($i)
+            {
+                return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
+            }
+
+            /**
+             *	Allows for additional user defined modifications to text.
+             *
+             *	This method allows for additional modifications to be performed on
+             *	a string that's being run through Parse().  Currently, it returns the
+             *	input string 'as is'.
+             *
+             *	This method is provided for users to extend the kses class for their own
+             *	requirements.
+             *
+             *	@access public
+             *	@param string $string String to perfrom additional modifications on.
+             *	@return string User modified string.
+             *	@see Parse()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function filterKsesTextHook($string)
+            {
+                return $string;
+            }
+
+            /**
+             *	Allows for additional user defined modifications to text.
+             *
+             *	@deprecated use filterKsesTextHook()
+             *	@param string $string
+             *	@return string
+             *	@see filterKsesTextHook()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function _hook($string)
+            {
+                return $this->filterKsesTextHook($string);
+            }
+
+            /**
+             *	This method goes through an array, and changes the keys to all lower case.
+             *
+             *	@access private
+             *	@param array $in_array Associative array
+             *	@return array Modified array
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function makeArrayKeysLowerCase($in_array)
+            {
+                $out_array = array();
+
+                if(is_array($in_array) && count($in_array) > 0)
+                {
+                    foreach ($in_array as $in_key => $in_val)
+                    {
+                        $out_key = strtolower($in_key);
+                        $out_array[$out_key] = array();
+
+                        if(is_array($in_val) && count($in_val) > 0)
+                        {
+                            foreach ($in_val as $in_key2 => $in_val2)
+                            {
+                                $out_key2 = strtolower($in_key2);
+                                $out_array[$out_key][$out_key2] = $in_val2;
+                            }
+                        }
+                    }
+                }
+
+                return $out_array;
+            }
+
+            /**
+             *	This method strips out disallowed and/or mangled (X)HTML tags along with assigned attributes.
+             *
+             *	This method does a lot of work. It rejects some very malformed things
+             *	like <:::>. It returns an empty string if the element isn't allowed (look
+             *	ma, no strip_tags()!). Otherwise it splits the tag into an element and an
+             *	allowed attribute list.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string Modified string minus disallowed/mangled (X)HTML and attributes
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function stripTags($string)
+            {
+                $string = preg_replace('%\\\\"%', '"', $string);
+
+                if (substr($string, 0, 1) != '<')
+                {
+                    # It matched a ">" character
+                    return '&gt;';
+                }
+
+                if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+                {
+                    # It's seriously malformed
+                    return '';
+                }
+
+                $slash    = trim($matches[1]);
+                $elem     = $matches[2];
+                $attrlist = $matches[3];
+
+                if (
+                    !isset($this->allowed_html[strtolower($elem)]) ||
+                    !is_array($this->allowed_html[strtolower($elem)]))
+                {
+                    #	Found an HTML element not in the white list
+                    return '';
+                }
+
+                if ($slash != '')
+                {
+                    return "<$slash$elem>";
+                }
+                # No attributes are allowed for closing elements
+
+                return $this->stripAttributes("$slash$elem", $attrlist);
+            }
+
+            /**
+             *	This method strips out disallowed attributes for (X)HTML tags.
+             *
+             *	This method removes all attributes if none are allowed for this element.
+             *	If some are allowed it calls combAttributes() to split them further, and then it
+             *	builds up new HTML code from the data that combAttributes() returns. It also
+             *	removes "<" and ">" characters, if there are any left. One more thing it
+             *	does is to check if the tag has a closing XHTML slash, and if it does,
+             *	it puts one in the returned code as well.
+             *
+             *	@access private
+             *	@param string $element (X)HTML tag to check
+             *	@param string $attr Text containing attributes to check for validity.
+             *	@return string Resulting valid (X)HTML or ''
+             *	@see combAttributes()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function stripAttributes($element, $attr)
+            {
+                # Is there a closing XHTML slash at the end of the attributes?
+                $xhtml_slash = '';
+                if (preg_match('%\s/\s*$%', $attr))
+                {
+                    $xhtml_slash = ' /';
+                }
+
+                # Are any attributes allowed at all for this element?
+                if (
+                    !isset($this->allowed_html[strtolower($element)]) ||
+                    count($this->allowed_html[strtolower($element)]) == 0
+                )
+                {
+                    return "<$element$xhtml_slash>";
+                }
+
+                # Split it
+                $attrarr = $this->combAttributes($attr);
+
+                # Go through $attrarr, and save the allowed attributes for this element
+                # in $attr2
+                $attr2 = '';
+                if(is_array($attrarr) && count($attrarr) > 0)
+                {
+                    foreach ($attrarr as $arreach)
+                    {
+                        if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+                        {
+                            continue;
+                        }
+
+                        $current = $this->allowed_html[strtolower($element)][strtolower($arreach['name'])];
+
+                        if (!is_array($current))
+                        {
+                            # there are no checks
+                            $attr2 .= ' '.$arreach['whole'];
+                        }
+                        else
+                        {
+                            # there are some checks
+                            $ok = true;
+                            if(is_array($current) && count($current) > 0)
+                            {
+                                foreach ($current as $currkey => $currval)
+                                {
+                                    if (!$this->checkAttributeValue($arreach['value'], $arreach['vless'], $currkey, $currval))
+                                    {
+                                        $ok = false;
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if ($ok)
+                            {
+                                # it passed them
+                                $attr2 .= ' '.$arreach['whole'];
+                            }
+                        }
+                    }
+                }
+
+                # Remove any "<" or ">" characters
+                $attr2 = preg_replace('/[<>]/', '', $attr2);
+                return "<$element$attr2$xhtml_slash>";
+            }
+
+            /**
+             *	This method combs through an attribute list string and returns an associative array of attributes and values.
+             *
+             *	This method does a lot of work. It parses an attribute list into an array
+             *	with attribute data, and tries to do the right thing even if it gets weird
+             *	input. It will add quotes around attribute values that don't have any quotes
+             *	or apostrophes around them, to make it easier to produce HTML code that will
+             *	conform to W3C's HTML specification. It will also remove bad URL protocols
+             *	from attribute values.
+             *
+             *	@access private
+             *	@param string $attr Text containing tag attributes for parsing
+             *	@return array Associative array containing data on attribute and value
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function combAttributes($attr)
+            {
+                $attrarr  = array();
+                $mode     = 0;
+                $attrname = '';
+
+                # Loop through the whole attribute list
+
+                while (strlen($attr) != 0)
+                {
+                    # Was the last operation successful?
+                    $working = 0;
+
+                    switch ($mode)
+                    {
+                        case 0:	# attribute name, href for instance
+                            if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
+                            {
+                                $attrname = $match[1];
+                                $working = $mode = 1;
+                                $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
+                            }
+                            break;
+                        case 1:	# equals sign or valueless ("selected")
+                            if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+                            {
+                                $working = 1;
+                                $mode    = 2;
+                                $attr    = preg_replace('/^\s*=\s*/', '', $attr);
+                                break;
+                            }
+                            if (preg_match('/^\s+/', $attr)) # valueless
+                            {
+                                $working   = 1;
+                                $mode      = 0;
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => '',
+                                    'whole' => $attrname,
+                                    'vless' => 'y'
+                                );
+                                $attr      = preg_replace('/^\s+/', '', $attr);
+                            }
+                            break;
+                        case 2: # attribute value, a URL after href= for instance
+                            if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
+                            {
+                                $thisval   = $this->removeBadProtocols($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => $attrname . '="' . $thisval . '"',
+                                    'vless' => 'n'
+                                );
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+                                break;
+                            }
+                            if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+                            {
+                                $thisval   = $this->removeBadProtocols($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => "$attrname='$thisval'",
+                                    'vless' => 'n'
+                                );
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+                                break;
+                            }
+                            if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+                            {
+                                $thisval   = $this->removeBadProtocols($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => $attrname . '="' . $thisval . '"',
+                                    'vless' => 'n'
+                                );
+                                # We add quotes to conform to W3C's HTML spec.
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+                            }
+                            break;
+                    }
+
+                    if ($working == 0) # not well formed, remove and try again
+                    {
+                        $attr = preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr);
+                        $mode = 0;
+                    }
+                }
+
+                # special case, for when the attribute list ends with a valueless
+                # attribute like "selected"
+                if ($mode == 1)
+                {
+                    $attrarr[] = array(
+                        'name'  => $attrname,
+                        'value' => '',
+                        'whole' => $attrname,
+                        'vless' => 'y'
+                    );
+                }
+
+                return $attrarr;
+            }
+
+            /**
+             *	This method removes disallowed protocols.
+             *
+             *	This method removes all non-allowed protocols from the beginning of
+             *	$string. It ignores whitespace and the case of the letters, and it does
+             *	understand HTML entities. It does its work in a while loop, so it won't be
+             *	fooled by a string like "javascript:javascript:alert(57)".
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function removeBadProtocols($string)
+            {
+                $string  = $this->RemoveNulls($string);
+                $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+                $string2 = $string . 'a';
+
+                $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
+                if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+                {
+                    $string = $this->filterProtocols($string2[0]).trim($string2[1]);
+                }
+                return $string;
+            }
+
+            /**
+             *	Helper method used by removeBadProtocols()
+             *
+             *	This function processes URL protocols, checks to see if they're in the white-
+             *	list or not, and returns different data depending on the answer.
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@see removeBadProtocols()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function filterProtocols($string)
+            {
+                $string = $this->decodeEntities($string);
+                $string = preg_replace('/\s/', '', $string);
+                $string = $this->removeNulls($string);
+                $string = preg_replace('/\xad+/', '', $string2); # deals with Opera "feature"
+                $string = strtolower($string);
+
+                if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+                {
+                    foreach ($this->allowed_protocols as $one_protocol)
+                    {
+                        if (strtolower($one_protocol) == $string)
+                        {
+                            return "$string:";
+                        }
+                    }
+                }
+
+                return '';
+            }
+
+            /**
+             *	Controller method for performing checks on attribute values.
+             *
+             *	This method calls the appropriate method as specified by $checkname with
+             *	the parameters $value, $vless, and $checkvalue, and returns the result
+             *	of the call.
+             *
+             *	This method's functionality can be expanded by creating new methods
+             *	that would match checkAttributeValue[$checkname].
+             *
+             *	Current checks implemented are: "maxlen", "minlen", "maxval", "minval" and "valueless"
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param string $vless Indicates whether the the value is supposed to be valueless
+             *	@param string $checkname The check to be performed
+             *	@param string $checkvalue The value that is to be checked against
+             *	@return bool Indicates whether the check passed or not
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValue($value, $vless, $checkname, $checkvalue)
+            {
+                $ok = true;
+                $check_attribute_method_name  = 'checkAttributeValue' . ucfirst(strtolower($checkname));
+                if(method_exists($this, $check_attribute_method_name))
+                {
+                    $ok = $this->$check_attribute_method_name($value, $checkvalue, $vless);
+                }
+
+                return $ok;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The maxlen check makes sure that the attribute value has a length not
+             *	greater than the given value. This can be used to avoid Buffer Overflows
+             *	in WWW clients and various Internet servers.
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param int $checkvalue The maximum value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMaxlen($value, $checkvalue)
+            {
+                if (strlen($value) > intval($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The minlen check makes sure that the attribute value has a length not
+             *	smaller than the given value.
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param int $checkvalue The minimum value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMinlen($value, $checkvalue)
+            {
+                if (strlen($value) < intval($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The maxval check does two things: it checks that the attribute value is
+             *	an integer from 0 and up, without an excessive amount of zeroes or
+             *	whitespace (to avoid Buffer Overflows). It also checks that the attribute
+             *	value is not greater than the given value.
+             *
+             *	This check can be used to avoid Denial of Service attacks.
+             *
+             *	@access private
+             *	@param int $value The value of the attribute to be checked.
+             *	@param int $checkvalue The maximum numeric value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMaxval($value, $checkvalue)
+            {
+                if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+                {
+                    return false;
+                }
+                if (intval($value) > intval($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The minval check checks that the attribute value is a positive integer,
+             *	and that it is not smaller than the given value.
+             *
+             *	@access private
+             *	@param int $value The value of the attribute to be checked.
+             *	@param int $checkvalue The minimum numeric value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMinval($value, $checkvalue)
+            {
+                if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+                {
+                    return false;
+                }
+                if (intval($value) < ($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The valueless check checks if the attribute has a value
+             *	(like <a href="blah">) or not (<option selected>). If the given value
+             *	is a "y" or a "Y", the attribute must not have a value.
+             *
+             *	If the given value is an "n" or an "N", the attribute must have one.
+             *
+             *	@access private
+             *	@param int $value The value of the attribute to be checked.
+             *	@param mixed $checkvalue This variable is ignored for this test
+             *	@param string $vless Flag indicating if this attribute is not supposed to have an attribute
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueValueless($value, $checkvalue, $vless)
+            {
+                if (strtolower($checkvalue) != $vless)
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Decodes numeric HTML entities
+             *
+             *	This method decodes numeric HTML entities (&#65; and &#x41;). It doesn't
+             *	do anything with other entities like &auml;, but we don't need them in the
+             *	URL protocol white listing system anyway.
+             *
+             *	@access private
+             *	@param string $value The entitiy to be decoded.
+             *	@return string Decoded entity
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function decodeEntities($string)
+            {
+                $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
+                $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
+                return $string;
+            }
+
+            /**
+             *	Returns PHP5 OOP version # of kses.
+             *
+             *	Since this class has been refactored and documented and proven to work,
+             *	I'm fixing the version number at 1.0.0.
+             *
+             *	This version is syntax compatible with the PHP4 OOP version 0.0.2.  Future
+             *	versions may not be syntax compatible.
+             *
+             *	@access public
+             *	@return string Version number
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function Version()
+            {
+                return 'PHP5 OOP 1.0.2';
+            }
+        }
+    }
 ?>
\ No newline at end of file