Completed
Push — 1.10.x ( 320abc...039d05 )
by José
151:51 queued 109:10
created
main/inc/lib/internationalization_database/transliteration/xb4.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: xb4.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('dwaen', 'dwaenj', 'dwaenh', 'dwaed', 'dwael', 'dwaelg', 'dwaelm', 'dwaelb', 'dwaels', 'dwaelt', 'dwaelp', 'dwaelh', 'dwaem', 'dwaeb', 'dwaebs', 'dwaes',
5
+    'en' => array('dwaen', 'dwaenj', 'dwaenh', 'dwaed', 'dwael', 'dwaelg', 'dwaelm', 'dwaelb', 'dwaels', 'dwaelt', 'dwaelp', 'dwaelh', 'dwaem', 'dwaeb', 'dwaebs', 'dwaes',
6 6
     'dwaess', 'dwaeng', 'dwaej', 'dwaec', 'dwaek', 'dwaet', 'dwaep', 'dwaeh', 'doe', 'doeg', 'doegg', 'doegs', 'doen', 'doenj', 'doenh', 'doed',
7 7
     'doel', 'doelg', 'doelm', 'doelb', 'doels', 'doelt', 'doelp', 'doelh', 'doem', 'doeb', 'doebs', 'does', 'doess', 'doeng', 'doej', 'doec',
8 8
     'doek', 'doet', 'doep', 'doeh', 'dyo', 'dyog', 'dyogg', 'dyogs', 'dyon', 'dyonj', 'dyonh', 'dyod', 'dyol', 'dyolg', 'dyolm', 'dyolb',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x02.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: x02.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
5
+    'en' => array('A', 'a', 'A', 'a', 'E', 'e', 'E', 'e', 'I', 'i', 'I', 'i', 'O', 'o', 'O', 'o',
6 6
     'R', 'r', 'R', 'r', 'U', 'u', 'U', 'u', 'S', 's', 'T', 't', 'Y', 'y', 'H', 'h',
7 7
     'N', 'd', 'OU', 'ou', 'Z', 'z', 'A', 'a', 'E', 'e', 'O', 'o', 'O', 'o', 'O', 'o',
8 8
     'O', 'o', 'Y', 'y', 'l', 'n', 't', 'j', 'db', 'qp', 'A', 'C', 'c', 'L', 'T', 's',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x16.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: x16.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('kka', 'kk', 'nu', 'no', 'ne', 'nee', 'ni', 'na', 'mu', 'mo', 'me', 'mee', 'mi', 'ma', 'yu', 'yo',
5
+    'en' => array('kka', 'kk', 'nu', 'no', 'ne', 'nee', 'ni', 'na', 'mu', 'mo', 'me', 'mee', 'mi', 'ma', 'yu', 'yo',
6 6
     'ye', 'yee', 'yi', 'ya', 'ju', 'ju', 'jo', 'je', 'jee', 'ji', 'ji', 'ja', 'jju', 'jjo', 'jje', 'jjee',
7 7
     'jji', 'jja', 'lu', 'lo', 'le', 'lee', 'li', 'la', 'dlu', 'dlo', 'dle', 'dlee', 'dli', 'dla', 'lhu', 'lho',
8 8
     'lhe', 'lhee', 'lhi', 'lha', 'tlhu', 'tlho', 'tlhe', 'tlhee', 'tlhi', 'tlha', 'tlu', 'tlo', 'tle', 'tlee', 'tli', 'tla',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/x6c.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: x6c.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('Lu ', 'Mu ', 'Li ', 'Tong ', 'Rong ', 'Chang ', 'Pu ', 'Luo ', 'Zhan ', 'Sao ', 'Zhan ', 'Meng ', 'Luo ', 'Qu ', 'Die ', 'Shi ',
5
+    'en' => array('Lu ', 'Mu ', 'Li ', 'Tong ', 'Rong ', 'Chang ', 'Pu ', 'Luo ', 'Zhan ', 'Sao ', 'Zhan ', 'Meng ', 'Luo ', 'Qu ', 'Die ', 'Shi ',
6 6
     'Di ', 'Min ', 'Jue ', 'Mang ', 'Qi ', 'Pie ', 'Nai ', 'Qi ', 'Dao ', 'Xian ', 'Chuan ', 'Fen ', 'Ri ', 'Nei ', NULL, 'Fu ',
7 7
     'Shen ', 'Dong ', 'Qing ', 'Qi ', 'Yin ', 'Xi ', 'Hai ', 'Yang ', 'An ', 'Ya ', 'Ke ', 'Qing ', 'Ya ', 'Dong ', 'Dan ', 'Lu ',
8 8
     'Qing ', 'Yang ', 'Yun ', 'Yun ', 'Shui ', 'San ', 'Zheng ', 'Bing ', 'Yong ', 'Dang ', 'Shitamizu ', 'Le ', 'Ni ', 'Tun ', 'Fan ', 'Gui ',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/xb8.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: xb8.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('reoss', 'reong', 'reoj', 'reoc', 'reok', 'reot', 'reop', 'reoh', 're', 'reg', 'regg', 'regs', 'ren', 'renj', 'renh', 'red',
5
+    'en' => array('reoss', 'reong', 'reoj', 'reoc', 'reok', 'reot', 'reop', 'reoh', 're', 'reg', 'regg', 'regs', 'ren', 'renj', 'renh', 'red',
6 6
     'rel', 'relg', 'relm', 'relb', 'rels', 'relt', 'relp', 'relh', 'rem', 'reb', 'rebs', 'res', 'ress', 'reng', 'rej', 'rec',
7 7
     'rek', 'ret', 'rep', 'reh', 'ryeo', 'ryeog', 'ryeogg', 'ryeogs', 'ryeon', 'ryeonj', 'ryeonh', 'ryeod', 'ryeol', 'ryeolg', 'ryeolm', 'ryeolb',
8 8
     'ryeols', 'ryeolt', 'ryeolp', 'ryeolh', 'ryeom', 'ryeob', 'ryeobs', 'ryeos', 'ryeoss', 'ryeong', 'ryeoj', 'ryeoc', 'ryeok', 'ryeot', 'ryeop', 'ryeoh',
Please login to merge, or discard this patch.
main/inc/lib/internationalization_database/transliteration/xbd.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 // $Id: xbd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $
3 3
 
4 4
 return array(
5
-  'en' => array('bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
5
+    'en' => array('bols', 'bolt', 'bolp', 'bolh', 'bom', 'bob', 'bobs', 'bos', 'boss', 'bong', 'boj', 'boc', 'bok', 'bot', 'bop', 'boh',
6 6
     'bwa', 'bwag', 'bwagg', 'bwags', 'bwan', 'bwanj', 'bwanh', 'bwad', 'bwal', 'bwalg', 'bwalm', 'bwalb', 'bwals', 'bwalt', 'bwalp', 'bwalh',
7 7
     'bwam', 'bwab', 'bwabs', 'bwas', 'bwass', 'bwang', 'bwaj', 'bwac', 'bwak', 'bwat', 'bwap', 'bwah', 'bwae', 'bwaeg', 'bwaegg', 'bwaegs',
8 8
     'bwaen', 'bwaenj', 'bwaenh', 'bwaed', 'bwael', 'bwaelg', 'bwaelm', 'bwaelb', 'bwaels', 'bwaelt', 'bwaelp', 'bwaelh', 'bwaem', 'bwaeb', 'bwaebs', 'bwaes',
Please login to merge, or discard this patch.
main/inc/lib/getid3/getid3.php 1 patch
Indentation   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
         $class = new $class_name($this);
301 301
 
302 302
         try {
303
-             $this->option_analyze and $class->Analyze();
303
+                $this->option_analyze and $class->Analyze();
304 304
             }
305 305
         catch (getid3_exception $e) {
306 306
             throw $e;
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
             // CalculateReplayGain() {
384 384
             if (@$this->info['replay_gain']) {
385 385
                 if (!@$this->info['replay_gain']['reference_volume']) {
386
-                     $this->info['replay_gain']['reference_volume'] = 89;
386
+                        $this->info['replay_gain']['reference_volume'] = 89;
387 387
                 }
388 388
                 if (isset($this->info['replay_gain']['track']['adjustment'])) {
389 389
                     $this->info['replay_gain']['track']['volume'] = $this->info['replay_gain']['reference_volume'] - $this->info['replay_gain']['track']['adjustment'];
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 
404 404
             // ProcessAudioStreams() {
405 405
             if (@!$this->info['audio']['streams'] && (@$this->info['audio']['bitrate'] || @$this->info['audio']['channels'] || @$this->info['audio']['sample_rate'])) {
406
-                  foreach ($this->info['audio'] as $key => $value) {
406
+                    foreach ($this->info['audio'] as $key => $value) {
407 407
                     if ($key != 'streams') {
408 408
                         $this->info['audio']['streams'][0][$key] = $value;
409 409
                     }
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
                             'group'     => 'audio',
545 545
                             'module'    => 'ac3',
546 546
                             'mime_type' => 'audio/ac3',
547
-                          ),
547
+                            ),
548 548
 
549 549
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADIF format
550 550
                 'adif' => array (
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
                             'module'    => 'aac_adif',
554 554
                             'mime_type' => 'application/octet-stream',
555 555
                             'fail_ape'  => 'WARNING',
556
-                          ),
556
+                            ),
557 557
 
558 558
 
559 559
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
                             'module'    => 'aac_adts',
564 564
                             'mime_type' => 'application/octet-stream',
565 565
                             'fail_ape'  => 'WARNING',
566
-                          ),
566
+                            ),
567 567
 
568 568
 
569 569
                 // AU   - audio       - NeXT/Sun AUdio (AU)
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
                             'group'     => 'audio',
573 573
                             'module'    => 'au',
574 574
                             'mime_type' => 'audio/basic',
575
-                          ),
575
+                            ),
576 576
 
577 577
                 // AVR  - audio       - Audio Visual Research
578 578
                 'avr'  => array (
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
                             'group'     => 'audio',
581 581
                             'module'    => 'avr',
582 582
                             'mime_type' => 'application/octet-stream',
583
-                          ),
583
+                            ),
584 584
 
585 585
                 // BONK - audio       - Bonk v0.9+
586 586
                 'bonk' => array (
@@ -588,15 +588,15 @@  discard block
 block discarded – undo
588 588
                             'group'     => 'audio',
589 589
                             'module'    => 'bonk',
590 590
                             'mime_type' => 'audio/xmms-bonk',
591
-                          ),
591
+                            ),
592 592
 
593 593
                 // DTS  - audio       - Dolby Theatre System
594
-				'dts'  => array(
595
-							'pattern'   => '^\x7F\xFE\x80\x01',
596
-							'group'     => 'audio',
597
-							'module'    => 'dts',
598
-							'mime_type' => 'audio/dts',
599
-						),
594
+                'dts'  => array(
595
+                            'pattern'   => '^\x7F\xFE\x80\x01',
596
+                            'group'     => 'audio',
597
+                            'module'    => 'dts',
598
+                            'mime_type' => 'audio/dts',
599
+                        ),
600 600
 
601 601
                 // FLAC - audio       - Free Lossless Audio Codec
602 602
                 'flac' => array (
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
                             'group'     => 'audio',
605 605
                             'module'    => 'xiph',
606 606
                             'mime_type' => 'audio/x-flac',
607
-                          ),
607
+                            ),
608 608
 
609 609
                 // LA   - audio       - Lossless Audio (LA)
610 610
                 'la'   => array (
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
                             'group'     => 'audio',
613 613
                             'module'    => 'la',
614 614
                             'mime_type' => 'application/octet-stream',
615
-                          ),
615
+                            ),
616 616
 
617 617
                 // LPAC - audio       - Lossless Predictive Audio Compression (LPAC)
618 618
                 'lpac' => array (
@@ -620,7 +620,7 @@  discard block
 block discarded – undo
620 620
                             'group'     => 'audio',
621 621
                             'module'    => 'lpac',
622 622
                             'mime_type' => 'application/octet-stream',
623
-                          ),
623
+                            ),
624 624
 
625 625
                 // MIDI - audio       - MIDI (Musical Instrument Digital Interface)
626 626
                 'midi' => array (
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
                             'group'     => 'audio',
629 629
                             'module'    => 'midi',
630 630
                             'mime_type' => 'audio/midi',
631
-                          ),
631
+                            ),
632 632
 
633 633
                 // MAC  - audio       - Monkey's Audio Compressor
634 634
                 'mac'  => array (
@@ -636,31 +636,31 @@  discard block
 block discarded – undo
636 636
                             'group'     => 'audio',
637 637
                             'module'    => 'monkey',
638 638
                             'mime_type' => 'application/octet-stream',
639
-                          ),
639
+                            ),
640 640
 
641 641
                 // MOD  - audio       - MODule (assorted sub-formats)
642 642
                 'mod'  => array (
643 643
                             'pattern'   => '^.{1080}(M.K.|[5-9]CHN|[1-3][0-9]CH)',
644 644
                             'mime_type' => 'audio/mod',
645
-                          ),
645
+                            ),
646 646
 
647 647
                 // MOD  - audio       - MODule (Impulse Tracker)
648 648
                 'it'   => array (
649 649
                             'pattern'   => '^IMPM',
650 650
                             'mime_type' => 'audio/it',
651
-                          ),
651
+                            ),
652 652
 
653 653
                 // MOD  - audio       - MODule (eXtended Module, various sub-formats)
654 654
                 'xm'   => array (
655 655
                             'pattern'   => '^Extended Module',
656 656
                             'mime_type' => 'audio/xm',
657
-                          ),
657
+                            ),
658 658
 
659 659
                 // MOD  - audio       - MODule (ScreamTracker)
660 660
                 's3m'  => array (
661 661
                             'pattern'   => '^.{44}SCRM',
662 662
                             'mime_type' => 'audio/s3m',
663
-                          ),
663
+                            ),
664 664
 
665 665
                 // MPC  - audio       - Musepack / MPEGplus SV7+
666 666
                 'mpc'  => array (
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
                             'group'     => 'audio',
669 669
                             'module'    => 'mpc',
670 670
                             'mime_type' => 'audio/x-musepack',
671
-                          ),
671
+                            ),
672 672
 
673 673
                 // MPC  - audio       - Musepack / MPEGplus SV4-6
674 674
                 'mpc_old' => array (
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
                             'group'     => 'audio',
677 677
                             'module'    => 'mpc_old',
678 678
                             'mime_type' => 'application/octet-stream',
679
-                          ),
679
+                            ),
680 680
 
681 681
 
682 682
                 // MP3  - audio       - MPEG-audio Layer 3 (very similar to AAC-ADTS)
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
                             'group'     => 'audio',
686 686
                             'module'    => 'mp3',
687 687
                             'mime_type' => 'audio/mpeg',
688
-                          ),
688
+                            ),
689 689
 
690 690
                 // OFR  - audio       - OptimFROG
691 691
                 'ofr'  => array (
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
693 693
                             'group'     => 'audio',
694 694
                             'module'    => 'optimfrog',
695 695
                             'mime_type' => 'application/octet-stream',
696
-                          ),
696
+                            ),
697 697
 
698 698
                 // RKAU - audio       - RKive AUdio compressor
699 699
                 'rkau' => array (
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
                             'group'     => 'audio',
702 702
                             'module'    => 'rkau',
703 703
                             'mime_type' => 'application/octet-stream',
704
-                          ),
704
+                            ),
705 705
 
706 706
                 // SHN  - audio       - Shorten
707 707
                 'shn'  => array (
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
                             'mime_type' => 'audio/xmms-shn',
712 712
                             'fail_id3'  => 'ERROR',
713 713
                             'fail_ape'  => 'ERROR',
714
-                          ),
714
+                            ),
715 715
 
716 716
                 // TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
717 717
                 'tta'  => array (
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
                             'group'     => 'audio',
720 720
                             'module'    => 'tta',
721 721
                             'mime_type' => 'application/octet-stream',
722
-                          ),
722
+                            ),
723 723
 
724 724
                 // VOC  - audio       - Creative Voice (VOC)
725 725
                 'voc'  => array (
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
                             'group'     => 'audio',
728 728
                             'module'    => 'voc',
729 729
                             'mime_type' => 'audio/voc',
730
-                          ),
730
+                            ),
731 731
 
732 732
                 // VQF  - audio       - transform-domain weighted interleave Vector Quantization Format (VQF)
733 733
                 'vqf'  => array (
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
                             'group'     => 'audio',
736 736
                             'module'    => 'vqf',
737 737
                             'mime_type' => 'application/octet-stream',
738
-                          ),
738
+                            ),
739 739
 
740 740
                 // WV  - audio        - WavPack (v4.0+)
741 741
                 'vw'  => array(
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
                             'group'     => 'audio',
744 744
                             'module'    => 'wavpack',
745 745
                             'mime_type' => 'application/octet-stream',
746
-                          ),
746
+                            ),
747 747
 
748 748
 
749 749
                 // Audio-Video formats
@@ -754,13 +754,13 @@  discard block
 block discarded – undo
754 754
                             'group'     => 'audio-video',
755 755
                             'module'    => 'asf',
756 756
                             'mime_type' => 'video/x-ms-asf',
757
-                          ),
757
+                            ),
758 758
 
759 759
                 // BINK  - audio/video - Bink / Smacker
760 760
                 'bink' => array(
761 761
                             'pattern'   => '^(BIK|SMK)',
762 762
                             'mime_type' => 'application/octet-stream',
763
-                          ),
763
+                            ),
764 764
 
765 765
                 // FLV  - audio/video - FLash Video
766 766
                 'flv' => array(
@@ -768,13 +768,13 @@  discard block
 block discarded – undo
768 768
                             'group'     => 'audio-video',
769 769
                             'module'    => 'flv',
770 770
                             'mime_type' => 'video/x-flv',
771
-                          ),
771
+                            ),
772 772
 
773 773
                 // MKAV - audio/video - Mastroka
774 774
                 'matroska' => array (
775 775
                             'pattern'   => '^\x1A\x45\xDF\xA3',
776 776
                             'mime_type' => 'application/octet-stream',
777
-                          ),
777
+                            ),
778 778
 
779 779
                 // MPEG - audio/video - MPEG (Moving Pictures Experts Group)
780 780
                 'mpeg' => array (
@@ -782,7 +782,7 @@  discard block
 block discarded – undo
782 782
                             'group'     => 'audio-video',
783 783
                             'module'    => 'mpeg',
784 784
                             'mime_type' => 'video/mpeg',
785
-                          ),
785
+                            ),
786 786
 
787 787
                 // NSV  - audio/video - Nullsoft Streaming Video (NSV)
788 788
                 'nsv'  => array (
@@ -790,7 +790,7 @@  discard block
 block discarded – undo
790 790
                             'group'     => 'audio-video',
791 791
                             'module'    => 'nsv',
792 792
                             'mime_type' => 'application/octet-stream',
793
-                          ),
793
+                            ),
794 794
 
795 795
                 // Ogg  - audio/video - Ogg (Ogg Vorbis, OggFLAC, Speex, Ogg Theora(*), Ogg Tarkin(*))
796 796
                 'ogg'  => array (
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
                             'mime_type' => 'application/ogg',
801 801
                             'fail_id3'  => 'WARNING',
802 802
                             'fail_ape'  => 'WARNING',
803
-                          ),
803
+                            ),
804 804
 
805 805
                 // QT   - audio/video - Quicktime
806 806
                 'quicktime' => array (
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
                             'group'     => 'audio-video',
809 809
                             'module'    => 'quicktime',
810 810
                             'mime_type' => 'video/quicktime',
811
-                          ),
811
+                            ),
812 812
 
813 813
                 // 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)
814 814
                 'riff' => array (
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
                             'module'    => 'riff',
818 818
                             'mime_type' => 'audio/x-wave',
819 819
                             'fail_ape'  => 'WARNING',
820
-                          ),
820
+                            ),
821 821
 
822 822
                 // Real - audio/video - RealAudio, RealVideo
823 823
                 'real' => array (
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
                             'group'     => 'audio-video',
826 826
                             'module'    => 'real',
827 827
                             'mime_type' => 'audio/x-realaudio',
828
-                          ),
828
+                            ),
829 829
 
830 830
                 // SWF - audio/video - ShockWave Flash
831 831
                 'swf' => array (
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
833 833
                             'group'     => 'audio-video',
834 834
                             'module'    => 'swf',
835 835
                             'mime_type' => 'application/x-shockwave-flash',
836
-                          ),
836
+                            ),
837 837
 
838 838
 
839 839
                 // Still-Image formats
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
                             'mime_type' => 'image/bmp',
847 847
                             'fail_id3'  => 'ERROR',
848 848
                             'fail_ape'  => 'ERROR',
849
-                          ),
849
+                            ),
850 850
 
851 851
                 // GIF  - still image - Graphics Interchange Format
852 852
                 'gif'  => array (
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
                             'mime_type' => 'image/gif',
857 857
                             'fail_id3'  => 'ERROR',
858 858
                             'fail_ape'  => 'ERROR',
859
-                          ),
859
+                            ),
860 860
 
861 861
                 // JPEG - still image - Joint Photographic Experts Group (JPEG)
862 862
                 'jpeg'  => array (
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
                             'mime_type' => 'image/jpeg',
867 867
                             'fail_id3'  => 'ERROR',
868 868
                             'fail_ape'  => 'ERROR',
869
-                          ),
869
+                            ),
870 870
 
871 871
                 // PCD  - still image - Kodak Photo CD
872 872
                 'pcd'  => array (
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
                             'mime_type' => 'image/x-photo-cd',
877 877
                             'fail_id3'  => 'ERROR',
878 878
                             'fail_ape'  => 'ERROR',
879
-                          ),
879
+                            ),
880 880
 
881 881
 
882 882
                 // PNG  - still image - Portable Network Graphics (PNG)
@@ -887,16 +887,16 @@  discard block
 block discarded – undo
887 887
                             'mime_type' => 'image/png',
888 888
                             'fail_id3'  => 'ERROR',
889 889
                             'fail_ape'  => 'ERROR',
890
-                          ),
890
+                            ),
891 891
 
892 892
 
893 893
                 // SVG  - still image - Scalable Vector Graphics (SVG)
894
-				'svg'  => array(
895
-							'pattern'   => '<!DOCTYPE svg PUBLIC ',
896
-							'mime_type' => 'image/svg+xml',
897
-							'fail_id3'  => 'ERROR',
898
-							'fail_ape'  => 'ERROR',
899
-						),
894
+                'svg'  => array(
895
+                            'pattern'   => '<!DOCTYPE svg PUBLIC ',
896
+                            'mime_type' => 'image/svg+xml',
897
+                            'fail_id3'  => 'ERROR',
898
+                            'fail_ape'  => 'ERROR',
899
+                        ),
900 900
 
901 901
 
902 902
                 // TIFF  - still image - Tagged Information File Format (TIFF)
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
                             'mime_type' => 'image/tiff',
908 908
                             'fail_id3'  => 'ERROR',
909 909
                             'fail_ape'  => 'ERROR',
910
-                          ),
910
+                            ),
911 911
 
912 912
 
913 913
                 // Data formats
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
                             'mime_type' => 'application/octet-stream',
918 918
                             'fail_id3'  => 'ERROR',
919 919
                             'fail_ape'  => 'ERROR',
920
-                          ),
920
+                            ),
921 921
 
922 922
                 // ISO  - data        - International Standards Organization (ISO) CD-ROM Image
923 923
                 'iso'  => array (
@@ -927,7 +927,7 @@  discard block
 block discarded – undo
927 927
                             'mime_type' => 'application/octet-stream',
928 928
                             'fail_id3'  => 'ERROR',
929 929
                             'fail_ape'  => 'ERROR',
930
-                          ),
930
+                            ),
931 931
 
932 932
                 // RAR  - data        - RAR compressed data
933 933
                 'rar'  => array(
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
935 935
                             'mime_type' => 'application/octet-stream',
936 936
                             'fail_id3'  => 'ERROR',
937 937
                             'fail_ape'  => 'ERROR',
938
-                          ),
938
+                            ),
939 939
 
940 940
                 // SZIP - audio       - SZIP compressed data
941 941
                 'szip' => array (
@@ -945,7 +945,7 @@  discard block
 block discarded – undo
945 945
                             'mime_type' => 'application/octet-stream',
946 946
                             'fail_id3'  => 'ERROR',
947 947
                             'fail_ape'  => 'ERROR',
948
-                          ),
948
+                            ),
949 949
 
950 950
                 // TAR  - data        - TAR compressed data
951 951
                 'tar'  => array(
@@ -955,7 +955,7 @@  discard block
 block discarded – undo
955 955
                             'mime_type' => 'application/x-tar',
956 956
                             'fail_id3'  => 'ERROR',
957 957
                             'fail_ape'  => 'ERROR',
958
-                          ),
958
+                            ),
959 959
 
960 960
                 // GZIP  - data        - GZIP compressed data
961 961
                 'gz'  => array(
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
965 965
                             'mime_type' => 'application/x-gzip',
966 966
                             'fail_id3'  => 'ERROR',
967 967
                             'fail_ape'  => 'ERROR',
968
-                          ),
968
+                            ),
969 969
 
970 970
 
971 971
                 // ZIP  - data        - ZIP compressed data
@@ -976,33 +976,33 @@  discard block
 block discarded – undo
976 976
                             'mime_type' => 'application/zip',
977 977
                             'fail_id3'  => 'ERROR',
978 978
                             'fail_ape'  => 'ERROR',
979
-                          ),
979
+                            ),
980 980
 
981 981
 
982 982
                 // PAR2 - data        - Parity Volume Set Specification 2.0
983 983
                 'par2' => array (
984
-                			'pattern'   => '^PAR2\x00PKT',
985
-							'mime_type' => 'application/octet-stream',
986
-							'fail_id3'  => 'ERROR',
987
-							'fail_ape'  => 'ERROR',
988
-						),
984
+                            'pattern'   => '^PAR2\x00PKT',
985
+                            'mime_type' => 'application/octet-stream',
986
+                            'fail_id3'  => 'ERROR',
987
+                            'fail_ape'  => 'ERROR',
988
+                        ),
989 989
 
990 990
 
991
-                 // PDF  - data       - Portable Document Format
992
-                 'pdf' => array(
991
+                    // PDF  - data       - Portable Document Format
992
+                    'pdf' => array(
993 993
                             'pattern'   => '^\x25PDF',
994 994
                             'mime_type' => 'application/pdf',
995 995
                             'fail_id3'  => 'ERROR',
996 996
                             'fail_ape'  => 'ERROR',
997
-                           ),
997
+                            ),
998 998
 
999
-                 // DOC  - data       - Microsoft Word
1000
-                 'msoffice' => array(
999
+                    // DOC  - data       - Microsoft Word
1000
+                    'msoffice' => array(
1001 1001
                             'pattern'   => '^\xD0\xCF\x11\xE0', // D0CF11E == DOCFILE == Microsoft Office Document
1002 1002
                             'mime_type' => 'application/octet-stream',
1003 1003
                             'fail_id3'  => 'ERROR',
1004 1004
                             'fail_ape'  => 'ERROR',
1005
-                          ),
1005
+                            ),
1006 1006
             );
1007 1007
 
1008 1008
         return $format_info;
@@ -1393,99 +1393,99 @@  discard block
 block discarded – undo
1393 1393
 
1394 1394
     public static function BigEndian2Float($byte_word) {
1395 1395
 
1396
-		// ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
1397
-		// http://www.psc.edu/general/software/packages/ieee/ieee.html
1398
-		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
1396
+        // ANSI/IEEE Standard 754-1985, Standard for Binary Floating Point Arithmetic
1397
+        // http://www.psc.edu/general/software/packages/ieee/ieee.html
1398
+        // http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
1399 1399
 
1400
-		$bit_word = getid3_lib::BigEndian2Bin($byte_word);
1401
-		if (!$bit_word) {
1400
+        $bit_word = getid3_lib::BigEndian2Bin($byte_word);
1401
+        if (!$bit_word) {
1402 1402
             return 0;
1403 1403
         }
1404
-		$sign_bit = $bit_word{0};
1405
-
1406
-		switch (strlen($byte_word) * 8) {
1407
-			case 32:
1408
-				$exponent_bits = 8;
1409
-				$fraction_bits = 23;
1410
-				break;
1411
-
1412
-			case 64:
1413
-				$exponent_bits = 11;
1414
-				$fraction_bits = 52;
1415
-				break;
1416
-
1417
-			case 80:
1418
-				// 80-bit Apple SANE format
1419
-				// http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
1420
-				$exponent_string = substr($bit_word, 1, 15);
1421
-				$is_normalized = intval($bit_word{16});
1422
-				$fraction_string = substr($bit_word, 17, 63);
1423
-				$exponent = pow(2, getid3_lib::Bin2Dec($exponent_string) - 16383);
1424
-				$fraction = $is_normalized + getid3_lib::DecimalBinary2Float($fraction_string);
1425
-				$float_value = $exponent * $fraction;
1426
-				if ($sign_bit == '1') {
1427
-					$float_value *= -1;
1428
-				}
1429
-				return $float_value;
1430
-				break;
1431
-
1432
-			default:
1433
-				return false;
1434
-				break;
1435
-		}
1436
-		$exponent_string = substr($bit_word, 1, $exponent_bits);
1437
-		$fraction_string = substr($bit_word, $exponent_bits + 1, $fraction_bits);
1438
-		$exponent = bindec($exponent_string);
1439
-		$fraction = bindec($fraction_string);
1440
-
1441
-		if (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction != 0)) {
1442
-			// Not a Number
1443
-			$float_value = false;
1444
-		} elseif (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction == 0)) {
1445
-			if ($sign_bit == '1') {
1446
-				$float_value = '-infinity';
1447
-			} else {
1448
-				$float_value = '+infinity';
1449
-			}
1450
-		} elseif (($exponent == 0) && ($fraction == 0)) {
1451
-			if ($sign_bit == '1') {
1452
-				$float_value = -0;
1453
-			} else {
1454
-				$float_value = 0;
1455
-			}
1456
-			$float_value = ($sign_bit ? 0 : -0);
1457
-		} elseif (($exponent == 0) && ($fraction != 0)) {
1458
-			// These are 'unnormalized' values
1459
-			$float_value = pow(2, (-1 * (pow(2, $exponent_bits - 1) - 2))) * getid3_lib::DecimalBinary2Float($fraction_string);
1460
-			if ($sign_bit == '1') {
1461
-				$float_value *= -1;
1462
-			}
1463
-		} elseif ($exponent != 0) {
1464
-			$float_value = pow(2, ($exponent - (pow(2, $exponent_bits - 1) - 1))) * (1 + getid3_lib::DecimalBinary2Float($fraction_string));
1465
-			if ($sign_bit == '1') {
1466
-				$float_value *= -1;
1467
-			}
1468
-		}
1469
-		return (float) $float_value;
1470
-	}
1471
-
1472
-
1473
-
1474
-	public static function LittleEndian2Float($byte_word) {
1475
-
1476
-		return getid3_lib::BigEndian2Float(strrev($byte_word));
1477
-	}
1478
-
1479
-
1480
-
1481
-	public static function DecimalBinary2Float($binary_numerator) {
1482
-		$numerator   = bindec($binary_numerator);
1483
-		$denominator = bindec('1'.str_repeat('0', strlen($binary_numerator)));
1484
-		return ($numerator / $denominator);
1485
-	}
1486
-
1487
-
1488
-	public static function PrintHexBytes($string, $hex=true, $spaces=true, $html_safe=true) {
1404
+        $sign_bit = $bit_word{0};
1405
+
1406
+        switch (strlen($byte_word) * 8) {
1407
+            case 32:
1408
+                $exponent_bits = 8;
1409
+                $fraction_bits = 23;
1410
+                break;
1411
+
1412
+            case 64:
1413
+                $exponent_bits = 11;
1414
+                $fraction_bits = 52;
1415
+                break;
1416
+
1417
+            case 80:
1418
+                // 80-bit Apple SANE format
1419
+                // http://www.mactech.com/articles/mactech/Vol.06/06.01/SANENormalized/
1420
+                $exponent_string = substr($bit_word, 1, 15);
1421
+                $is_normalized = intval($bit_word{16});
1422
+                $fraction_string = substr($bit_word, 17, 63);
1423
+                $exponent = pow(2, getid3_lib::Bin2Dec($exponent_string) - 16383);
1424
+                $fraction = $is_normalized + getid3_lib::DecimalBinary2Float($fraction_string);
1425
+                $float_value = $exponent * $fraction;
1426
+                if ($sign_bit == '1') {
1427
+                    $float_value *= -1;
1428
+                }
1429
+                return $float_value;
1430
+                break;
1431
+
1432
+            default:
1433
+                return false;
1434
+                break;
1435
+        }
1436
+        $exponent_string = substr($bit_word, 1, $exponent_bits);
1437
+        $fraction_string = substr($bit_word, $exponent_bits + 1, $fraction_bits);
1438
+        $exponent = bindec($exponent_string);
1439
+        $fraction = bindec($fraction_string);
1440
+
1441
+        if (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction != 0)) {
1442
+            // Not a Number
1443
+            $float_value = false;
1444
+        } elseif (($exponent == (pow(2, $exponent_bits) - 1)) && ($fraction == 0)) {
1445
+            if ($sign_bit == '1') {
1446
+                $float_value = '-infinity';
1447
+            } else {
1448
+                $float_value = '+infinity';
1449
+            }
1450
+        } elseif (($exponent == 0) && ($fraction == 0)) {
1451
+            if ($sign_bit == '1') {
1452
+                $float_value = -0;
1453
+            } else {
1454
+                $float_value = 0;
1455
+            }
1456
+            $float_value = ($sign_bit ? 0 : -0);
1457
+        } elseif (($exponent == 0) && ($fraction != 0)) {
1458
+            // These are 'unnormalized' values
1459
+            $float_value = pow(2, (-1 * (pow(2, $exponent_bits - 1) - 2))) * getid3_lib::DecimalBinary2Float($fraction_string);
1460
+            if ($sign_bit == '1') {
1461
+                $float_value *= -1;
1462
+            }
1463
+        } elseif ($exponent != 0) {
1464
+            $float_value = pow(2, ($exponent - (pow(2, $exponent_bits - 1) - 1))) * (1 + getid3_lib::DecimalBinary2Float($fraction_string));
1465
+            if ($sign_bit == '1') {
1466
+                $float_value *= -1;
1467
+            }
1468
+        }
1469
+        return (float) $float_value;
1470
+    }
1471
+
1472
+
1473
+
1474
+    public static function LittleEndian2Float($byte_word) {
1475
+
1476
+        return getid3_lib::BigEndian2Float(strrev($byte_word));
1477
+    }
1478
+
1479
+
1480
+
1481
+    public static function DecimalBinary2Float($binary_numerator) {
1482
+        $numerator   = bindec($binary_numerator);
1483
+        $denominator = bindec('1'.str_repeat('0', strlen($binary_numerator)));
1484
+        return ($numerator / $denominator);
1485
+    }
1486
+
1487
+
1488
+    public static function PrintHexBytes($string, $hex=true, $spaces=true, $html_safe=true) {
1489 1489
 
1490 1490
         $return_string = '';
1491 1491
         for ($i = 0; $i < strlen($string); $i++) {
Please login to merge, or discard this patch.
main/inc/lib/sessionmanager.lib.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6022,7 +6022,7 @@
 block discarded – undo
6022 6022
         ]);
6023 6023
     }
6024 6024
 
6025
-	/**
6025
+    /**
6026 6026
      * Get the count of user courses in session
6027 6027
      * @param int $sessionId The session id
6028 6028
      * @return array
Please login to merge, or discard this patch.
main/inc/lib/magpierss/extlib/Snoopy.class.inc 1 patch
Indentation   +666 added lines, -666 removed lines patch added patch discarded remove patch
@@ -36,81 +36,81 @@  discard block
 block discarded – undo
36 36
 *************************************************/
37 37
 
38 38
 class Snoopy {
39
-	/**** Public variables ****/
39
+    /**** Public variables ****/
40 40
 	
41
-	/* user definable vars */
42
-
43
-	public $host			=	"www.php.net";		// host name we are connecting to
44
-	public $port			=	80;					// port we are connecting to
45
-	public $proxy_host		=	"";					// proxy host to use
46
-	public $proxy_port		=	"";					// proxy port to use
47
-	public $agent			=	"Snoopy v1.0";		// agent we masquerade as
48
-	public $referer		=	"";					// referer info to pass
49
-	public $cookies		=	array();			// array of cookies to pass
50
-												// $cookies["username"]="joe";
51
-	public	$rawheaders		=	array();			// array of raw headers to send
52
-												// $rawheaders["Content-type"]="text/html";
53
-
54
-	public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
55
-	public $lastredirectaddr	=	"";				// contains address of last redirected address
56
-	public	$offsiteok		=	true;				// allows redirection off-site
57
-	public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
58
-	public $expandlinks	=	true;				// expand links to fully qualified URLs.
59
-												// this only applies to fetchlinks()
60
-												// or submitlinks()
61
-	public $passcookies	=	true;				// pass set cookies back through redirects
62
-												// NOTE: this currently does not respect
63
-												// dates, domains or paths.
41
+    /* user definable vars */
42
+
43
+    public $host			=	"www.php.net";		// host name we are connecting to
44
+    public $port			=	80;					// port we are connecting to
45
+    public $proxy_host		=	"";					// proxy host to use
46
+    public $proxy_port		=	"";					// proxy port to use
47
+    public $agent			=	"Snoopy v1.0";		// agent we masquerade as
48
+    public $referer		=	"";					// referer info to pass
49
+    public $cookies		=	array();			// array of cookies to pass
50
+                                                // $cookies["username"]="joe";
51
+    public	$rawheaders		=	array();			// array of raw headers to send
52
+                                                // $rawheaders["Content-type"]="text/html";
53
+
54
+    public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
55
+    public $lastredirectaddr	=	"";				// contains address of last redirected address
56
+    public	$offsiteok		=	true;				// allows redirection off-site
57
+    public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
58
+    public $expandlinks	=	true;				// expand links to fully qualified URLs.
59
+                                                // this only applies to fetchlinks()
60
+                                                // or submitlinks()
61
+    public $passcookies	=	true;				// pass set cookies back through redirects
62
+                                                // NOTE: this currently does not respect
63
+                                                // dates, domains or paths.
64 64
 	
65
-	public	$user			=	"";					// user for http authentication
66
-	public	$pass			=	"";					// password for http authentication
65
+    public	$user			=	"";					// user for http authentication
66
+    public	$pass			=	"";					// password for http authentication
67 67
 	
68
-	// http accept types
69
-	public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
68
+    // http accept types
69
+    public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
70 70
 	
71
-	public $results		=	"";					// where the content is put
71
+    public $results		=	"";					// where the content is put
72 72
 		
73
-	public $error			=	"";					// error messages sent here
74
-	public	$response_code	=	"";					// response code returned from server
75
-	public	$headers		=	array();			// headers returned from server sent here
76
-	public	$maxlength		=	500000;				// max return data length (body)
77
-	public $read_timeout	=	0;					// timeout on read operations, in seconds
78
-												// supported only since PHP 4 Beta 4
79
-												// set to 0 to disallow timeouts
80
-	public $timed_out		=	false;				// if a read operation timed out
81
-	public	$status			=	0;					// http request status
73
+    public $error			=	"";					// error messages sent here
74
+    public	$response_code	=	"";					// response code returned from server
75
+    public	$headers		=	array();			// headers returned from server sent here
76
+    public	$maxlength		=	500000;				// max return data length (body)
77
+    public $read_timeout	=	0;					// timeout on read operations, in seconds
78
+                                                // supported only since PHP 4 Beta 4
79
+                                                // set to 0 to disallow timeouts
80
+    public $timed_out		=	false;				// if a read operation timed out
81
+    public	$status			=	0;					// http request status
82 82
 	
83
-	public	$curl_path		=	"/usr/bin/curl";
84
-												// Snoopy will use cURL for fetching
85
-												// SSL content if a full system path to
86
-												// the cURL binary is supplied here.
87
-												// set to false if you do not have
88
-												// cURL installed. See http://curl.haxx.se
89
-												// for details on installing cURL.
90
-												// Snoopy does *not* use the cURL
91
-												// library functions built into php,
92
-												// as these functions are not stable
93
-												// as of this Snoopy release.
83
+    public	$curl_path		=	"/usr/bin/curl";
84
+                                                // Snoopy will use cURL for fetching
85
+                                                // SSL content if a full system path to
86
+                                                // the cURL binary is supplied here.
87
+                                                // set to false if you do not have
88
+                                                // cURL installed. See http://curl.haxx.se
89
+                                                // for details on installing cURL.
90
+                                                // Snoopy does *not* use the cURL
91
+                                                // library functions built into php,
92
+                                                // as these functions are not stable
93
+                                                // as of this Snoopy release.
94 94
 	
95
-	// send Accept-encoding: gzip?
96
-	public $use_gzip		= true;	
95
+    // send Accept-encoding: gzip?
96
+    public $use_gzip		= true;	
97 97
 	
98
-	/**** Private variables ****/	
98
+    /**** Private variables ****/	
99 99
 	
100
-	private	$_maxlinelen	=	4096;				// max line length (headers)
100
+    private	$_maxlinelen	=	4096;				// max line length (headers)
101 101
 	
102
-	private $_httpmethod	=	"GET";				// default http request method
103
-	private $_httpversion	=	"HTTP/1.0";			// default http request version
104
-	private $_submit_method	=	"POST";				// default submit method
105
-	private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
106
-	private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
107
-	private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
108
-	private $_redirectdepth	=	0;					// increments on an http redirect
109
-	private $_frameurls		= 	array();			// frame src urls
110
-	private $_framedepth	=	0;					// increments on frame depth
102
+    private $_httpmethod	=	"GET";				// default http request method
103
+    private $_httpversion	=	"HTTP/1.0";			// default http request version
104
+    private $_submit_method	=	"POST";				// default submit method
105
+    private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
106
+    private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
107
+    private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
108
+    private $_redirectdepth	=	0;					// increments on an http redirect
109
+    private $_frameurls		= 	array();			// frame src urls
110
+    private $_framedepth	=	0;					// increments on frame depth
111 111
 	
112
-	private $_isproxy		=	false;				// set if using a proxy server
113
-	private $_fp_timeout	=	30;					// timeout for socket connection
112
+    private $_isproxy		=	false;				// set if using a proxy server
113
+    private $_fp_timeout	=	30;					// timeout for socket connection
114 114
 
115 115
 /*======================================================================*\
116 116
 	Function:	fetch
@@ -121,136 +121,136 @@  discard block
 block discarded – undo
121 121
 	Output:		$this->results	the output text from the fetch
122 122
 \*======================================================================*/
123 123
 
124
-	public function fetch($URI) {
125
-		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
126
-		$URI_PARTS = parse_url($URI);
127
-		if (!empty($URI_PARTS["user"]))
128
-			$this->user = $URI_PARTS["user"];
129
-		if (!empty($URI_PARTS["pass"]))
130
-			$this->pass = $URI_PARTS["pass"];
131
-		if (!isset($fp)) { $fp = false; }
132
-		switch ($URI_PARTS["scheme"]) {
133
-			case "http":
134
-				$this->host = $URI_PARTS["host"];
135
-				if(!empty($URI_PARTS["port"]))
136
-					$this->port = $URI_PARTS["port"];
137
-				if($this->_connect($fp))
138
-				{
139
-					if($this->_isproxy)
140
-					{
141
-						// using proxy, send entire URI
142
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
143
-					}
144
-					else
145
-					{
146
-						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
147
-						// no proxy, send only the path
148
-						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
149
-					}
124
+    public function fetch($URI) {
125
+        //preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
126
+        $URI_PARTS = parse_url($URI);
127
+        if (!empty($URI_PARTS["user"]))
128
+            $this->user = $URI_PARTS["user"];
129
+        if (!empty($URI_PARTS["pass"]))
130
+            $this->pass = $URI_PARTS["pass"];
131
+        if (!isset($fp)) { $fp = false; }
132
+        switch ($URI_PARTS["scheme"]) {
133
+            case "http":
134
+                $this->host = $URI_PARTS["host"];
135
+                if(!empty($URI_PARTS["port"]))
136
+                    $this->port = $URI_PARTS["port"];
137
+                if($this->_connect($fp))
138
+                {
139
+                    if($this->_isproxy)
140
+                    {
141
+                        // using proxy, send entire URI
142
+                        $this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
143
+                    }
144
+                    else
145
+                    {
146
+                        $path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
147
+                        // no proxy, send only the path
148
+                        $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
149
+                    }
150 150
 					
151
-					$this->_disconnect($fp);
152
-
153
-					if($this->_redirectaddr)
154
-					{
155
-						/* url was redirected, check if we've hit the max depth */
156
-						if($this->maxredirs > $this->_redirectdepth)
157
-						{
158
-							// only follow redirect if it's on this site, or offsiteok is true
159
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
160
-							{
161
-								/* follow the redirect */
162
-								$this->_redirectdepth++;
163
-								$this->lastredirectaddr=$this->_redirectaddr;
164
-								$this->fetch($this->_redirectaddr);
165
-							}
166
-						}
167
-					}
168
-
169
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
170
-					{
171
-						$frameurls = $this->_frameurls;
172
-						$this->_frameurls = array();
151
+                    $this->_disconnect($fp);
152
+
153
+                    if($this->_redirectaddr)
154
+                    {
155
+                        /* url was redirected, check if we've hit the max depth */
156
+                        if($this->maxredirs > $this->_redirectdepth)
157
+                        {
158
+                            // only follow redirect if it's on this site, or offsiteok is true
159
+                            if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
160
+                            {
161
+                                /* follow the redirect */
162
+                                $this->_redirectdepth++;
163
+                                $this->lastredirectaddr=$this->_redirectaddr;
164
+                                $this->fetch($this->_redirectaddr);
165
+                            }
166
+                        }
167
+                    }
168
+
169
+                    if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
170
+                    {
171
+                        $frameurls = $this->_frameurls;
172
+                        $this->_frameurls = array();
173 173
 						
174
-						while(list(,$frameurl) = each($frameurls))
175
-						{
176
-							if($this->_framedepth < $this->maxframes)
177
-							{
178
-								$this->fetch($frameurl);
179
-								$this->_framedepth++;
180
-							}
181
-							else
182
-								break;
183
-						}
184
-					}					
185
-				}
186
-				else
187
-				{
188
-					return false;
189
-				}
190
-				return true;					
191
-				break;
192
-			case "https":
193
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
194
-					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
195
-					return false;
196
-				}
197
-				$this->host = $URI_PARTS["host"];
198
-				if(!empty($URI_PARTS["port"]))
199
-					$this->port = $URI_PARTS["port"];
200
-				if($this->_isproxy)
201
-				{
202
-					// using proxy, send entire URI
203
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
204
-				}
205
-				else
206
-				{
207
-					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
208
-					// no proxy, send only the path
209
-					$this->_httpsrequest($path, $URI, $this->_httpmethod);
210
-				}
211
-
212
-				if($this->_redirectaddr)
213
-				{
214
-					/* url was redirected, check if we've hit the max depth */
215
-					if($this->maxredirs > $this->_redirectdepth)
216
-					{
217
-						// only follow redirect if it's on this site, or offsiteok is true
218
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
219
-						{
220
-							/* follow the redirect */
221
-							$this->_redirectdepth++;
222
-							$this->lastredirectaddr=$this->_redirectaddr;
223
-							$this->fetch($this->_redirectaddr);
224
-						}
225
-					}
226
-				}
227
-
228
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
229
-				{
230
-					$frameurls = $this->_frameurls;
231
-					$this->_frameurls = array();
232
-
233
-					while(list(,$frameurl) = each($frameurls))
234
-					{
235
-						if($this->_framedepth < $this->maxframes)
236
-						{
237
-							$this->fetch($frameurl);
238
-							$this->_framedepth++;
239
-						}
240
-						else
241
-							break;
242
-					}
243
-				}					
244
-				return true;					
245
-				break;
246
-			default:
247
-				// not a valid protocol
248
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
249
-				return false;
250
-				break;
251
-		}		
252
-		return true;
253
-	}
174
+                        while(list(,$frameurl) = each($frameurls))
175
+                        {
176
+                            if($this->_framedepth < $this->maxframes)
177
+                            {
178
+                                $this->fetch($frameurl);
179
+                                $this->_framedepth++;
180
+                            }
181
+                            else
182
+                                break;
183
+                        }
184
+                    }					
185
+                }
186
+                else
187
+                {
188
+                    return false;
189
+                }
190
+                return true;					
191
+                break;
192
+            case "https":
193
+                if(!$this->curl_path || (!is_executable($this->curl_path))) {
194
+                    $this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
195
+                    return false;
196
+                }
197
+                $this->host = $URI_PARTS["host"];
198
+                if(!empty($URI_PARTS["port"]))
199
+                    $this->port = $URI_PARTS["port"];
200
+                if($this->_isproxy)
201
+                {
202
+                    // using proxy, send entire URI
203
+                    $this->_httpsrequest($URI,$URI,$this->_httpmethod);
204
+                }
205
+                else
206
+                {
207
+                    $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
208
+                    // no proxy, send only the path
209
+                    $this->_httpsrequest($path, $URI, $this->_httpmethod);
210
+                }
211
+
212
+                if($this->_redirectaddr)
213
+                {
214
+                    /* url was redirected, check if we've hit the max depth */
215
+                    if($this->maxredirs > $this->_redirectdepth)
216
+                    {
217
+                        // only follow redirect if it's on this site, or offsiteok is true
218
+                        if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
219
+                        {
220
+                            /* follow the redirect */
221
+                            $this->_redirectdepth++;
222
+                            $this->lastredirectaddr=$this->_redirectaddr;
223
+                            $this->fetch($this->_redirectaddr);
224
+                        }
225
+                    }
226
+                }
227
+
228
+                if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
229
+                {
230
+                    $frameurls = $this->_frameurls;
231
+                    $this->_frameurls = array();
232
+
233
+                    while(list(,$frameurl) = each($frameurls))
234
+                    {
235
+                        if($this->_framedepth < $this->maxframes)
236
+                        {
237
+                            $this->fetch($frameurl);
238
+                            $this->_framedepth++;
239
+                        }
240
+                        else
241
+                            break;
242
+                    }
243
+                }					
244
+                return true;					
245
+                break;
246
+            default:
247
+                // not a valid protocol
248
+                $this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
249
+                return false;
250
+                break;
251
+        }		
252
+        return true;
253
+    }
254 254
 
255 255
 
256 256
 
@@ -266,32 +266,32 @@  discard block
 block discarded – undo
266 266
 	Output:		$match		an array of the links
267 267
 \*======================================================================*/
268 268
 
269
-	private function _striplinks($document)
270
-	{	
271
-		preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
269
+    private function _striplinks($document)
270
+    {	
271
+        preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
272 272
 						([\"\'])?					# find single or double quote
273 273
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
274 274
 													# quote, otherwise match up to next space
275 275
 						'isx",$document,$links);
276 276
 						
277 277
 
278
-		// catenate the non-empty matches from the conditional subpattern
278
+        // catenate the non-empty matches from the conditional subpattern
279 279
 
280
-		while(list($key,$val) = each($links[2]))
281
-		{
282
-			if(!empty($val))
283
-				$match[] = $val;
284
-		}				
280
+        while(list($key,$val) = each($links[2]))
281
+        {
282
+            if(!empty($val))
283
+                $match[] = $val;
284
+        }				
285 285
 		
286
-		while(list($key,$val) = each($links[3]))
287
-		{
288
-			if(!empty($val))
289
-				$match[] = $val;
290
-		}		
286
+        while(list($key,$val) = each($links[3]))
287
+        {
288
+            if(!empty($val))
289
+                $match[] = $val;
290
+        }		
291 291
 		
292
-		// return the links
293
-		return $match;
294
-	}
292
+        // return the links
293
+        return $match;
294
+    }
295 295
 
296 296
 /*======================================================================*\
297 297
 	Function:	_stripform
@@ -300,16 +300,16 @@  discard block
 block discarded – undo
300 300
 	Output:		$match		an array of the links
301 301
 \*======================================================================*/
302 302
 
303
-	private function _stripform($document)
304
-	{	
305
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
303
+    private function _stripform($document)
304
+    {	
305
+        preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
306 306
 		
307
-		// catenate the matches
308
-		$match = implode("\r\n",$elements[0]);
307
+        // catenate the matches
308
+        $match = implode("\r\n",$elements[0]);
309 309
 				
310
-		// return the links
311
-		return $match;
312
-	}
310
+        // return the links
311
+        return $match;
312
+    }
313 313
 
314 314
 	
315 315
 	
@@ -320,43 +320,43 @@  discard block
 block discarded – undo
320 320
 	Output:		$text		the resulting text
321 321
 \*======================================================================*/
322 322
 
323
-	private function _striptext($document)
324
-	{
323
+    private function _striptext($document)
324
+    {
325 325
 		
326
-		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
327
-		// so, list your entities one by one here. I included some of the
328
-		// more common ones.
326
+        // I didn't use preg eval (//e) since that is only available in PHP 4.0.
327
+        // so, list your entities one by one here. I included some of the
328
+        // more common ones.
329 329
 								
330
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
331
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
332
-						"'([\r\n])[\s]+'",					// strip out white space
333
-						"'&(quote|#34);'i",					// replace html entities
334
-						"'&(amp|#38);'i",
335
-						"'&(lt|#60);'i",
336
-						"'&(gt|#62);'i",
337
-						"'&(nbsp|#160);'i",
338
-						"'&(iexcl|#161);'i",
339
-						"'&(cent|#162);'i",
340
-						"'&(pound|#163);'i",
341
-						"'&(copy|#169);'i"
342
-						);				
343
-		$replace = array(	"",
344
-							"",
345
-							"\\1",
346
-							"\"",
347
-							"&",
348
-							"<",
349
-							">",
350
-							" ",
351
-							chr(161),
352
-							chr(162),
353
-							chr(163),
354
-							chr(169));
330
+        $search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
331
+                        "'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
332
+                        "'([\r\n])[\s]+'",					// strip out white space
333
+                        "'&(quote|#34);'i",					// replace html entities
334
+                        "'&(amp|#38);'i",
335
+                        "'&(lt|#60);'i",
336
+                        "'&(gt|#62);'i",
337
+                        "'&(nbsp|#160);'i",
338
+                        "'&(iexcl|#161);'i",
339
+                        "'&(cent|#162);'i",
340
+                        "'&(pound|#163);'i",
341
+                        "'&(copy|#169);'i"
342
+                        );				
343
+        $replace = array(	"",
344
+                            "",
345
+                            "\\1",
346
+                            "\"",
347
+                            "&",
348
+                            "<",
349
+                            ">",
350
+                            " ",
351
+                            chr(161),
352
+                            chr(162),
353
+                            chr(163),
354
+                            chr(169));
355 355
 					
356
-		$text = preg_replace($search,$replace,$document);
356
+        $text = preg_replace($search,$replace,$document);
357 357
 								
358
-		return $text;
359
-	}
358
+        return $text;
359
+    }
360 360
 
361 361
 /*======================================================================*\
362 362
 	Function:	_expandlinks
@@ -366,29 +366,29 @@  discard block
 block discarded – undo
366 366
 	Output:		$expandedLinks	the expanded links
367 367
 \*======================================================================*/
368 368
 
369
-	private function _expandlinks($links,$URI)
370
-	{
369
+    private function _expandlinks($links,$URI)
370
+    {
371 371
 		
372
-		preg_match("/^[^\?]+/",$URI,$match);
372
+        preg_match("/^[^\?]+/",$URI,$match);
373 373
 
374
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
374
+        $match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
375 375
 				
376
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
377
-							"|^(?!http://)(\/)?(?!mailto:)|i",
378
-							"|/\./|",
379
-							"|/[^\/]+/\.\./|"
380
-						);
376
+        $search = array( 	"|^http://".preg_quote($this->host)."|i",
377
+                            "|^(?!http://)(\/)?(?!mailto:)|i",
378
+                            "|/\./|",
379
+                            "|/[^\/]+/\.\./|"
380
+                        );
381 381
 						
382
-		$replace = array(	"",
383
-							$match."/",
384
-							"/",
385
-							"/"
386
-						);			
382
+        $replace = array(	"",
383
+                            $match."/",
384
+                            "/",
385
+                            "/"
386
+                        );			
387 387
 				
388
-		$expandedLinks = preg_replace($search,$replace,$links);
388
+        $expandedLinks = preg_replace($search,$replace,$links);
389 389
 
390
-		return $expandedLinks;
391
-	}
390
+        return $expandedLinks;
391
+    }
392 392
 
393 393
 /*======================================================================*\
394 394
 	Function:	_httprequest
@@ -400,179 +400,179 @@  discard block
 block discarded – undo
400 400
 	Output:		
401 401
 \*======================================================================*/
402 402
 	
403
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
404
-	{
405
-		if($this->passcookies && $this->_redirectaddr)
406
-			$this->setcookies();
403
+    private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
404
+    {
405
+        if($this->passcookies && $this->_redirectaddr)
406
+            $this->setcookies();
407 407
 			
408
-		$URI_PARTS = parse_url($URI);
409
-		if(empty($url))
410
-			$url = "/";
411
-		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
412
-		if(!empty($this->agent))
413
-			$headers .= "User-Agent: ".$this->agent."\r\n";
414
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
415
-			$headers .= "Host: ".$this->host."\r\n";
416
-		if(!empty($this->accept))
417
-			$headers .= "Accept: ".$this->accept."\r\n";
408
+        $URI_PARTS = parse_url($URI);
409
+        if(empty($url))
410
+            $url = "/";
411
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
412
+        if(!empty($this->agent))
413
+            $headers .= "User-Agent: ".$this->agent."\r\n";
414
+        if(!empty($this->host) && !isset($this->rawheaders['Host']))
415
+            $headers .= "Host: ".$this->host."\r\n";
416
+        if(!empty($this->accept))
417
+            $headers .= "Accept: ".$this->accept."\r\n";
418 418
 		
419
-		if($this->use_gzip) {
420
-			// make sure PHP was built with --with-zlib
421
-			// and we can handle gzipp'ed data
422
-			if ( function_exists(gzinflate) ) {
423
-			   $headers .= "Accept-encoding: gzip\r\n";
424
-			}
425
-			else {
426
-			   trigger_error(
427
-			   	"use_gzip is on, but PHP was built without zlib support.".
428
-				"  Requesting file(s) without gzip encoding.", 
429
-				E_USER_NOTICE);
430
-			}
431
-		}
419
+        if($this->use_gzip) {
420
+            // make sure PHP was built with --with-zlib
421
+            // and we can handle gzipp'ed data
422
+            if ( function_exists(gzinflate) ) {
423
+                $headers .= "Accept-encoding: gzip\r\n";
424
+            }
425
+            else {
426
+                trigger_error(
427
+                    "use_gzip is on, but PHP was built without zlib support.".
428
+                "  Requesting file(s) without gzip encoding.", 
429
+                E_USER_NOTICE);
430
+            }
431
+        }
432 432
 		
433
-		if(!empty($this->referer))
434
-			$headers .= "Referer: ".$this->referer."\r\n";
435
-		if(!empty($this->cookies))
436
-		{			
437
-			if(!is_array($this->cookies))
438
-				$this->cookies = (array)$this->cookies;
433
+        if(!empty($this->referer))
434
+            $headers .= "Referer: ".$this->referer."\r\n";
435
+        if(!empty($this->cookies))
436
+        {			
437
+            if(!is_array($this->cookies))
438
+                $this->cookies = (array)$this->cookies;
439 439
 	
440
-			reset($this->cookies);
441
-			if ( count($this->cookies) > 0 ) {
442
-				$cookie_headers .= 'Cookie: ';
443
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
444
-				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
445
-				}
446
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
447
-			} 
448
-		}
449
-		if(!empty($this->rawheaders))
450
-		{
451
-			if(!is_array($this->rawheaders))
452
-				$this->rawheaders = (array)$this->rawheaders;
453
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
454
-				$headers .= $headerKey.": ".$headerVal."\r\n";
455
-		}
456
-		if(!empty($content_type)) {
457
-			$headers .= "Content-type: $content_type";
458
-			if ($content_type == "multipart/form-data")
459
-				$headers .= "; boundary=".$this->_mime_boundary;
460
-			$headers .= "\r\n";
461
-		}
462
-		if(!empty($body))	
463
-			$headers .= "Content-length: ".strlen($body)."\r\n";
464
-		if(!empty($this->user) || !empty($this->pass))	
465
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
466
-
467
-		$headers .= "\r\n";
440
+            reset($this->cookies);
441
+            if ( count($this->cookies) > 0 ) {
442
+                $cookie_headers .= 'Cookie: ';
443
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
444
+                $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
445
+                }
446
+                $headers .= substr($cookie_headers,0,-2) . "\r\n";
447
+            } 
448
+        }
449
+        if(!empty($this->rawheaders))
450
+        {
451
+            if(!is_array($this->rawheaders))
452
+                $this->rawheaders = (array)$this->rawheaders;
453
+            while(list($headerKey,$headerVal) = each($this->rawheaders))
454
+                $headers .= $headerKey.": ".$headerVal."\r\n";
455
+        }
456
+        if(!empty($content_type)) {
457
+            $headers .= "Content-type: $content_type";
458
+            if ($content_type == "multipart/form-data")
459
+                $headers .= "; boundary=".$this->_mime_boundary;
460
+            $headers .= "\r\n";
461
+        }
462
+        if(!empty($body))	
463
+            $headers .= "Content-length: ".strlen($body)."\r\n";
464
+        if(!empty($this->user) || !empty($this->pass))	
465
+            $headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
466
+
467
+        $headers .= "\r\n";
468 468
 		
469
-		// set the read timeout if needed
470
-		if ($this->read_timeout > 0)
471
-			socket_set_timeout($fp, $this->read_timeout);
472
-		$this->timed_out = false;
469
+        // set the read timeout if needed
470
+        if ($this->read_timeout > 0)
471
+            socket_set_timeout($fp, $this->read_timeout);
472
+        $this->timed_out = false;
473 473
 		
474
-		fwrite($fp,$headers.$body,strlen($headers.$body));
474
+        fwrite($fp,$headers.$body,strlen($headers.$body));
475 475
 		
476
-		$this->_redirectaddr = false;
477
-		unset($this->headers);
476
+        $this->_redirectaddr = false;
477
+        unset($this->headers);
478 478
 		
479
-		// content was returned gzip encoded?
480
-		$is_gzipped = false;
479
+        // content was returned gzip encoded?
480
+        $is_gzipped = false;
481 481
 						
482
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
483
-		{
484
-			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
485
-			{
486
-				$this->status=-100;
487
-				return false;
488
-			}
482
+        while($currentHeader = fgets($fp,$this->_maxlinelen))
483
+        {
484
+            if ($this->read_timeout > 0 && $this->_check_timeout($fp))
485
+            {
486
+                $this->status=-100;
487
+                return false;
488
+            }
489 489
 				
490
-		//	if($currentHeader == "\r\n")
491
-			if(preg_match("/^\r?\n$/", $currentHeader) )
492
-			      break;
490
+        //	if($currentHeader == "\r\n")
491
+            if(preg_match("/^\r?\n$/", $currentHeader) )
492
+                    break;
493 493
 						
494
-			// if a header begins with Location: or URI:, set the redirect
495
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
496
-			{
497
-				// get URL portion of the redirect
498
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
499
-				// look for :// in the Location header to see if hostname is included
500
-				if(!preg_match("|\:\/\/|",$matches[2]))
501
-				{
502
-					// no host in the path, so prepend
503
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
504
-					// eliminate double slash
505
-					if(!preg_match("|^/|",$matches[2]))
506
-							$this->_redirectaddr .= "/".$matches[2];
507
-					else
508
-							$this->_redirectaddr .= $matches[2];
509
-				}
510
-				else
511
-					$this->_redirectaddr = $matches[2];
512
-			}
494
+            // if a header begins with Location: or URI:, set the redirect
495
+            if(preg_match("/^(Location:|URI:)/i",$currentHeader))
496
+            {
497
+                // get URL portion of the redirect
498
+                preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
499
+                // look for :// in the Location header to see if hostname is included
500
+                if(!preg_match("|\:\/\/|",$matches[2]))
501
+                {
502
+                    // no host in the path, so prepend
503
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
504
+                    // eliminate double slash
505
+                    if(!preg_match("|^/|",$matches[2]))
506
+                            $this->_redirectaddr .= "/".$matches[2];
507
+                    else
508
+                            $this->_redirectaddr .= $matches[2];
509
+                }
510
+                else
511
+                    $this->_redirectaddr = $matches[2];
512
+            }
513 513
 		
514
-			if(preg_match("|^HTTP/|",$currentHeader))
515
-			{
514
+            if(preg_match("|^HTTP/|",$currentHeader))
515
+            {
516 516
                 if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
517
-				{
518
-					$this->status= $status[1];
517
+                {
518
+                    $this->status= $status[1];
519 519
                 }				
520
-				$this->response_code = $currentHeader;
521
-			}
520
+                $this->response_code = $currentHeader;
521
+            }
522 522
 			
523
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
524
-				$is_gzipped = true;
525
-			}
523
+            if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
524
+                $is_gzipped = true;
525
+            }
526 526
 			
527
-			$this->headers[] = $currentHeader;
528
-		}
529
-
530
-		# $results = fread($fp, $this->maxlength);
531
-		$results = "";
532
-		while ( $data = fread($fp, $this->maxlength) ) {
533
-		    $results .= $data;
534
-		    if (
535
-		        strlen($results) > $this->maxlength ) {
536
-		        break;
537
-		    }
538
-		}
527
+            $this->headers[] = $currentHeader;
528
+        }
529
+
530
+        # $results = fread($fp, $this->maxlength);
531
+        $results = "";
532
+        while ( $data = fread($fp, $this->maxlength) ) {
533
+            $results .= $data;
534
+            if (
535
+                strlen($results) > $this->maxlength ) {
536
+                break;
537
+            }
538
+        }
539 539
 		
540
-		// gunzip
541
-		if ( $is_gzipped ) {
542
-			// per http://www.php.net/manual/en/function.gzencode.php
543
-			$results = substr($results, 10);
544
-			$results = gzinflate($results);
545
-		}
540
+        // gunzip
541
+        if ( $is_gzipped ) {
542
+            // per http://www.php.net/manual/en/function.gzencode.php
543
+            $results = substr($results, 10);
544
+            $results = gzinflate($results);
545
+        }
546 546
 		
547
-		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
548
-		{
549
-			$this->status=-100;
550
-			return false;
551
-		}
547
+        if ($this->read_timeout > 0 && $this->_check_timeout($fp))
548
+        {
549
+            $this->status=-100;
550
+            return false;
551
+        }
552 552
 		
553
-		// check if there is a a redirect meta tag
553
+        // check if there is a a redirect meta tag
554 554
 		
555
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
556
-		{
557
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
558
-		}
559
-
560
-		// have we hit our frame depth and is there frame src to fetch?
561
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
562
-		{
563
-			$this->results[] = $results;
564
-			for($x=0; $x<count($match[1]); $x++)
565
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
566
-		}
567
-		// have we already fetched framed content?
568
-		elseif(is_array($this->results))
569
-			$this->results[] = $results;
570
-		// no framed content
571
-		else
572
-			$this->results = $results;
555
+        if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
556
+        {
557
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
558
+        }
559
+
560
+        // have we hit our frame depth and is there frame src to fetch?
561
+        if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
562
+        {
563
+            $this->results[] = $results;
564
+            for($x=0; $x<count($match[1]); $x++)
565
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
566
+        }
567
+        // have we already fetched framed content?
568
+        elseif(is_array($this->results))
569
+            $this->results[] = $results;
570
+        // no framed content
571
+        else
572
+            $this->results = $results;
573 573
 		
574
-		return true;
575
-	}
574
+        return true;
575
+    }
576 576
 
577 577
 /*======================================================================*\
578 578
 	Function:	_httpsrequest
@@ -583,163 +583,163 @@  discard block
 block discarded – undo
583 583
 	Output:		
584 584
 \*======================================================================*/
585 585
 	
586
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
587
-	{
588
-		if($this->passcookies && $this->_redirectaddr)
589
-			$this->setcookies();
586
+    private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
587
+    {
588
+        if($this->passcookies && $this->_redirectaddr)
589
+            $this->setcookies();
590 590
 
591
-		$headers = array();		
591
+        $headers = array();		
592 592
 					
593
-		$URI_PARTS = parse_url($URI);
594
-		if(empty($url))
595
-			$url = "/";
596
-		// GET ... header not needed for curl
597
-		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
598
-		if(!empty($this->agent))
599
-			$headers[] = "User-Agent: ".$this->agent;
600
-		if(!empty($this->host))
601
-			$headers[] = "Host: ".$this->host;
602
-		if(!empty($this->accept))
603
-			$headers[] = "Accept: ".$this->accept;
604
-		if(!empty($this->referer))
605
-			$headers[] = "Referer: ".$this->referer;
606
-		if(!empty($this->cookies))
607
-		{			
608
-			if(!is_array($this->cookies))
609
-				$this->cookies = (array)$this->cookies;
593
+        $URI_PARTS = parse_url($URI);
594
+        if(empty($url))
595
+            $url = "/";
596
+        // GET ... header not needed for curl
597
+        //$headers[] = $http_method." ".$url." ".$this->_httpversion;		
598
+        if(!empty($this->agent))
599
+            $headers[] = "User-Agent: ".$this->agent;
600
+        if(!empty($this->host))
601
+            $headers[] = "Host: ".$this->host;
602
+        if(!empty($this->accept))
603
+            $headers[] = "Accept: ".$this->accept;
604
+        if(!empty($this->referer))
605
+            $headers[] = "Referer: ".$this->referer;
606
+        if(!empty($this->cookies))
607
+        {			
608
+            if(!is_array($this->cookies))
609
+                $this->cookies = (array)$this->cookies;
610 610
 	
611
-			reset($this->cookies);
612
-			if ( count($this->cookies) > 0 ) {
613
-				$cookie_str = 'Cookie: ';
614
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
615
-				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
616
-				}
617
-				$headers[] = substr($cookie_str,0,-2);
618
-			}
619
-		}
620
-		if(!empty($this->rawheaders))
621
-		{
622
-			if(!is_array($this->rawheaders))
623
-				$this->rawheaders = (array)$this->rawheaders;
624
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
625
-				$headers[] = $headerKey.": ".$headerVal;
626
-		}
627
-		if(!empty($content_type)) {
628
-			if ($content_type == "multipart/form-data")
629
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
630
-			else
631
-				$headers[] = "Content-type: $content_type";
632
-		}
633
-		if(!empty($body))	
634
-			$headers[] = "Content-length: ".strlen($body);
635
-		if(!empty($this->user) || !empty($this->pass))	
636
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
611
+            reset($this->cookies);
612
+            if ( count($this->cookies) > 0 ) {
613
+                $cookie_str = 'Cookie: ';
614
+                foreach ( $this->cookies as $cookieKey => $cookieVal ) {
615
+                $cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
616
+                }
617
+                $headers[] = substr($cookie_str,0,-2);
618
+            }
619
+        }
620
+        if(!empty($this->rawheaders))
621
+        {
622
+            if(!is_array($this->rawheaders))
623
+                $this->rawheaders = (array)$this->rawheaders;
624
+            while(list($headerKey,$headerVal) = each($this->rawheaders))
625
+                $headers[] = $headerKey.": ".$headerVal;
626
+        }
627
+        if(!empty($content_type)) {
628
+            if ($content_type == "multipart/form-data")
629
+                $headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
630
+            else
631
+                $headers[] = "Content-type: $content_type";
632
+        }
633
+        if(!empty($body))	
634
+            $headers[] = "Content-length: ".strlen($body);
635
+        if(!empty($this->user) || !empty($this->pass))	
636
+            $headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
637 637
 			
638
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
639
-			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
640
-		}
638
+        for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
639
+            $cmdline_params .= " -H \"".$headers[$curr_header]."\"";
640
+        }
641 641
 			  	                         
642
-		if(!empty($body))
643
-			$cmdline_params .= " -d \"$body\"";
642
+        if(!empty($body))
643
+            $cmdline_params .= " -d \"$body\"";
644 644
 		
645
-		if($this->read_timeout > 0)
646
-			$cmdline_params .= " -m ".$this->read_timeout;
645
+        if($this->read_timeout > 0)
646
+            $cmdline_params .= " -m ".$this->read_timeout;
647 647
 		
648
-		$headerfile = uniqid(time());
648
+        $headerfile = uniqid(time());
649 649
 		
650
-		# accept self-signed certs
651
-		$cmdline_params .= " -k";
650
+        # accept self-signed certs
651
+        $cmdline_params .= " -k";
652 652
         $results = array();
653 653
         $return = 0;
654
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
654
+        exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
655 655
 		
656
-		if($return)
657
-		{
658
-			$this->error = "Error: cURL could not retrieve the document, error $return.";
659
-			return false;
660
-		}
656
+        if($return)
657
+        {
658
+            $this->error = "Error: cURL could not retrieve the document, error $return.";
659
+            return false;
660
+        }
661 661
 			
662 662
 			
663
-		$results = implode("\r\n",$results);
663
+        $results = implode("\r\n",$results);
664 664
 		
665
-		$result_headers = file("/tmp/$headerfile");
665
+        $result_headers = file("/tmp/$headerfile");
666 666
 						
667
-		$this->_redirectaddr = false;
668
-		unset($this->headers);
667
+        $this->_redirectaddr = false;
668
+        unset($this->headers);
669 669
 						
670
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
671
-		{
670
+        for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
671
+        {
672 672
 			
673
-			// if a header begins with Location: or URI:, set the redirect
674
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
675
-			{
676
-				// get URL portion of the redirect
677
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
678
-				// look for :// in the Location header to see if hostname is included
679
-				if(!preg_match("|\:\/\/|",$matches[2]))
680
-				{
681
-					// no host in the path, so prepend
682
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
683
-					// eliminate double slash
684
-					if(!preg_match("|^/|",$matches[2]))
685
-							$this->_redirectaddr .= "/".$matches[2];
686
-					else
687
-							$this->_redirectaddr .= $matches[2];
688
-				}
689
-				else
690
-					$this->_redirectaddr = $matches[2];
691
-			}
673
+            // if a header begins with Location: or URI:, set the redirect
674
+            if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
675
+            {
676
+                // get URL portion of the redirect
677
+                preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
678
+                // look for :// in the Location header to see if hostname is included
679
+                if(!preg_match("|\:\/\/|",$matches[2]))
680
+                {
681
+                    // no host in the path, so prepend
682
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
683
+                    // eliminate double slash
684
+                    if(!preg_match("|^/|",$matches[2]))
685
+                            $this->_redirectaddr .= "/".$matches[2];
686
+                    else
687
+                            $this->_redirectaddr .= $matches[2];
688
+                }
689
+                else
690
+                    $this->_redirectaddr = $matches[2];
691
+            }
692 692
 		
693
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
694
-			{
695
-			    $this->response_code = $result_headers[$currentHeader];
696
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
697
-			    {
698
-				$this->status= $match[1];
699
-                	    }
700
-			}
701
-			$this->headers[] = $result_headers[$currentHeader];
702
-		}
703
-
704
-		// check if there is a a redirect meta tag
693
+            if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
694
+            {
695
+                $this->response_code = $result_headers[$currentHeader];
696
+                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
697
+                {
698
+                $this->status= $match[1];
699
+                        }
700
+            }
701
+            $this->headers[] = $result_headers[$currentHeader];
702
+        }
703
+
704
+        // check if there is a a redirect meta tag
705 705
 		
706
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
707
-		{
708
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
709
-		}
710
-
711
-		// have we hit our frame depth and is there frame src to fetch?
712
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
713
-		{
714
-			$this->results[] = $results;
715
-			for($x=0; $x<count($match[1]); $x++)
716
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
717
-		}
718
-		// have we already fetched framed content?
719
-		elseif(is_array($this->results))
720
-			$this->results[] = $results;
721
-		// no framed content
722
-		else
723
-			$this->results = $results;
724
-
725
-		unlink("/tmp/$headerfile");
706
+        if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
707
+        {
708
+            $this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
709
+        }
710
+
711
+        // have we hit our frame depth and is there frame src to fetch?
712
+        if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
713
+        {
714
+            $this->results[] = $results;
715
+            for($x=0; $x<count($match[1]); $x++)
716
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
717
+        }
718
+        // have we already fetched framed content?
719
+        elseif(is_array($this->results))
720
+            $this->results[] = $results;
721
+        // no framed content
722
+        else
723
+            $this->results = $results;
724
+
725
+        unlink("/tmp/$headerfile");
726 726
 		
727
-		return true;
728
-	}
727
+        return true;
728
+    }
729 729
 
730 730
 /*======================================================================*\
731 731
 	Function:	setcookies()
732 732
 	Purpose:	set cookies for a redirection
733 733
 \*======================================================================*/
734 734
 	
735
-	public function setcookies()
736
-	{
737
-		for($x=0; $x<count($this->headers); $x++)
738
-		{
739
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
740
-			$this->cookies[$match[1]] = $match[2];
741
-		}
742
-	}
735
+    public function setcookies()
736
+    {
737
+        for($x=0; $x<count($this->headers); $x++)
738
+        {
739
+        if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
740
+            $this->cookies[$match[1]] = $match[2];
741
+        }
742
+    }
743 743
 
744 744
 	
745 745
 /*======================================================================*\
@@ -748,17 +748,17 @@  discard block
 block discarded – undo
748 748
 	Input:		$fp	file pointer
749 749
 \*======================================================================*/
750 750
 
751
-	private function _check_timeout($fp)
752
-	{
753
-		if ($this->read_timeout > 0) {
754
-			$fp_status = socket_get_status($fp);
755
-			if ($fp_status["timed_out"]) {
756
-				$this->timed_out = true;
757
-				return true;
758
-			}
759
-		}
760
-		return false;
761
-	}
751
+    private function _check_timeout($fp)
752
+    {
753
+        if ($this->read_timeout > 0) {
754
+            $fp_status = socket_get_status($fp);
755
+            if ($fp_status["timed_out"]) {
756
+                $this->timed_out = true;
757
+                return true;
758
+            }
759
+        }
760
+        return false;
761
+    }
762 762
 
763 763
 /*======================================================================*\
764 764
 	Function:	_connect
@@ -766,62 +766,62 @@  discard block
 block discarded – undo
766 766
 	Input:		$fp	file pointer
767 767
 \*======================================================================*/
768 768
 	
769
-	private function _connect(&$fp)
770
-	{
771
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
772
-			{
773
-				$this->_isproxy = true;
774
-				$host = $this->proxy_host;
775
-				$port = $this->proxy_port;
776
-			}
777
-		else
778
-		{
779
-			$host = $this->host;
780
-			$port = $this->port;
781
-		}
769
+    private function _connect(&$fp)
770
+    {
771
+        if(!empty($this->proxy_host) && !empty($this->proxy_port))
772
+            {
773
+                $this->_isproxy = true;
774
+                $host = $this->proxy_host;
775
+                $port = $this->proxy_port;
776
+            }
777
+        else
778
+        {
779
+            $host = $this->host;
780
+            $port = $this->port;
781
+        }
782 782
 	
783
-		$this->status = 0;
783
+        $this->status = 0;
784 784
 		
785
-		if($fp = fsockopen(
786
-					$host,
787
-					$port,
788
-					$errno,
789
-					$errstr,
790
-					$this->_fp_timeout
791
-					))
792
-		{
793
-			// socket connection succeeded
794
-
795
-			return true;
796
-		}
797
-		else
798
-		{
799
-			// socket connection failed
800
-			$this->status = $errno;
801
-			switch($errno)
802
-			{
803
-				case -3:
804
-					$this->error="socket creation failed (-3)";
805
-				case -4:
806
-					$this->error="dns lookup failure (-4)";
807
-				case -5:
808
-					$this->error="connection refused or timed out (-5)";
809
-				default:
810
-					$this->error="connection failed (".$errno.")";
811
-			}
812
-			return false;
813
-		}
814
-	}
785
+        if($fp = fsockopen(
786
+                    $host,
787
+                    $port,
788
+                    $errno,
789
+                    $errstr,
790
+                    $this->_fp_timeout
791
+                    ))
792
+        {
793
+            // socket connection succeeded
794
+
795
+            return true;
796
+        }
797
+        else
798
+        {
799
+            // socket connection failed
800
+            $this->status = $errno;
801
+            switch($errno)
802
+            {
803
+                case -3:
804
+                    $this->error="socket creation failed (-3)";
805
+                case -4:
806
+                    $this->error="dns lookup failure (-4)";
807
+                case -5:
808
+                    $this->error="connection refused or timed out (-5)";
809
+                default:
810
+                    $this->error="connection failed (".$errno.")";
811
+            }
812
+            return false;
813
+        }
814
+    }
815 815
 /*======================================================================*\
816 816
 	Function:	_disconnect
817 817
 	Purpose:	disconnect a socket connection
818 818
 	Input:		$fp	file pointer
819 819
 \*======================================================================*/
820 820
 	
821
-	private function _disconnect($fp)
822
-	{
823
-		return(fclose($fp));
824
-	}
821
+    private function _disconnect($fp)
822
+    {
823
+        return(fclose($fp));
824
+    }
825 825
 
826 826
 	
827 827
 /*======================================================================*\
@@ -832,65 +832,65 @@  discard block
 block discarded – undo
832 832
 	Output:		post body
833 833
 \*======================================================================*/
834 834
 	
835
-	private function _prepare_post_body($formvars, $formfiles)
836
-	{
837
-		settype($formvars, "array");
838
-		settype($formfiles, "array");
835
+    private function _prepare_post_body($formvars, $formfiles)
836
+    {
837
+        settype($formvars, "array");
838
+        settype($formfiles, "array");
839 839
 
840
-		if (count($formvars) == 0 && count($formfiles) == 0)
841
-			return;
840
+        if (count($formvars) == 0 && count($formfiles) == 0)
841
+            return;
842 842
 		
843
-		switch ($this->_submit_type) {
844
-			case "application/x-www-form-urlencoded":
845
-				reset($formvars);
846
-				while(list($key,$val) = each($formvars)) {
847
-					if (is_array($val) || is_object($val)) {
848
-						while (list($cur_key, $cur_val) = each($val)) {
849
-							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
850
-						}
851
-					} else
852
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
853
-				}
854
-				break;
855
-
856
-			case "multipart/form-data":
857
-				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
843
+        switch ($this->_submit_type) {
844
+            case "application/x-www-form-urlencoded":
845
+                reset($formvars);
846
+                while(list($key,$val) = each($formvars)) {
847
+                    if (is_array($val) || is_object($val)) {
848
+                        while (list($cur_key, $cur_val) = each($val)) {
849
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
850
+                        }
851
+                    } else
852
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
853
+                }
854
+                break;
855
+
856
+            case "multipart/form-data":
857
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
858 858
 				
859
-				reset($formvars);
860
-				while(list($key,$val) = each($formvars)) {
861
-					if (is_array($val) || is_object($val)) {
862
-						while (list($cur_key, $cur_val) = each($val)) {
863
-							$postdata .= "--".$this->_mime_boundary."\r\n";
864
-							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
865
-							$postdata .= "$cur_val\r\n";
866
-						}
867
-					} else {
868
-						$postdata .= "--".$this->_mime_boundary."\r\n";
869
-						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
870
-						$postdata .= "$val\r\n";
871
-					}
872
-				}
859
+                reset($formvars);
860
+                while(list($key,$val) = each($formvars)) {
861
+                    if (is_array($val) || is_object($val)) {
862
+                        while (list($cur_key, $cur_val) = each($val)) {
863
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
864
+                            $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
865
+                            $postdata .= "$cur_val\r\n";
866
+                        }
867
+                    } else {
868
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
869
+                        $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
870
+                        $postdata .= "$val\r\n";
871
+                    }
872
+                }
873 873
 				
874
-				reset($formfiles);
875
-				while (list($field_name, $file_names) = each($formfiles)) {
876
-					settype($file_names, "array");
877
-					while (list(, $file_name) = each($file_names)) {
878
-						if (!is_readable($file_name)) continue;
879
-
880
-						$fp = fopen($file_name, "r");
881
-						$file_content = fread($fp, filesize($file_name));
882
-						fclose($fp);
883
-						$base_name = basename($file_name);
884
-
885
-						$postdata .= "--".$this->_mime_boundary."\r\n";
886
-						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
887
-						$postdata .= "$file_content\r\n";
888
-					}
889
-				}
890
-				$postdata .= "--".$this->_mime_boundary."--\r\n";
891
-				break;
892
-		}
893
-
894
-		return $postdata;
895
-	}
874
+                reset($formfiles);
875
+                while (list($field_name, $file_names) = each($formfiles)) {
876
+                    settype($file_names, "array");
877
+                    while (list(, $file_name) = each($file_names)) {
878
+                        if (!is_readable($file_name)) continue;
879
+
880
+                        $fp = fopen($file_name, "r");
881
+                        $file_content = fread($fp, filesize($file_name));
882
+                        fclose($fp);
883
+                        $base_name = basename($file_name);
884
+
885
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
886
+                        $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
887
+                        $postdata .= "$file_content\r\n";
888
+                    }
889
+                }
890
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
891
+                break;
892
+        }
893
+
894
+        return $postdata;
895
+    }
896 896
 }
897 897
\ No newline at end of file
Please login to merge, or discard this patch.