chamilo / chamilo-lms

main/inc/lib/getid3/getid3.php

Spacing +111 added lines, -111 removed lines

@@ -27,42 +27,42 @@ 
     //// Settings Section - do NOT modify this file - change setting after newing getid3!
 
     // Encoding
-    public $encoding                 = 'ISO-8859-1';      // CASE SENSITIVE! - i.e. (must be supported by iconv() - see http://www.gnu.org/software/libiconv/).  Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE.
-    public $encoding_id3v1           = 'ISO-8859-1';      // Override SPECIFICATION encoding for broken ID3v1 tags caused by bad tag programs. Examples: 'EUC-CN' for "Chinese MP3s" and 'CP1251' for "Cyrillic".
-    public $encoding_id3v2           = 'ISO-8859-1';      // Override ISO-8859-1 encoding for broken ID3v2 tags caused by BRAINDEAD tag programs that writes system codepage as 'ISO-8859-1' instead of UTF-8.
+    public $encoding                 = 'ISO-8859-1'; // CASE SENSITIVE! - i.e. (must be supported by iconv() - see http://www.gnu.org/software/libiconv/).  Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE.
+    public $encoding_id3v1           = 'ISO-8859-1'; // Override SPECIFICATION encoding for broken ID3v1 tags caused by bad tag programs. Examples: 'EUC-CN' for "Chinese MP3s" and 'CP1251' for "Cyrillic".
+    public $encoding_id3v2           = 'ISO-8859-1'; // Override ISO-8859-1 encoding for broken ID3v2 tags caused by BRAINDEAD tag programs that writes system codepage as 'ISO-8859-1' instead of UTF-8.
 
     // Tags - disable for speed
-    public $option_tag_id3v1         = false;              // Read and process ID3v1 tags.
-    public $option_tag_id3v2         = false;              // Read and process ID3v2 tags.
-    public $option_tag_lyrics3       = false;              // Read and process Lyrics3 tags.
-    public $option_tag_apetag        = false;              // Read and process APE tags.
+    public $option_tag_id3v1         = false; // Read and process ID3v1 tags.
+    public $option_tag_id3v2         = false; // Read and process ID3v2 tags.
+    public $option_tag_lyrics3       = false; // Read and process Lyrics3 tags.
+    public $option_tag_apetag        = false; // Read and process APE tags.
 
     // Misc calucations - disable for speed
-    public $option_analyze           = true;              // Analyze file - disable if you only need to detect file format.
-    public $option_accurate_results  = true;              // Disable to greatly speed up parsing of some file formats at the cost of accuracy.
-    public $option_tags_process      = true;              // Copy tags to root key 'tags' and 'comments' and encode to $this->encoding.
-    public $option_tags_images       = false;             // Scan tags for binary image data - ID3v2 and vorbiscomments only.
-    public $option_extra_info        = true;              // Calculate/return additional info such as bitrate, channelmode etc.
-    public $option_max_2gb_check     = false;             // Check whether file is larger than 2 Gb and thus not supported by PHP.
+    public $option_analyze           = true; // Analyze file - disable if you only need to detect file format.
+    public $option_accurate_results  = true; // Disable to greatly speed up parsing of some file formats at the cost of accuracy.
+    public $option_tags_process      = true; // Copy tags to root key 'tags' and 'comments' and encode to $this->encoding.
+    public $option_tags_images       = false; // Scan tags for binary image data - ID3v2 and vorbiscomments only.
+    public $option_extra_info        = true; // Calculate/return additional info such as bitrate, channelmode etc.
+    public $option_max_2gb_check     = false; // Check whether file is larger than 2 Gb and thus not supported by PHP.
 
     // Misc data hashes - slow - require hash module
-    public $option_md5_data          = false;             // Get MD5 sum of data part - slow.
-    public $option_md5_data_source   = false;             // Use MD5 of source file if available - only FLAC, MAC, OptimFROG and Wavpack4.
-    public $option_sha1_data         = false;             // Get SHA1 sum of data part - slow.
+    public $option_md5_data          = false; // Get MD5 sum of data part - slow.
+    public $option_md5_data_source   = false; // Use MD5 of source file if available - only FLAC, MAC, OptimFROG and Wavpack4.
+    public $option_sha1_data         = false; // Get SHA1 sum of data part - slow.
 
     // Public variables
-    public $filename;                                     // Filename of file being analysed.
-    public $fp;                                           // Filepointer to file being analysed.
-    public $info;                                         // Result array.
+    public $filename; // Filename of file being analysed.
+    public $fp; // Filepointer to file being analysed.
+    public $info; // Result array.
 
     // Protected variables
-    protected $include_path;                              // getid3 include path.
-    protected $warnings = array ();
+    protected $include_path; // getid3 include path.
+    protected $warnings = array();
     protected $iconv_present;
 
     // Class constants
     const VERSION           = '2.0.0b4';
-    const FREAD_BUFFER_SIZE = 16384;                      // Read buffer size in bytes.
+    const FREAD_BUFFER_SIZE = 16384; // Read buffer size in bytes.
     const ICONV_TEST_STRING = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~�������������������������������� �����������������������������������������������������������������������������������������������';
 
 
@@ -87,7 +87,7 @@ 
         }
 
         // Get include_path
-        $this->include_path = $include_path = dirname(__FILE__) . '/';
+        $this->include_path = $include_path = dirname(__FILE__).'/';
 
         // Check for presence of iconv() and make sure it works (simpel test only).
         if (function_exists('iconv') && @iconv('UTF-16LE', 'ISO-8859-1', @iconv('ISO-8859-1', 'UTF-16LE', getid3::ICONV_TEST_STRING)) == getid3::ICONV_TEST_STRING) {
@@ -123,7 +123,7 @@ 
 
 
         // Check safe_mode off
-        if ((bool)ini_get('safe_mode')) {
+        if ((bool) ini_get('safe_mode')) {
             $this->warning('Safe mode is on, shorten support disabled, md5data/sha1data for ogg vorbis disabled, ogg vorbis/flac tag writing disabled.');
         }
 
@@ -137,10 +137,10 @@ 
 
         // Init and save values
         $this->filename = $filename;
-        $this->warnings = array ();
+        $this->warnings = array();
 
         // Init result array and set parameters
-        $this->info = array ();
+        $this->info = array();
         $this->info['GETID3_VERSION'] = getid3::VERSION;
 
         // Remote files not supported
@@ -179,7 +179,7 @@ 
 
             fseek($this->fp, 0, SEEK_SET);
             $header = fread($this->fp, 10);
-            if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
+            if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) {
                 $this->info['id3v2']['header']        = true;
                 $this->info['id3v2']['majorversion']  = ord($header{3});
                 $this->info['id3v2']['minorversion']  = ord($header{4});
@@ -189,13 +189,13 @@ 
 
 
         // Handle tags
-        foreach (array ("id3v2", "id3v1", "apetag", "lyrics3") as $tag_name) {
+        foreach (array("id3v2", "id3v1", "apetag", "lyrics3") as $tag_name) {
 
-            $option_tag = 'option_tag_' . $tag_name;
+            $option_tag = 'option_tag_'.$tag_name;
             if ($this->$option_tag) {
                 $this->include_module('tag.'.$tag_name);
                 try {
-                    $tag_class = 'getid3_' . $tag_name;
+                    $tag_class = 'getid3_'.$tag_name;
                     $tag = new $tag_class($this);
                     $tag->Analyze();
                 }
@@ -231,7 +231,7 @@ 
                     return $this->info;
                 }
 
-                $determined_format = $info;  // copy $info deleted by foreach()
+                $determined_format = $info; // copy $info deleted by foreach()
                 continue;
             }
         }
@@ -341,7 +341,7 @@ 
 
             // Set playtime string
             if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
-                $this->info['playtime_string'] =  floor(round($this->info['playtime_seconds']) / 60) . ':' . str_pad(floor(round($this->info['playtime_seconds']) % 60), 2, 0, STR_PAD_LEFT);;
+                $this->info['playtime_string'] = floor(round($this->info['playtime_seconds']) / 60).':'.str_pad(floor(round($this->info['playtime_seconds']) % 60), 2, 0, STR_PAD_LEFT); ;
             }
 
 
@@ -349,7 +349,7 @@ 
             if (@$this->info['video'] && @$this->info['video']['resolution_x'] && @$this->info['video']['resolution_y'] && @$this->info['video']['bits_per_sample']) {
 
                 // From static image formats
-                if (in_array($this->info['video']['dataformat'], array ('bmp', 'gif', 'jpeg', 'jpg', 'png', 'tiff'))) {
+                if (in_array($this->info['video']['dataformat'], array('bmp', 'gif', 'jpeg', 'jpg', 'png', 'tiff'))) {
                     $frame_rate         = 1;
                     $bitrate_compressed = $this->info['filesize'] * 8;
                 }
@@ -471,7 +471,7 @@ 
     //  Clear all warnings when cloning
     public function __clone() {
 
-        $this->warnings = array ();
+        $this->warnings = array();
 
         // Copy info array, otherwise it will be a reference.
         $temp = $this->info;
@@ -503,7 +503,7 @@ 
             return $result;
         }
 
-        $this->warning('iconv() was unable to convert the string: "' . $string . '" from ' . $in_charset . ' to ' . $out_charset);
+        $this->warning('iconv() was unable to convert the string: "'.$string.'" from '.$in_charset.' to '.$out_charset);
         return $string;
     }
 
@@ -534,12 +534,12 @@ 
     // Return array containing information about all supported formats
     public static function GetFileFormatArray() {
 
-        static $format_info = array (
+        static $format_info = array(
 
                 // Audio formats
 
                 // AC-3   - audio      - Dolby AC-3 / Dolby Digital
-                'ac3'  => array (
+                'ac3'  => array(
                             'pattern'   => '^\x0B\x77',
                             'group'     => 'audio',
                             'module'    => 'ac3',
@@ -547,7 +547,7 @@ 
                           ),
 
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADIF format
-                'adif' => array (
+                'adif' => array(
                             'pattern'   => '^ADIF',
                             'group'     => 'audio',
                             'module'    => 'aac_adif',
@@ -557,7 +557,7 @@ 
 
 
                 // AAC  - audio       - Advanced Audio Coding (AAC) - ADTS format (very similar to MP3)
-                'adts' => array (
+                'adts' => array(
                             'pattern'   => '^\xFF[\xF0-\xF1\xF8-\xF9]',
                             'group'     => 'audio',
                             'module'    => 'aac_adts',
@@ -567,7 +567,7 @@ 
 
 
                 // AU   - audio       - NeXT/Sun AUdio (AU)
-                'au'   => array (
+                'au'   => array(
                             'pattern'   => '^\.snd',
                             'group'     => 'audio',
                             'module'    => 'au',
@@ -575,7 +575,7 @@ 
                           ),
 
                 // AVR  - audio       - Audio Visual Research
-                'avr'  => array (
+                'avr'  => array(
                             'pattern'   => '^2BIT',
                             'group'     => 'audio',
                             'module'    => 'avr',
@@ -583,7 +583,7 @@ 
                           ),
 
                 // BONK - audio       - Bonk v0.9+
-                'bonk' => array (
+                'bonk' => array(
                             'pattern'   => '^\x00(BONK|INFO|META| ID3)',
                             'group'     => 'audio',
                             'module'    => 'bonk',
@@ -599,7 +599,7 @@ 
 						),
 
                 // FLAC - audio       - Free Lossless Audio Codec
-                'flac' => array (
+                'flac' => array(
                             'pattern'   => '^fLaC',
                             'group'     => 'audio',
                             'module'    => 'xiph',
@@ -607,7 +607,7 @@ 
                           ),
 
                 // LA   - audio       - Lossless Audio (LA)
-                'la'   => array (
+                'la'   => array(
                             'pattern'   => '^LA0[2-4]',
                             'group'     => 'audio',
                             'module'    => 'la',
@@ -615,7 +615,7 @@ 
                           ),
 
                 // LPAC - audio       - Lossless Predictive Audio Compression (LPAC)
-                'lpac' => array (
+                'lpac' => array(
                             'pattern'   => '^LPAC',
                             'group'     => 'audio',
                             'module'    => 'lpac',
@@ -623,7 +623,7 @@ 
                           ),
 
                 // MIDI - audio       - MIDI (Musical Instrument Digital Interface)
-                'midi' => array (
+                'midi' => array(
                             'pattern'   => '^MThd',
                             'group'     => 'audio',
                             'module'    => 'midi',
@@ -631,7 +631,7 @@ 
                           ),
 
                 // MAC  - audio       - Monkey's Audio Compressor
-                'mac'  => array (
+                'mac'  => array(
                             'pattern'   => '^MAC ',
                             'group'     => 'audio',
                             'module'    => 'monkey',
@@ -639,31 +639,31 @@ 
                           ),
 
                 // MOD  - audio       - MODule (assorted sub-formats)
-                'mod'  => array (
+                'mod'  => array(
                             'pattern'   => '^.{1080}(M.K.|[5-9]CHN|[1-3][0-9]CH)',
                             'mime_type' => 'audio/mod',
                           ),
 
                 // MOD  - audio       - MODule (Impulse Tracker)
-                'it'   => array (
+                'it'   => array(
                             'pattern'   => '^IMPM',
                             'mime_type' => 'audio/it',
                           ),
 
                 // MOD  - audio       - MODule (eXtended Module, various sub-formats)
-                'xm'   => array (
+                'xm'   => array(
                             'pattern'   => '^Extended Module',
                             'mime_type' => 'audio/xm',
                           ),
 
                 // MOD  - audio       - MODule (ScreamTracker)
-                's3m'  => array (
+                's3m'  => array(
                             'pattern'   => '^.{44}SCRM',
                             'mime_type' => 'audio/s3m',
                           ),
 
                 // MPC  - audio       - Musepack / MPEGplus SV7+
-                'mpc'  => array (
+                'mpc'  => array(
                             'pattern'   => '^(MP\+)',
                             'group'     => 'audio',
                             'module'    => 'mpc',
@@ -671,7 +671,7 @@ 
                           ),
 
                 // MPC  - audio       - Musepack / MPEGplus SV4-6
-                'mpc_old' => array (
+                'mpc_old' => array(
                             'pattern'   => '^([\x00\x01\x10\x11\x40\x41\x50\x51\x80\x81\x90\x91\xC0\xC1\xD0\xD1][\x20-37][\x00\x20\x40\x60\x80\xA0\xC0\xE0])',
                             'group'     => 'audio',
                             'module'    => 'mpc_old',
@@ -680,7 +680,7 @@ 
 
 
                 // MP3  - audio       - MPEG-audio Layer 3 (very similar to AAC-ADTS)
-                'mp3'  => array (
+                'mp3'  => array(
                             'pattern'   => '^\xFF[\xE2-\xE7\xF2-\xF7\xFA-\xFF][\x00-\xEB]',
                             'group'     => 'audio',
                             'module'    => 'mp3',
@@ -688,7 +688,7 @@ 
                           ),
 
                 // OFR  - audio       - OptimFROG
-                'ofr'  => array (
+                'ofr'  => array(
                             'pattern'   => '^(\*RIFF|OFR)',
                             'group'     => 'audio',
                             'module'    => 'optimfrog',
@@ -696,7 +696,7 @@ 
                           ),
 
                 // RKAU - audio       - RKive AUdio compressor
-                'rkau' => array (
+                'rkau' => array(
                             'pattern'   => '^RKA',
                             'group'     => 'audio',
                             'module'    => 'rkau',
@@ -704,7 +704,7 @@ 
                           ),
 
                 // SHN  - audio       - Shorten
-                'shn'  => array (
+                'shn'  => array(
                             'pattern'   => '^ajkg',
                             'group'     => 'audio',
                             'module'    => 'shorten',
@@ -714,15 +714,15 @@ 
                           ),
 
                 // TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
-                'tta'  => array (
-                            'pattern'   => '^TTA',  // could also be '^TTA(\x01|\x02|\x03|2|1)'
+                'tta'  => array(
+                            'pattern'   => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
                             'group'     => 'audio',
                             'module'    => 'tta',
                             'mime_type' => 'application/octet-stream',
                           ),
 
                 // VOC  - audio       - Creative Voice (VOC)
-                'voc'  => array (
+                'voc'  => array(
                             'pattern'   => '^Creative Voice File',
                             'group'     => 'audio',
                             'module'    => 'voc',
@@ -730,7 +730,7 @@ 
                           ),
 
                 // VQF  - audio       - transform-domain weighted interleave Vector Quantization Format (VQF)
-                'vqf'  => array (
+                'vqf'  => array(
                             'pattern'   => '^TWIN',
                             'group'     => 'audio',
                             'module'    => 'vqf',
@@ -749,7 +749,7 @@ 
                 // Audio-Video formats
 
                 // ASF  - audio/video - Advanced Streaming Format, Windows Media Video, Windows Media Audio
-                'asf'  => array (
+                'asf'  => array(
                             'pattern'   => '^\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C',
                             'group'     => 'audio-video',
                             'module'    => 'asf',
@@ -771,13 +771,13 @@ 
                           ),
 
                 // MKAV - audio/video - Mastroka
-                'matroska' => array (
+                'matroska' => array(
                             'pattern'   => '^\x1A\x45\xDF\xA3',
                             'mime_type' => 'application/octet-stream',
                           ),
 
                 // MPEG - audio/video - MPEG (Moving Pictures Experts Group)
-                'mpeg' => array (
+                'mpeg' => array(
                             'pattern'   => '^\x00\x00\x01(\xBA|\xB3)',
                             'group'     => 'audio-video',
                             'module'    => 'mpeg',
@@ -785,7 +785,7 @@ 
                           ),
 
                 // NSV  - audio/video - Nullsoft Streaming Video (NSV)
-                'nsv'  => array (
+                'nsv'  => array(
                             'pattern'   => '^NSV[sf]',
                             'group'     => 'audio-video',
                             'module'    => 'nsv',
@@ -793,7 +793,7 @@ 
                           ),
 
                 // Ogg  - audio/video - Ogg (Ogg Vorbis, OggFLAC, Speex, Ogg Theora(*), Ogg Tarkin(*))
-                'ogg'  => array (
+                'ogg'  => array(
                             'pattern'   => '^OggS',
                             'group'     => 'audio',
                             'module'    => 'xiph',
@@ -803,7 +803,7 @@ 
                           ),
 
                 // QT   - audio/video - Quicktime
-                'quicktime' => array (
+                'quicktime' => array(
                             'pattern'   => '^.{4}(cmov|free|ftyp|mdat|moov|pnot|skip|wide)',
                             'group'     => 'audio-video',
                             'module'    => 'quicktime',
@@ -811,7 +811,7 @@ 
                           ),
 
                 // RIFF - audio/video - Resource Interchange File Format (RIFF) / WAV / AVI / CD-audio / SDSS = renamed variant used by SmartSound QuickTracks (www.smartsound.com) / FORM = Audio Interchange File Format (AIFF)
-                'riff' => array (
+                'riff' => array(
                             'pattern'   => '^(RIFF|SDSS|FORM)',
                             'group'     => 'audio-video',
                             'module'    => 'riff',
@@ -820,7 +820,7 @@ 
                           ),
 
                 // Real - audio/video - RealAudio, RealVideo
-                'real' => array (
+                'real' => array(
                             'pattern'   => '^(\.RMF|.ra)',
                             'group'     => 'audio-video',
                             'module'    => 'real',
@@ -828,7 +828,7 @@ 
                           ),
 
                 // SWF - audio/video - ShockWave Flash
-                'swf' => array (
+                'swf' => array(
                             'pattern'   => '^(F|C)WS',
                             'group'     => 'audio-video',
                             'module'    => 'swf',
@@ -839,7 +839,7 @@ 
                 // Still-Image formats
 
                 // BMP  - still image - Bitmap (Windows, OS/2; uncompressed, RLE8, RLE4)
-                'bmp'  => array (
+                'bmp'  => array(
                             'pattern'   => '^BM',
                             'group'     => 'graphic',
                             'module'    => 'bmp',
@@ -849,7 +849,7 @@ 
                           ),
 
                 // GIF  - still image - Graphics Interchange Format
-                'gif'  => array (
+                'gif'  => array(
                             'pattern'   => '^GIF',
                             'group'     => 'graphic',
                             'module'    => 'gif',
@@ -859,7 +859,7 @@ 
                           ),
 
                 // JPEG - still image - Joint Photographic Experts Group (JPEG)
-                'jpeg'  => array (
+                'jpeg'  => array(
                             'pattern'   => '^\xFF\xD8\xFF',
                             'group'     => 'graphic',
                             'module'    => 'jpeg',
@@ -869,7 +869,7 @@ 
                           ),
 
                 // PCD  - still image - Kodak Photo CD
-                'pcd'  => array (
+                'pcd'  => array(
                             'pattern'   => '^.{2048}PCD_IPI\x00',
                             'group'     => 'graphic',
                             'module'    => 'pcd',
@@ -880,7 +880,7 @@ 
 
 
                 // PNG  - still image - Portable Network Graphics (PNG)
-                'png'  => array (
+                'png'  => array(
                             'pattern'   => '^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A',
                             'group'     => 'graphic',
                             'module'    => 'png',
@@ -900,7 +900,7 @@ 
 
 
                 // TIFF  - still image - Tagged Information File Format (TIFF)
-                'tiff' => array (
+                'tiff' => array(
                             'pattern'   => '^(II\x2A\x00|MM\x00\x2A)',
                             'group'     => 'graphic',
                             'module'    => 'tiff',
@@ -920,7 +920,7 @@ 
                           ),
 
                 // ISO  - data        - International Standards Organization (ISO) CD-ROM Image
-                'iso'  => array (
+                'iso'  => array(
                             'pattern'   => '^.{32769}CD001',
                             'group'     => 'misc',
                             'module'    => 'iso',
@@ -938,7 +938,7 @@ 
                           ),
 
                 // SZIP - audio       - SZIP compressed data
-                'szip' => array (
+                'szip' => array(
                             'pattern'   => '^SZ\x0A\x04',
                             'group'     => 'archive',
                             'module'    => 'szip',
@@ -969,7 +969,7 @@ 
 
 
                 // ZIP  - data        - ZIP compressed data
-                'zip'  => array (
+                'zip'  => array(
                             'pattern'   => '^PK\x03\x04',
                             'group'     => 'archive',
                             'module'    => 'zip',
@@ -980,7 +980,7 @@ 
 
 
                 // PAR2 - data        - Parity Volume Set Specification 2.0
-                'par2' => array (
+                'par2' => array(
                 			'pattern'   => '^PAR2\x00PKT',
 							'mime_type' => 'application/octet-stream',
 							'fail_id3'  => 'ERROR',
@@ -1039,22 +1039,22 @@ 
     protected function HandleAllTags() {
 
         // Key name => array (tag name, character encoding)
-        static $tags = array (
-            'asf'       => array ('asf',           'UTF-16LE'),
-            'midi'      => array ('midi',          'ISO-8859-1'),
-            'nsv'       => array ('nsv',           'ISO-8859-1'),
-            'ogg'       => array ('vorbiscomment', 'UTF-8'),
-            'png'       => array ('png',           'UTF-8'),
-            'tiff'      => array ('tiff',          'ISO-8859-1'),
-            'quicktime' => array ('quicktime',     'ISO-8859-1'),
-            'real'      => array ('real',          'ISO-8859-1'),
-            'vqf'       => array ('vqf',           'ISO-8859-1'),
-            'zip'       => array ('zip',           'ISO-8859-1'),
-            'riff'      => array ('riff',          'ISO-8859-1'),
-            'lyrics3'   => array ('lyrics3',       'ISO-8859-1'),
-            'id3v1'     => array ('id3v1',         ''),            // change below - cannot assign variable to static array
-            'id3v2'     => array ('id3v2',         'UTF-8'),       // module converts all frames to UTF-8
-            'ape'       => array ('ape',           'UTF-8')
+        static $tags = array(
+            'asf'       => array('asf', 'UTF-16LE'),
+            'midi'      => array('midi', 'ISO-8859-1'),
+            'nsv'       => array('nsv', 'ISO-8859-1'),
+            'ogg'       => array('vorbiscomment', 'UTF-8'),
+            'png'       => array('png', 'UTF-8'),
+            'tiff'      => array('tiff', 'ISO-8859-1'),
+            'quicktime' => array('quicktime', 'ISO-8859-1'),
+            'real'      => array('real', 'ISO-8859-1'),
+            'vqf'       => array('vqf', 'ISO-8859-1'),
+            'zip'       => array('zip', 'ISO-8859-1'),
+            'riff'      => array('riff', 'ISO-8859-1'),
+            'lyrics3'   => array('lyrics3', 'ISO-8859-1'),
+            'id3v1'     => array('id3v1', ''), // change below - cannot assign variable to static array
+            'id3v2'     => array('id3v2', 'UTF-8'), // module converts all frames to UTF-8
+            'ape'       => array('ape', 'UTF-8')
         );
         $tags['id3v1'][1] = $this->encoding_id3v1;
 
@@ -1063,7 +1063,7 @@ 
             list($tag_name, $encoding) = $tag_name_encoding_array;
 
             // Fill in default encoding type if not already present
-            @$this->info[$comment_name]  and  $this->info[$comment_name]['encoding'] = $encoding;
+            @$this->info[$comment_name] and $this->info[$comment_name]['encoding'] = $encoding;
 
             // Copy comments if key name set
             if (@$this->info[$comment_name]['comments']) {
@@ -1142,11 +1142,11 @@ 
 abstract class getid3_handler
 {
 
-    protected $getid3;                          // pointer
+    protected $getid3; // pointer
 
-    protected $data_string_flag = false;        // analyzing filepointer or string
-    protected $data_string;                     // string to analyze
-    protected $data_string_position = 0;        // seek position in string
+    protected $data_string_flag = false; // analyzing filepointer or string
+    protected $data_string; // string to analyze
+    protected $data_string_position = 0; // seek position in string
 
 
     public function __construct(getID3 $getid3) {
@@ -1247,20 +1247,20 @@ 
     public function __construct($filename) {
 
         if (!file_exists($filename)) {
-            throw new getid3_exception('File does not exist: "' . $filename . '"');
+            throw new getid3_exception('File does not exist: "'.$filename.'"');
         }
 
         if (!is_writeable($filename)) {
-            throw new getid3_exception('File is not writeable: "' . $filename . '"');
+            throw new getid3_exception('File is not writeable: "'.$filename.'"');
         }
 
         if (!is_writeable(dirname($filename))) {
-            throw new getid3_exception('Directory is not writeable: ' . dirname($filename) . ' (need to write lock file).');
+            throw new getid3_exception('Directory is not writeable: '.dirname($filename).' (need to write lock file).');
         }
 
         $this->user_abort = ignore_user_abort(true);
 
-        $this->fp_lock = fopen($filename . '.getid3.lock', 'w');
+        $this->fp_lock = fopen($filename.'.getid3.lock', 'w');
         flock($this->fp_lock, LOCK_EX);
 
         $this->filename = $filename;
@@ -1271,7 +1271,7 @@ 
 
         flock($this->fp_lock, LOCK_UN);
         fclose($this->fp_lock);
-        unlink($this->filename . '.getid3.lock');
+        unlink($this->filename.'.getid3.lock');
 
         ignore_user_abort($this->user_abort);
     }
@@ -1325,7 +1325,7 @@ 
 
 
     // Convert number to Little Endian byte string
-    public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
+    public static function LittleEndian2String($number, $minbytes = 1, $synchsafe = false) {
         $intstring = '';
         while ($number > 0) {
             if ($synchsafe) {
@@ -1485,7 +1485,7 @@ 
 	}
 
 
-	public static function PrintHexBytes($string, $hex=true, $spaces=true, $html_safe=true) {
+	public static function PrintHexBytes($string, $hex = true, $spaces = true, $html_safe = true) {
 
         $return_string = '';
         for ($i = 0; $i < strlen($string); $i++) {
@@ -1545,7 +1545,7 @@ 
 
     public static function NameLookup($name_code) {
 
-        static $lookup = array (
+        static $lookup = array(
             0 => 'not set',
             1 => 'Track Gain Adjustment',
             2 => 'Album Gain Adjustment'
@@ -1558,7 +1558,7 @@ 
 
     public static function OriginatorLookup($originator_code) {
 
-        static $lookup = array (
+        static $lookup = array(
             0 => 'unspecified',
             1 => 'pre-set by artist/producer/mastering engineer',
             2 => 'set by user',
@@ -1572,7 +1572,7 @@ 
 
     public static function AdjustmentLookup($raw_adjustment, $sign_bit) {
 
-        return (float)$raw_adjustment / 10 * ($sign_bit == 1 ? -1 : 1);
+        return (float) $raw_adjustment / 10 * ($sign_bit == 1 ? -1 : 1);
     }
 
 

main/inc/lib/login_redirection.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,30 +18,30 @@ 
         if (api_is_student() && !api_get_setting('student_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('student_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_teacher() && !api_get_setting('teacher_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('teacher_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_drh() && !api_get_setting('drh_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('drh_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
         if (api_is_session_admin() && !api_get_setting('sessionadmin_page_after_login') == '') {
             $redirect_url = html_entity_decode(api_get_setting('sessionadmin_page_after_login'));
             if ($redirect_url[0] == "/") {
-                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url;
+                $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url;
             }
         }
 
         if (!empty($redirect_url)) {
-            header('Location: ' . $redirect_url . $param);
+            header('Location: '.$redirect_url.$param);
             exit();
         }
 
@@ -49,7 +49,7 @@ 
         if (CustomPages::enabled()) {
             CustomPages::display(CustomPages::INDEX_LOGGED);
         }
-        header('location: ' . api_get_path(WEB_PATH) . api_get_setting('page_after_login') . $param);
+        header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param);
         exit();
     }
 }

main/inc/lib/attendance.lib.php

Spacing +63 added lines, -63 removed lines

@@ -73,7 +73,7 @@ 
             $course_id = intval($course_id);
         }
 
-        $session_id = isset($session_id)?intval($session_id):api_get_session_id();
+        $session_id = isset($session_id) ? intval($session_id) : api_get_session_id();
         $condition_session = api_get_session_condition($session_id);
 
         // Get attendance data
@@ -82,7 +82,7 @@ 
                 WHERE c_id = $course_id AND active = 1 $condition_session ";
         $rs  = Database::query($sql);
         if (Database::num_rows($rs) > 0) {
-            while ($row = Database::fetch_array($rs,'ASSOC')) {
+            while ($row = Database::fetch_array($rs, 'ASSOC')) {
                 $data[$row['id']] = $row;
             }
         }
@@ -108,7 +108,7 @@ 
 		$from = intval($from);
 		$number_of_items = intval($number_of_items);
 
-		if (!in_array($direction, array('ASC','DESC'))) {
+		if (!in_array($direction, array('ASC', 'DESC'))) {
 			$direction = 'ASC';
 		}
 
@@ -135,7 +135,7 @@ 
 				LIMIT $from,$number_of_items ";
 
 		$res = Database::query($sql);
-		$attendances = array ();
+		$attendances = array();
 		$user_info = api_get_user_info();
 		$allowDelete = api_get_setting('allow_delete_attendance');
 
@@ -194,8 +194,8 @@ 
 						$attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
 					}
 					if ($allowDelete === 'true') {
-						$actions .= '<a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0]. '">' .
-							Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+						$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_delete&attendance_id='.$attendance[0].'">'.
+							Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
 					}
 				} else {
 					$is_locked_attendance = self::is_locked_attendance($attendance[0]);
@@ -215,8 +215,8 @@ 
 							$attendance[2] = '<span class="muted">'.$attendance[2].'</span>';
 						}
 						if ($allowDelete === 'true') {
-							$actions .= ' <a href="index.php?' . api_get_cidreq() . '&action=attendance_delete&attendance_id=' . $attendance[0].'">' .
-								Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL) . '</a>';
+							$actions .= ' <a href="index.php?'.api_get_cidreq().'&action=attendance_delete&attendance_id='.$attendance[0].'">'.
+								Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 				$is_done_all_calendar = self::is_all_attendance_calendar_done($attendance[0]);
 
 				if ($is_done_all_calendar) {
-					$locked   = $attendance[4];
+					$locked = $attendance[4];
 					if ($locked == 0) {
 						if (api_is_platform_admin()) {
 							$message_alert = get_lang('AreYouSureToLockTheAttendance');
@@ -245,7 +245,7 @@ 
 				}
 				$actions .= '</center>';
 
-				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3],$actions);
+				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3], $actions);
 			} else {
 				$attendance[0] = '&nbsp;';
 				$attendances[] = array($attendance[0], $attendance[1], $attendance[2], $attendance[3]);
@@ -285,13 +285,13 @@ 
 	public function attendance_add($link_to_gradebook = false)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$table_link = Database:: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 		$session_id = api_get_session_id();
 		$user_id = api_get_user_id();
 		$course_code = $_course['code'];
 		$course_id = $_course['real_id'];
-		$title_gradebook= $this->attendance_qualify_title;
+		$title_gradebook = $this->attendance_qualify_title;
 		$value_calification = 0;
 		$weight_calification = floatval($this->attendance_weight);
 
@@ -434,12 +434,12 @@ 
 	public function attendance_restore($attendance_id)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$user_id = api_get_user_id();
 		$course_id = $_course['real_id'];
 		if (is_array($attendance_id)) {
 			foreach ($attendance_id as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 1
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -455,8 +455,8 @@ 
                     );
 				}
 			}
-		} else  {
-			$attendance_id	= intval($attendance_id);
+		} else {
+			$attendance_id = intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 1
 					WHERE c_id = $course_id AND id = '$attendance_id'";
 			$result = Database::query($sql);
@@ -484,13 +484,13 @@ 
 	public function attendance_delete($attendance_id)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
         $user_id = api_get_user_id();
         $course_id = $_course['real_id'];
 
 		if (is_array($attendance_id)) {
 			foreach ($attendance_id as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = 2
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -506,8 +506,8 @@ 
                     );
 				}
 			}
-		} else  {
-			$attendance_id= intval($attendance_id);
+		} else {
+			$attendance_id = intval($attendance_id);
 			$sql = "UPDATE $tbl_attendance SET active = 2
 					WHERE c_id = $course_id AND id = '$attendance_id'";
 
@@ -538,7 +538,7 @@ 
 	public function changeVisibility($attendanceId, $status = 1)
 	{
 		$_course = api_get_course_info();
-		$tbl_attendance	= Database :: get_course_table(TABLE_ATTENDANCE);
+		$tbl_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
 		$user_id = api_get_user_id();
 		$course_id = $_course['real_id'];
 		$status = intval($status);
@@ -550,7 +550,7 @@ 
 
 		if (is_array($attendanceId)) {
 			foreach ($attendanceId as $id) {
-				$id	= intval($id);
+				$id = intval($id);
 				$sql = "UPDATE $tbl_attendance SET active = $status
 						WHERE c_id = $course_id AND id = '$id'";
 				$result = Database::query($sql);
@@ -560,8 +560,8 @@ 
 					api_item_property_update($_course, TOOL_ATTENDANCE, $id, $action, $user_id);
 				}
 			}
-		} else  {
-			$attendanceId	= intval($attendanceId);
+		} else {
+			$attendanceId = intval($attendanceId);
 			$sql = "UPDATE $tbl_attendance SET active = $status
 					WHERE c_id = $course_id AND id = '$attendanceId'";
 			$result = Database::query($sql);
@@ -591,7 +591,7 @@ 
 		$tbl_attendance = Database::get_course_table(TABLE_ATTENDANCE);
 		$course_id = api_get_course_int_id();
 		$attendance_id = intval($attendance_id);
-		$locked = ($lock)?1:0;
+		$locked = ($lock) ? 1 : 0;
 		$upd = "UPDATE $tbl_attendance SET locked = $locked
 				WHERE c_id = $course_id AND id = $attendance_id";
 		$result = Database::query($upd);
@@ -720,8 +720,8 @@ 
 	 */
 	public function attendance_sheet_add($calendar_id, $users_present, $attendance_id)
 	{
-		$tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
 		$calendar_id = intval($calendar_id);
 		$attendance_id = intval($attendance_id);
@@ -729,7 +729,7 @@ 
 		$course_id = api_get_course_int_id();
 
 		$user_ids = array_keys($users);
-		$users_absent = array_diff($user_ids,$users_present);
+		$users_absent = array_diff($user_ids, $users_present);
 		$affected_rows = 0;
 
 		// get last edit type
@@ -993,13 +993,13 @@ 
 	public function get_faults_of_user($user_id, $attendance_id, $groupId = null)
 	{
 		// initializing database table and variables
-		$user_id 		= intval($user_id);
+		$user_id = intval($user_id);
 		$attendance_id 	= intval($attendance_id);
 		$results = array();
 		$calendar_count = self::get_number_of_attendance_calendar($attendance_id, $groupId, NULL, $user_id);
 		// $total_done_attendance 	= $attendance_data['attendance_qualify_max'];
-        $total_done_attendance 	= self::get_number_of_attendance_calendar($attendance_id, $groupId, true, $user_id);
-		$attendance_user_score  = $this->get_user_score($user_id, $attendance_id, $groupId);
+        $total_done_attendance = self::get_number_of_attendance_calendar($attendance_id, $groupId, true, $user_id);
+		$attendance_user_score = $this->get_user_score($user_id, $attendance_id, $groupId);
 
 		//This is the main change of the BT#1381
 		//$total_done_attendance = $calendar_count;
@@ -1012,7 +1012,7 @@ 
         }
 
         $faults = $faults > 0 ? $faults : 0;
-		$faults_porcent = $calendar_count > 0 ?round(($faults*100)/$calendar_count,0):0;
+		$faults_porcent = $calendar_count > 0 ? round(($faults * 100) / $calendar_count, 0) : 0;
         $results['faults'] = $faults;
         $results['total'] = $calendar_count;
         $results['faults_porcent'] = $faults_porcent;
@@ -1046,13 +1046,13 @@ 
 			//$course_code = $course['code'];
 			//$course_info = api_get_course_info($course_code);
 			$course_id = $course['real_id'];
-			$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+			$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
 
 			$attendances_by_course = $this->get_attendances_list($course_id);
 
 			foreach ($attendances_by_course as $attendance) {
 				// get total faults and total weight
-				$total_done_attendance 	= $attendance['attendance_qualify_max'];
+				$total_done_attendance = $attendance['attendance_qualify_max'];
 				$sql = "SELECT score
 						FROM $tbl_attendance_result
                         WHERE
@@ -1065,16 +1065,16 @@ 
 					$row = Database::fetch_array($rs);
 					$score = $row['score'];
 				}
-				$faults = $total_done_attendance-$score;
-				$faults = $faults > 0 ? $faults:0;
+				$faults = $total_done_attendance - $score;
+				$faults = $faults > 0 ? $faults : 0;
 				$total_faults += $faults;
 				$total_weight += $total_done_attendance;
 			}
 		}
 
-		$porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
+		$porcent = $total_weight > 0 ? round(($total_faults * 100) / $total_weight, 0) : 0;
 		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
+		$results['total'] = $total_weight;
 		$results['porcent'] = $porcent;
 
 		return $results;
@@ -1092,7 +1092,7 @@ 
 	{
 		// Database tables and variables
 		$course_info = api_get_course_info($course_code);
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
 		$user_id = intval($user_id);
 		$results = array();
 		$total_faults = $total_weight = $porcent = 0;
@@ -1100,7 +1100,7 @@ 
 
 		foreach ($attendances_by_course as $attendance) {
 			// Get total faults and total weight
-			$total_done_attendance 	= $attendance['attendance_qualify_max'];
+			$total_done_attendance = $attendance['attendance_qualify_max'];
 			$sql = "SELECT score FROM $tbl_attendance_result
 					WHERE
 						c_id = {$course_info['real_id']} AND
@@ -1112,15 +1112,15 @@ 
 				$row = Database::fetch_array($rs);
 				$score = $row['score'];
 			}
-			$faults = $total_done_attendance-$score;
-			$faults = $faults > 0 ? $faults:0;
+			$faults = $total_done_attendance - $score;
+			$faults = $faults > 0 ? $faults : 0;
 			$total_faults += $faults;
 			$total_weight += $total_done_attendance;
 		}
 
-		$porcent = $total_weight > 0 ?round(($total_faults*100)/$total_weight,0):0;
+		$porcent = $total_weight > 0 ? round(($total_faults * 100) / $total_weight, 0) : 0;
 		$results['faults'] 	= $total_faults;
-		$results['total']	= $total_weight;
+		$results['total'] = $total_weight;
 		$results['porcent'] = $porcent;
 
 		return $results;
@@ -1134,8 +1134,8 @@ 
 	 */
 	public function get_users_attendance_sheet($attendance_id, $user_id = 0, $groupId = null)
 	{
-		$tbl_attendance_sheet 	= Database::get_course_table(TABLE_ATTENDANCE_SHEET);
-		$tbl_attendance_calendar= Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
+		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
 		$attendance_calendar = $this->get_attendance_calendar($attendance_id, 'all', null, $groupId);
 		$calendar_ids = array();
@@ -1157,7 +1157,7 @@ 
 					        WHERE
 					        	c_id = $course_id AND
 					        	user_id = '$uid' AND
-					        	attendance_calendar_id IN(".implode(',',$calendar_ids).")
+					        	attendance_calendar_id IN(".implode(',', $calendar_ids).")
 							";
 					$res = Database::query($sql);
 					if (Database::num_rows($res) > 0) {
@@ -1179,7 +1179,7 @@ 
 							att.c_id = $course_id AND
 							cal.c_id =  $course_id AND
 							att.user_id = '$user_id' AND
-							att.attendance_calendar_id IN (".implode(',',$calendar_ids).")
+							att.attendance_calendar_id IN (".implode(',', $calendar_ids).")
                         ORDER BY date_time";
 				$res = Database::query($sql);
 				if (Database::num_rows($res) > 0) {
@@ -1255,7 +1255,7 @@ 
 	 */
 	public function get_user_score($user_id, $attendance_id, $groupId = null)
 	{
-		$tbl_attendance_result 	= Database::get_course_table(TABLE_ATTENDANCE_RESULT);
+		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
         $tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
         $tbl_attendance_cal_rel_group = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
         $tbl_attendance_cal = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
@@ -1369,7 +1369,7 @@ 
                    ";
 		}
 
-		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
+		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done', 'calendar_id'))) {
 			$type = 'all';
 		}
 
@@ -1377,7 +1377,7 @@ 
 			case 'calendar_id':
 				$calendar_id = intval($calendar_id);
 				if (!empty($calendar_id)) {
-					$sql.= " AND c.id = $calendar_id";
+					$sql .= " AND c.id = $calendar_id";
 				}
 				break;
 			case 'today':
@@ -1398,7 +1398,7 @@ 
 		$rs = Database::query($sql);
 		$data = array();
 		if (Database::num_rows($rs) > 0) {
-			while ($row = Database::fetch_array($rs,'ASSOC')) {
+			while ($row = Database::fetch_array($rs, 'ASSOC')) {
 				$row['db_date_time'] = $row['date_time'];
 				$row['date_time'] = api_get_local_time($row['date_time']);
 				$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
@@ -1762,14 +1762,14 @@ 
 	 * @param   int     The number of years to add
 	 * @return  int     The new timestamp
 	 */
-	private function add_month($timestamp, $num=1)
+	private function add_month($timestamp, $num = 1)
 	{
 		$values = api_get_utc_datetime($timestamp);
-		$values = str_replace(array(':','-',' '), '/', $values);
-		list($y, $m, $d, $h, $n, $s) = split('/',$values);
-		if($m+$num>12) {
-			$y += floor($num/12);
-			$m += $num%12;
+		$values = str_replace(array(':', '-', ' '), '/', $values);
+		list($y, $m, $d, $h, $n, $s) = split('/', $values);
+		if ($m + $num > 12) {
+			$y += floor($num / 12);
+			$m += $num % 12;
 		} else {
 			$m += $num;
 		}
@@ -1827,7 +1827,7 @@ 
 	 * @param	bool	true for removing all calendar inside current attendance, false for removing by calendar id
 	 * @return	int affected rows
 	 */
-	public function attendance_calendar_delete($calendar_id, $attendance_id , $all_delete = false)
+	public function attendance_calendar_delete($calendar_id, $attendance_id, $all_delete = false)
 	{
 		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
@@ -1963,7 +1963,7 @@ 
 		}
 
 		$sessionId = api_get_session_id();
-		$courseCode  = api_get_course_id();
+		$courseCode = api_get_course_id();
 		if (!empty($sessionId)) {
 			$users = CourseManager:: get_user_list_from_course_code(
 				$courseCode,
@@ -1984,7 +1984,7 @@ 
 
 		$dateTimeStartOriginal = new DateTime($startDate);
 		$dateTimeStart = new DateTime($startDate);
-		$dateTimeEnd= new DateTime($endDate);
+		$dateTimeEnd = new DateTime($endDate);
 		$interval = $dateTimeStart->diff($dateTimeEnd);
 		$days = intval($interval->format('%a'));
 
@@ -2057,7 +2057,7 @@ 
 				0,
 				$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'
 			);
-			$row ++;
+			$row++;
 		}
 
 		$column = 1;
@@ -2134,7 +2134,7 @@ 
 		$tableToString = $table->toHtml();
 
 		$params = array(
-			'filename' => get_lang('Attendance') . '_' . api_get_utc_datetime(),
+			'filename' => get_lang('Attendance').'_'.api_get_utc_datetime(),
 			'pdf_title' => get_lang('Attendance'),
 			'course_code' => api_get_course_id(),
 			'show_real_course_teachers' => true

main/inc/lib/magpierss/rss_fetch.inc

Spacing +77 added lines, -77 removed lines

@@ -26,15 +26,15 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 define('MAGPIE_CACHE_DIR', api_get_path(SYS_ARCHIVE_PATH));
 
 /* 
@@ -87,21 +87,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url) {
     // initialize constants
     init();
     
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
     
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -116,34 +116,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
         
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
         
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
         
         
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
         
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
         
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
                 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -153,50 +153,50 @@ 
         // else attempt a conditional get
         
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
         
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                if ($resp->status == '-100') {
+                    $errormsg .= "(Request timed out after ".MAGPIE_FETCH_TIME_OUT." seconds)";
                 }
-                elseif ( $resp->error ) {
+                elseif ($resp->error) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2); 
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
                 else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -208,7 +208,7 @@ 
         
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
@@ -228,21 +228,21 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error($errormsg, $lvl = E_USER_WARNING) {
         global $MAGPIE_ERROR;
         
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);                
+            trigger_error($errormsg, $lvl);                
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE) {
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
             
@@ -250,10 +250,10 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error($errormsg = "") {
     global $MAGPIE_ERROR;
     
-    if ( isset($errormsg) and $errormsg ) { 
+    if (isset($errormsg) and $errormsg) { 
         $MAGPIE_ERROR = $errormsg;
     }
     
@@ -267,13 +267,13 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)  
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file($url, $headers = "") {
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
     
@@ -288,14 +288,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp) {
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
     
     // if RSS parsed successfully       
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
         
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -305,11 +305,11 @@ 
                 $val = "";
             }
             
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
             
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -320,9 +320,9 @@ 
         $errormsg = "Failed to parse RSS file.";
         
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
-        error($errormsg,E_USER_NOTICE);
+        error($errormsg, E_USER_NOTICE);
         
         return false;
     } // end if ($rss and !$rss->error)
@@ -333,65 +333,65 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init() {
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
     
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
         define('MAGPIE_OUTPUT_ENCODING', 'UTF-8');
     }
     
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
     
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
     
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
     
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
         
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
         
         define('MAGPIE_USER_AGENT', $ua);
     }
     
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
     
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);    
     }
 }
@@ -414,7 +414,7 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) { 
+function is_info($sc) { 
     return $sc >= 100 && $sc < 200; 
 }
 
@@ -422,7 +422,7 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) { 
+function is_success($sc) { 
     return $sc >= 200 && $sc < 300; 
 }
 
@@ -430,7 +430,7 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) { 
+function is_redirect($sc) { 
     return $sc >= 300 && $sc < 400; 
 }
 
@@ -438,7 +438,7 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) { 
+function is_error($sc) { 
     return $sc >= 400 && $sc < 600; 
 }
 
@@ -446,7 +446,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) { 
+function is_client_error($sc) { 
     return $sc >= 400 && $sc < 500; 
 }
 
@@ -454,6 +454,6 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) { 
+function is_server_error($sc) { 
     return $sc >= 500 && $sc < 600; 
 }

main/inc/lib/magpierss/rss_cache.inc

Spacing +47 added lines, -47 removed lines

@@ -19,26 +19,26 @@ 
  * @package chamilo.include.rss
  */
 class RSSCache {
-    public $BASE_CACHE = './cache';    // where the cache files are stored
-    public $MAX_AGE    = 3600;         // when are files stale, default one hour
-    public $ERROR      = "";           // accumulate error messages
+    public $BASE_CACHE = './cache'; // where the cache files are stored
+    public $MAX_AGE    = 3600; // when are files stale, default one hour
+    public $ERROR      = ""; // accumulate error messages
     
-    public function RSSCache ($base='', $age='') {
-        if ( $base ) {
+    public function RSSCache($base = '', $age = '') {
+        if ($base) {
             $this->BASE_CACHE = $base;
         }
-        if ( $age ) {
+        if ($age) {
             $this->MAX_AGE = $age;
         }
         
         // attempt to make the cache directory
-        if ( ! file_exists( $this->BASE_CACHE ) ) {
-            $status = @mkdir( $this->BASE_CACHE, 0755 );
+        if (!file_exists($this->BASE_CACHE)) {
+            $status = @mkdir($this->BASE_CACHE, 0755);
             
             // if make failed 
-            if ( ! $status ) {
+            if (!$status) {
                 $this->error(
-                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
+                    "Cache couldn't make dir '".$this->BASE_CACHE."'."
                 );
             }
         }
@@ -50,12 +50,12 @@ 
     Input:      url from wich the rss file was fetched
     Output:     true on sucess  
 \*=======================================================================*/
-    public function set ($url, $rss) {
+    public function set($url, $rss) {
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        $fp = @fopen( $cache_file, 'w' );
+        $cache_file = $this->file_name($url);
+        $fp = @fopen($cache_file, 'w');
         
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Cache unable to open file for writing: $cache_file"
             );
@@ -63,9 +63,9 @@ 
         }
         
         
-        $data = $this->serialize( $rss );
-        fwrite( $fp, $data );
-        fclose( $fp );
+        $data = $this->serialize($rss);
+        fwrite($fp, $data);
+        fclose($fp);
         
         return $cache_file;
     }
@@ -76,11 +76,11 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/ 
-    public function get ($url) {
+    public function get($url) {
         $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
+        $cache_file = $this->file_name($url);
         
-        if ( ! file_exists( $cache_file ) ) {
+        if (!file_exists($cache_file)) {
             $this->debug( 
                 "Cache doesn't contain: $url (cache file: $cache_file)"
             );
@@ -88,16 +88,16 @@ 
         }
         
         $fp = @fopen($cache_file, 'r');
-        if ( ! $fp ) {
+        if (!$fp) {
             $this->error(
                 "Failed to open cache file for reading: $cache_file"
             );
             return 0;
         }
         
-        if ($filesize = filesize($cache_file) ) {
-        	$data = fread( $fp, filesize($cache_file) );
-        	$rss = $this->unserialize( $data );
+        if ($filesize = filesize($cache_file)) {
+        	$data = fread($fp, filesize($cache_file));
+        	$rss = $this->unserialize($data);
         
         	return $rss;
     	}
@@ -112,16 +112,16 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS 
 \*=======================================================================*/     
-    public function check_cache ( $url ) {
+    public function check_cache($url) {
         $this->ERROR = "";
-        $filename = $this->file_name( $url );
+        $filename = $this->file_name($url);
         
-        if ( file_exists( $filename ) ) {
+        if (file_exists($filename)) {
             // find how long ago the file was added to the cache
             // and whether that is longer then MAX_AGE
-            $mtime = filemtime( $filename );
+            $mtime = filemtime($filename);
             $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
+            if ($this->MAX_AGE > $age) {
                 // object exists and is current
                 return 'HIT';
             }
@@ -136,10 +136,10 @@ 
         }
     }
 
-	public function cache_age( $url ) {
-		$filename = $this->file_name( $url);
-		if ( file_exists( $filename ) ) {
-			$mtime = filemtime( $filename );
+	public function cache_age($url) {
+		$filename = $this->file_name($url);
+		if (file_exists($filename)) {
+			$mtime = filemtime($filename);
             $age = time() - $mtime;
 			return $age;
 		}
@@ -151,15 +151,15 @@ 
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/     
-    public function serialize ( $rss ) {
-        return serialize( $rss );
+    public function serialize($rss) {
+        return serialize($rss);
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/     
-    public function unserialize ( $data ) {
-        return unserialize( $data );
+    public function unserialize($data) {
+        return unserialize($data);
     }
     
 /*=======================================================================*\
@@ -168,31 +168,31 @@ 
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/     
-    public function file_name ($url) {
-        $filename = md5( $url );
-        return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
+    public function file_name($url) {
+        $filename = md5($url);
+        return join(DIRECTORY_SEPARATOR, array($this->BASE_CACHE, $filename));
     }
 
 /*=======================================================================*\
     Function:   error
     Purpose:    register error
 \*=======================================================================*/         
-    public function error ($errormsg, $lvl=E_USER_WARNING) {
+    public function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
         $this->ERROR = $errormsg;
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
     }
     
-    public function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-        if ( MAGPIE_DEBUG ) {
+    public function debug($debugmsg, $lvl = E_USER_NOTICE) {
+        if (MAGPIE_DEBUG) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }
     }

main/inc/lib/magpierss/rss_utils.inc

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
  *
  * NOTE: http://www.w3.org/TR/NOTE-datetime
  */
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str) {
     
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
     
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) = 
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) = 
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
         
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
         
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
             
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
         
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
             
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }
             

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

Spacing +175 added lines, -175 removed lines

@@ -40,47 +40,47 @@ 
 	
 	/* user definable vars */
 
-	public $host			=	"www.php.net";		// host name we are connecting to
-	public $port			=	80;					// port we are connecting to
-	public $proxy_host		=	"";					// proxy host to use
-	public $proxy_port		=	"";					// proxy port to use
-	public $agent			=	"Snoopy v1.0";		// agent we masquerade as
-	public $referer		=	"";					// referer info to pass
-	public $cookies		=	array();			// array of cookies to pass
+	public $host			= "www.php.net"; // host name we are connecting to
+	public $port			= 80; // port we are connecting to
+	public $proxy_host		= ""; // proxy host to use
+	public $proxy_port		= ""; // proxy port to use
+	public $agent = "Snoopy v1.0"; // agent we masquerade as
+	public $referer		= ""; // referer info to pass
+	public $cookies		= array(); // array of cookies to pass
 												// $cookies["username"]="joe";
-	public	$rawheaders		=	array();			// array of raw headers to send
+	public	$rawheaders = array(); // array of raw headers to send
 												// $rawheaders["Content-type"]="text/html";
 
-	public $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	public $lastredirectaddr	=	"";				// contains address of last redirected address
-	public	$offsiteok		=	true;				// allows redirection off-site
-	public $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	public $expandlinks	=	true;				// expand links to fully qualified URLs.
+	public $maxredirs		= 5; // http redirection depth maximum. 0 = disallow
+	public $lastredirectaddr = ""; // contains address of last redirected address
+	public	$offsiteok		= true; // allows redirection off-site
+	public $maxframes		= 0; // frame content depth maximum. 0 = disallow
+	public $expandlinks	= true; // expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
 												// or submitlinks()
-	public $passcookies	=	true;				// pass set cookies back through redirects
+	public $passcookies	= true; // pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 	
-	public	$user			=	"";					// user for http authentication
-	public	$pass			=	"";					// password for http authentication
+	public	$user			= ""; // user for http authentication
+	public	$pass			= ""; // password for http authentication
 	
 	// http accept types
-	public $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	public $accept			= "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 	
-	public $results		=	"";					// where the content is put
+	public $results		= ""; // where the content is put
 		
-	public $error			=	"";					// error messages sent here
-	public	$response_code	=	"";					// response code returned from server
-	public	$headers		=	array();			// headers returned from server sent here
-	public	$maxlength		=	500000;				// max return data length (body)
-	public $read_timeout	=	0;					// timeout on read operations, in seconds
+	public $error = ""; // error messages sent here
+	public	$response_code = ""; // response code returned from server
+	public	$headers = array(); // headers returned from server sent here
+	public	$maxlength = 500000; // max return data length (body)
+	public $read_timeout = 0; // timeout on read operations, in seconds
 												// supported only since PHP 4 Beta 4
 												// set to 0 to disallow timeouts
-	public $timed_out		=	false;				// if a read operation timed out
-	public	$status			=	0;					// http request status
+	public $timed_out		= false; // if a read operation timed out
+	public	$status = 0; // http request status
 	
-	public	$curl_path		=	"/usr/bin/curl";
+	public	$curl_path		= "/usr/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
 												// the cURL binary is supplied here.
@@ -93,24 +93,24 @@ 
 												// as of this Snoopy release.
 	
 	// send Accept-encoding: gzip?
-	public $use_gzip		= true;	
+	public $use_gzip = true;	
 	
 	/**** Private variables ****/	
 	
-	private	$_maxlinelen	=	4096;				// max line length (headers)
+	private	$_maxlinelen	= 4096; // max line length (headers)
 	
-	private $_httpmethod	=	"GET";				// default http request method
-	private $_httpversion	=	"HTTP/1.0";			// default http request version
-	private $_submit_method	=	"POST";				// default submit method
-	private $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	private $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	private $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	private $_redirectdepth	=	0;					// increments on an http redirect
-	private $_frameurls		= 	array();			// frame src urls
-	private $_framedepth	=	0;					// increments on frame depth
+	private $_httpmethod	= "GET"; // default http request method
+	private $_httpversion	= "HTTP/1.0"; // default http request version
+	private $_submit_method	= "POST"; // default submit method
+	private $_submit_type	= "application/x-www-form-urlencoded"; // default submit type
+	private $_mime_boundary	= ""; // MIME boundary for multipart/form-data submit type
+	private $_redirectaddr = false; // will be set if page fetched is a redirect
+	private $_redirectdepth	= 0; // increments on an http redirect
+	private $_frameurls		= array(); // frame src urls
+	private $_framedepth	= 0; // increments on frame depth
 	
-	private $_isproxy		=	false;				// set if using a proxy server
-	private $_fp_timeout	=	30;					// timeout for socket connection
+	private $_isproxy = false; // set if using a proxy server
+	private $_fp_timeout	= 30; // timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -132,14 +132,14 @@ 
 		switch ($URI_PARTS["scheme"]) {
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if (!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+						$this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
 					}
 					else
 					{
@@ -150,30 +150,30 @@ 
 					
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->lastredirectaddr = $this->_redirectaddr;
 								$this->fetch($this->_redirectaddr);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 						
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -190,17 +190,17 @@ 
 				return true;					
 				break;
 			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
+				if (!$this->curl_path || (!is_executable($this->curl_path))) {
 					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
 					return false;
 				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if (!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+					$this->_httpsrequest($URI, $URI, $this->_httpmethod);
 				}
 				else
 				{
@@ -209,30 +209,30 @@ 
 					$this->_httpsrequest($path, $URI, $this->_httpmethod);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->lastredirectaddr = $this->_redirectaddr;
 							$this->fetch($this->_redirectaddr);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -245,7 +245,7 @@ 
 				break;
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}		
@@ -272,20 +272,20 @@ 
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx",$document,$links);
+						'isx",$document, $links);
 						
 
 		// catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
+		while (list($key, $val) = each($links[2]))
 		{
-			if(!empty($val))
+			if (!empty($val))
 				$match[] = $val;
 		}				
 		
-		while(list($key,$val) = each($links[3]))
+		while (list($key, $val) = each($links[3]))
 		{
-			if(!empty($val))
+			if (!empty($val))
 				$match[] = $val;
 		}		
 		
@@ -302,10 +302,10 @@ 
 
 	private function _stripform($document)
 	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
 		
 		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+		$match = implode("\r\n", $elements[0]);
 				
 		// return the links
 		return $match;
@@ -327,10 +327,10 @@ 
 		// so, list your entities one by one here. I included some of the
 		// more common ones.
 								
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quote|#34);'i",					// replace html entities
+		$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+						"'([\r\n])[\s]+'", // strip out white space
+						"'&(quote|#34);'i", // replace html entities
 						"'&(amp|#38);'i",
 						"'&(lt|#60);'i",
 						"'&(gt|#62);'i",
@@ -340,7 +340,7 @@ 
 						"'&(pound|#163);'i",
 						"'&(copy|#169);'i"
 						);				
-		$replace = array(	"",
+		$replace = array("",
 							"",
 							"\\1",
 							"\"",
@@ -353,7 +353,7 @@ 
 							chr(163),
 							chr(169));
 					
-		$text = preg_replace($search,$replace,$document);
+		$text = preg_replace($search, $replace, $document);
 								
 		return $text;
 	}
@@ -366,26 +366,26 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	private function _expandlinks($links,$URI)
+	private function _expandlinks($links, $URI)
 	{
 		
-		preg_match("/^[^\?]+/",$URI,$match);
+		preg_match("/^[^\?]+/", $URI, $match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
 				
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+		$search = array("|^http://".preg_quote($this->host)."|i",
 							"|^(?!http://)(\/)?(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 						
-		$replace = array(	"",
+		$replace = array("",
 							$match."/",
 							"/",
 							"/"
 						);			
 				
-		$expandedLinks = preg_replace($search,$replace,$links);
+		$expandedLinks = preg_replace($search, $replace, $links);
 
 		return $expandedLinks;
 	}
@@ -400,26 +400,26 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	private function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 			
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
+		if (!empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
+		if (!empty($this->host) && !isset($this->rawheaders['Host']))
 			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
+		if (!empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
 		
-		if($this->use_gzip) {
+		if ($this->use_gzip) {
 			// make sure PHP was built with --with-zlib
 			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
+			if (function_exists(gzinflate)) {
 			   $headers .= "Accept-encoding: gzip\r\n";
 			}
 			else {
@@ -430,38 +430,38 @@ 
 			}
 		}
 		
-		if(!empty($this->referer))
+		if (!empty($this->referer))
 			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
+		if (!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if (!is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 	
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+				$headers .= substr($cookie_headers, 0, -2)."\r\n";
 			} 
 		}
-		if(!empty($this->rawheaders))
+		if (!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if (!is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
-		if(!empty($content_type)) {
+		if (!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
-		if(!empty($body))	
+		if (!empty($body))	
 			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
+		if (!empty($this->user) || !empty($this->pass))	
 			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
 
 		$headers .= "\r\n";
@@ -471,7 +471,7 @@ 
 			socket_set_timeout($fp, $this->read_timeout);
 		$this->timed_out = false;
 		
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+		fwrite($fp, $headers.$body, strlen($headers.$body));
 		
 		$this->_redirectaddr = false;
 		unset($this->headers);
@@ -479,30 +479,30 @@ 
 		// content was returned gzip encoded?
 		$is_gzipped = false;
 						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		while ($currentHeader = fgets($fp, $this->_maxlinelen))
 		{
 			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 			{
-				$this->status=-100;
+				$this->status = -100;
 				return false;
 			}
 				
 		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
+			if (preg_match("/^\r?\n$/", $currentHeader))
 			      break;
 						
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			if (preg_match("/^(Location:|URI:)/i", $currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)\s+(.*)/", chop($currentHeader), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if (!preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if (!preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -511,16 +511,16 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 		
-			if(preg_match("|^HTTP/|",$currentHeader))
+			if (preg_match("|^HTTP/|", $currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status))
 				{
-					$this->status= $status[1];
+					$this->status = $status[1];
                 }				
 				$this->response_code = $currentHeader;
 			}
 			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
+			if (preg_match("/Content-Encoding: gzip/", $currentHeader)) {
 				$is_gzipped = true;
 			}
 			
@@ -529,7 +529,7 @@ 
 
 		# $results = fread($fp, $this->maxlength);
 		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
+		while ($data = fread($fp, $this->maxlength)) {
 		    $results .= $data;
 		    if (
 		        strlen($results) > $this->maxlength ) {
@@ -538,7 +538,7 @@ 
 		}
 		
 		// gunzip
-		if ( $is_gzipped ) {
+		if ($is_gzipped) {
 			// per http://www.php.net/manual/en/function.gzencode.php
 			$results = substr($results, 10);
 			$results = gzinflate($results);
@@ -546,26 +546,26 @@ 
 		
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 		{
-			$this->status=-100;
+			$this->status = -100;
 			return false;
 		}
 		
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);	
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -583,66 +583,66 @@ 
 	Output:		
 \*======================================================================*/
 	
-	private function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	private function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$headers = array();		
 					
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
+		if (!empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
+		if (!empty($this->host))
 			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
+		if (!empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
+		if (!empty($this->referer))
 			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
+		if (!empty($this->cookies))
 		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if (!is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 	
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers[] = substr($cookie_str,0,-2);
+				$headers[] = substr($cookie_str, 0, -2);
 			}
 		}
-		if(!empty($this->rawheaders))
+		if (!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if (!is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers[] = $headerKey.": ".$headerVal;
 		}
-		if(!empty($content_type)) {
+		if (!empty($content_type)) {
 			if ($content_type == "multipart/form-data")
 				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
 			else
 				$headers[] = "Content-type: $content_type";
 		}
-		if(!empty($body))	
+		if (!empty($body))	
 			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
+		if (!empty($this->user) || !empty($this->pass))	
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++) {
+		for ($curr_header = 0; $curr_header < count($headers); $curr_header++) {
 			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
 		}
 			  	                         
-		if(!empty($body))
+		if (!empty($body))
 			$cmdline_params .= " -d \"$body\"";
 		
-		if($this->read_timeout > 0)
+		if ($this->read_timeout > 0)
 			$cmdline_params .= " -m ".$this->read_timeout;
 		
 		$headerfile = uniqid(time());
@@ -651,37 +651,37 @@ 
 		$cmdline_params .= " -k";
         $results = array();
         $return = 0;
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI),$results,$return);
+		exec($this->curl_path." -D \"/tmp/$headerfile\"".escapeshellcmd($cmdline_params)." ".escapeshellcmd($URI), $results, $return);
 		
-		if($return)
+		if ($return)
 		{
 			$this->error = "Error: cURL could not retrieve the document, error $return.";
 			return false;
 		}
 			
 			
-		$results = implode("\r\n",$results);
+		$results = implode("\r\n", $results);
 		
 		$result_headers = file("/tmp/$headerfile");
 						
 		$this->_redirectaddr = false;
 		unset($this->headers);
 						
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
 		{
 			
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			if (preg_match("/^(Location: |URI: )/i", $result_headers[$currentHeader]))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
+				preg_match("/^(Location: |URI:)(.*)/", chop($result_headers[$currentHeader]), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if (!preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if (!preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -690,12 +690,12 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			if (preg_match("|^HTTP/|", $result_headers[$currentHeader]))
 			{
 			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
+			    if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $this->response_code, $match))
 			    {
-				$this->status= $match[1];
+				$this->status = $match[1];
                 	    }
 			}
 			$this->headers[] = $result_headers[$currentHeader];
@@ -703,20 +703,20 @@ 
 
 		// check if there is a a redirect meta tag
 		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);	
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -734,9 +734,9 @@ 
 	
 	public function setcookies()
 	{
-		for($x=0; $x<count($this->headers); $x++)
+		for ($x = 0; $x < count($this->headers); $x++)
 		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
+		if (preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x], $match))
 			$this->cookies[$match[1]] = $match[2];
 		}
 	}
@@ -768,7 +768,7 @@ 
 	
 	private function _connect(&$fp)
 	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+		if (!empty($this->proxy_host) && !empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
 				$host = $this->proxy_host;
@@ -782,7 +782,7 @@ 
 	
 		$this->status = 0;
 		
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -798,16 +798,16 @@ 
 		{
 			// socket connection failed
 			$this->status = $errno;
-			switch($errno)
+			switch ($errno)
 			{
 				case -3:
-					$this->error="socket creation failed (-3)";
+					$this->error = "socket creation failed (-3)";
 				case -4:
-					$this->error="dns lookup failure (-4)";
+					$this->error = "dns lookup failure (-4)";
 				case -5:
-					$this->error="connection refused or timed out (-5)";
+					$this->error = "connection refused or timed out (-5)";
 				default:
-					$this->error="connection failed (".$errno.")";
+					$this->error = "connection failed (".$errno.")";
 			}
 			return false;
 		}
@@ -843,7 +843,7 @@ 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
@@ -857,7 +857,7 @@ 
 				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 				
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= "--".$this->_mime_boundary."\r\n";

main/inc/lib/magpierss/rss_parse.inc

Spacing +110 added lines, -110 removed lines

@@ -24,7 +24,7 @@ 
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
 
-require_once (MAGPIE_DIR . 'rss_utils.inc');
+require_once (MAGPIE_DIR.'rss_utils.inc');
 
 /**
 * Hybrid parser, and object, takes RSS as a string and returns a simple object.
@@ -36,16 +36,16 @@ 
 class MagpieRSS {
     public $parser;
     
-    public $current_item   = array();  // item currently being parsed
-    public $items          = array();  // collection of parsed items
-    public $channel        = array();  // hash of channel fields
+    public $current_item   = array(); // item currently being parsed
+    public $items          = array(); // collection of parsed items
+    public $channel        = array(); // hash of channel fields
     public $textinput      = array();
     public $image          = array();
     public $feed_type;
     public $feed_version;
-    public $encoding       = '';       // output encoding of parsed rss
+    public $encoding       = ''; // output encoding of parsed rss
     
-    private $_source_encoding = '';     // only set if we have to parse xml prolog
+    private $_source_encoding = ''; // only set if we have to parse xml prolog
     
     public $ERROR = "";
     public $WARNING = "";
@@ -93,15 +93,15 @@ 
      *                                  source encoding. (caveat emptor)
      *
      */
-    public function MagpieRSS ($source, $output_encoding='ISO-8859-1', 
-                        $input_encoding=null, $detect_encoding=true) 
+    public function MagpieRSS($source, $output_encoding = 'ISO-8859-1', 
+                        $input_encoding = null, $detect_encoding = true) 
     {   
         # if PHP xml isn't compiled in, die
         #
         if (!function_exists('xml_parser_create')) {
-            $this->error( "Failed to load PHP's XML Extension. " . 
+            $this->error("Failed to load PHP's XML Extension. ". 
                           "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                           E_USER_ERROR);
         }
         
         list($parser, $source) = $this->create_parser($source, 
@@ -109,9 +109,9 @@ 
         
         
         if (!is_resource($parser)) {
-            $this->error( "Failed to create an instance of PHP's XML parser. " .
+            $this->error("Failed to create an instance of PHP's XML parser. ".
                           "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
+                          E_USER_ERROR);
         }
 
         
@@ -120,27 +120,27 @@ 
         # pass in parser, and a reference to this object
         # setup handlers
         #
-        xml_set_object( $this->parser, $this );
+        xml_set_object($this->parser, $this);
         xml_set_element_handler($this->parser, 
-                'feed_start_element', 'feed_end_element' );
+                'feed_start_element', 'feed_end_element');
                         
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
+        xml_set_character_data_handler($this->parser, 'feed_cdata'); 
     
-        $status = xml_parse( $this->parser, $source );
+        $status = xml_parse($this->parser, $source);
         
-        if (! $status ) {
-            $errorcode = xml_get_error_code( $this->parser );
-            if ( $errorcode != XML_ERROR_NONE ) {
-                $xml_error = xml_error_string( $errorcode );
+        if (!$status) {
+            $errorcode = xml_get_error_code($this->parser);
+            if ($errorcode != XML_ERROR_NONE) {
+                $xml_error = xml_error_string($errorcode);
                 $error_line = xml_get_current_line_number($this->parser);
                 $error_col = xml_get_current_column_number($this->parser);
                 $errormsg = "$xml_error at line $error_line, column $error_col";
 
-                $this->error( $errormsg );
+                $this->error($errormsg);
             }
         }
         
-        xml_parser_free( $this->parser );
+        xml_parser_free($this->parser);
 
         $this->normalize();
     }
@@ -151,26 +151,26 @@ 
         
         // check for a namespace, and split if found
         $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2); 
+        if (strpos($element, ':')) {
+            list($ns, $el) = split(':', $element, 2); 
         }
-        if ( $ns and $ns != 'rdf' ) {
+        if ($ns and $ns != 'rdf') {
             $this->current_namespace = $ns;
         }
             
         # if feed type isn't set, then this is first element of feed
         # identify feed from root element
         #
-        if (!isset($this->feed_type) ) {
-            if ( $el == 'rdf' ) {
+        if (!isset($this->feed_type)) {
+            if ($el == 'rdf') {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -178,14 +178,14 @@ 
             return;
         }
     
-        if ( $el == 'channel' ) 
+        if ($el == 'channel') 
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        elseif ($el == 'item' or $el == 'entry') 
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about']; 
             }
         }
@@ -209,10 +209,10 @@ 
         }
         
         # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
             
@@ -222,31 +222,31 @@ 
         }
         
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent ) 
+        elseif ($this->feed_type == ATOM and $this->incontent) 
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', 
                     array_map('map_attrs', 
                     array_keys($attrs), 
-                    array_values($attrs) ) );
+                    array_values($attrs)));
             
-            $this->append_content( "<$element $attrs_str>"  );
+            $this->append_content("<$element $attrs_str>");
                     
-            array_unshift( $this->stack, $el );
+            array_unshift($this->stack, $el);
         }
         
         // Atom support many links per containging element.
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->feed_type == ATOM and $el == 'link' ) 
+        elseif ($this->feed_type == ATOM and $el == 'link') 
         {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
+            if (isset($attrs['rel']) and $attrs['rel'] == 'alternate') 
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
             
             $this->append($link_el, $attrs['href']);
@@ -259,10 +259,10 @@ 
     
 
     
-    public function feed_cdata ($p, $text) {
+    public function feed_cdata($p, $text) {
         if ($this->feed_type == ATOM and $this->incontent) 
         {
-            $this->append_content( $text );
+            $this->append_content($text);
         }
         else {
             $current_el = join('_', array_reverse($this->stack));
@@ -270,35 +270,35 @@ 
         }
     }
     
-    public function feed_end_element ($p, $el) {
+    public function feed_end_element($p, $el) {
         $el = strtolower($el);
         
-        if ( $el == 'item' or $el == 'entry' ) 
+        if ($el == 'item' or $el == 'entry') 
         {
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput') 
         {
             $this->intextinput = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image') 
         {
             $this->inimage = false;
         }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {   
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        elseif ($el == 'channel' or $el == 'feed') 
         {
             $this->inchannel = false;
         }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        elseif ($this->feed_type == ATOM and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el ) 
+            if ($this->stack[0] == $el) 
             {
                 $this->append_content("</$el>");
             }
@@ -306,18 +306,18 @@ 
                 $this->append_content("<$el />");
             }
 
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         else {
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         
         $this->current_namespace = false;
     }
     
-    public function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
+    public function concat(&$str1, $str2 = "") {
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -325,11 +325,11 @@ 
     
     
     public function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat( $this->channel[ $this->incontent ], $text );
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
     
@@ -338,59 +338,59 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace ) 
+        if ($this->current_namespace) 
         {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
+                    $this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $this->current_namespace][ $el ], $text );
+                    $this->channel[$this->current_namespace][$el], $text );
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
+                    $this->textinput[$this->current_namespace][$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $this->current_namespace ][ $el ], $text );
+                    $this->image[$this->current_namespace][$el], $text );
             }
         }
         else {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $el ], $text);
+                    $this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $el ], $text );
+                    $this->textinput[$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $el ], $text );
+                    $this->image[$el], $text );
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $el ], $text );
+                    $this->channel[$el], $text );
             }
             
         }
     }
     
-    public function normalize () {
+    public function normalize() {
         // if atom populate rss fields
-        if ( $this->is_atom() ) {
+        if ($this->is_atom()) {
             $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
+                if (isset($item['summary']))
                     $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
+                if (isset($item['atom_content']))
                     $item['content']['encoded'] = $item['atom_content'];
                 
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
-                if ( $atom_date ) {
+                $atom_date = (isset($item['issued'])) ? $item['issued'] : $item['modified'];
+                if ($atom_date) {
                     $epoch = @parse_w3cdtf($atom_date);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -400,22 +400,22 @@ 
                 $this->items[$i] = $item;
             }       
         }
-        elseif ( $this->is_rss() ) {
+        elseif ($this->is_rss()) {
             $this->channel['tagline'] = $this->channel['description'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
+                if (isset($item['description']))
                     $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
+                if (isset($item['content']['encoded']))
                     $item['atom_content'] = $item['content']['encoded'];
                 
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
+                if ($this->is_rss() == '1.0' and isset($item['dc']['date'])) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
-                elseif ( isset($item['pubdate']) ) {
+                elseif (isset($item['pubdate'])) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -428,8 +428,8 @@ 
     }
     
     
-    public function is_rss () {
-        if ( $this->feed_type == RSS ) {
+    public function is_rss() {
+        if ($this->feed_type == RSS) {
             return $this->feed_version; 
         }
         else {
@@ -438,7 +438,7 @@ 
     }
     
     public function is_atom() {
-        if ( $this->feed_type == ATOM ) {
+        if ($this->feed_type == ATOM) {
             return $this->feed_version;
         }
         else {
@@ -451,7 +451,7 @@ 
     *
     */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
+        if (substr(phpversion(), 0, 1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
         }
         else {
@@ -476,7 +476,7 @@ 
     */
     public function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
-        if(!$detect && $in_enc) {
+        if (!$detect && $in_enc) {
             return xml_parser_create($in_enc);
         }
         else {
@@ -500,7 +500,7 @@ 
     *
     */
     public function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
+        if (!$detect) {
             return array(xml_parser_create($in_enc), $source);
         }
         
@@ -524,8 +524,8 @@ 
         // cast the XML to a known encoding
         // @see http://php.net/iconv
        
-        if (function_exists('iconv'))  {
-            $encoded_source = iconv($in_enc,'UTF-8', $source);
+        if (function_exists('iconv')) {
+            $encoded_source = iconv($in_enc, 'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
@@ -533,15 +533,15 @@ 
         
         // iconv didn't work, try mb_convert_encoding
         // @see http://php.net/mbstring
-        if(function_exists('mb_convert_encoding')) {
-            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
+        if (function_exists('mb_convert_encoding')) {
+            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
         }
         
         // else 
-        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
+        $this->error("Feed is in an unsupported character encoding. ($in_enc) ".
                      "You may see strange artifacts, and mangled characters.",
                      E_USER_NOTICE);
             
@@ -550,7 +550,7 @@ 
     
     public function known_encoding($enc) {
         $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
         }
         else {
@@ -558,20 +558,20 @@ 
         }
     }
 
-    public function error ($errormsg, $lvl=E_USER_WARNING) {
+    public function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if (isset($php_errormsg)) { 
             $errormsg .= " ($php_errormsg)";
         }
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);        
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);        
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
         
-        $notices = E_USER_NOTICE|E_NOTICE;
-        if ( $lvl&$notices ) {
+        $notices = E_USER_NOTICE | E_NOTICE;
+        if ($lvl & $notices) {
             $this->WARNING = $errormsg;
         } else {
             $this->ERROR = $errormsg;
@@ -589,15 +589,15 @@ 
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {
-	define("CASE_UPPER",1);
-	define("CASE_LOWER",0);
+	define("CASE_UPPER", 1);
+	define("CASE_LOWER", 0);
 
 
-	function array_change_key_case($array,$case=CASE_LOWER) {
-       if ($case=CASE_LOWER) $cmd=strtolower;
-       elseif ($case=CASE_UPPER) $cmd=strtoupper;
-       foreach($array as $key=>$value) {
-               $output[$cmd($key)]=$value;
+	function array_change_key_case($array, $case = CASE_LOWER) {
+       if ($case = CASE_LOWER) $cmd = strtolower;
+       elseif ($case = CASE_UPPER) $cmd = strtoupper;
+       foreach ($array as $key=>$value) {
+               $output[$cmd($key)] = $value;
        }
        return $output;
 	}

main/inc/lib/conditional_login.class.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
                     if (isset($condition['conditional_function']) && $condition['conditional_function']($user) == false) {
                         $_SESSION['conditional_login']['uid'] = $user['user_id'];
                         $_SESSION['conditional_login']['can_login'] = false;
-                        header("Location:". $condition['url']);
+                        header("Location:".$condition['url']);
                         exit();
                     }
                 }