ntwb / wordpress

src/wp-includes/ID3/module.audio.ogg.php

Doc Comments +5 added lines

@@ -427,6 +427,11 @@
 	}
 
 	// http://tools.ietf.org/html/draft-ietf-codec-oggopus-03
+
+	/**
+	 * @param string $filedata
+	 * @param integer $filedataoffset
+	 */
 	public function ParseOpusPageHeader(&$filedata, &$filedataoffset, &$oggpageinfo) {
 		$info = &$this->getid3->info;
 		$info['audio']['dataformat']   = 'opus';

Indentation +1 added lines, -1 removed lines

@@ -528,7 +528,7 @@
 		return $oggheader;
 	}
 
-    // http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810005
+	// http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810005
 	public function ParseVorbisComments() {
 		$info = &$this->getid3->info;
 

Spacing +61 added lines, -61 removed lines

@@ -65,7 +65,7 @@ 
 
 		} elseif (substr($filedata, 0, 8) == 'OpusHead') {
 
-			if( $this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false ) {
+			if ($this->ParseOpusPageHeader($filedata, $filedataoffset, $oggpageinfo) == false) {
 				return false;
 			}
 
@@ -78,9 +78,9 @@ 
 			$info['audio']['bitrate_mode'] = 'abr';
 			$info['audio']['lossless']     = false;
 
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string']           =                              substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex   '
+			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_string']           = substr($filedata, $filedataoffset, 8); // hard-coded to 'Speex   '
 			$filedataoffset += 8;
-			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']          =                              substr($filedata, $filedataoffset, 20);
+			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version']          = substr($filedata, $filedataoffset, 20);
 			$filedataoffset += 20;
 			$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['speex_version_id']       = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 			$filedataoffset += 4;
@@ -125,45 +125,45 @@ 
 
 			// http://www.theora.org/doc/Theora.pdf (section 6.2)
 
-			$info['ogg']['pageheader']['theora']['theora_magic']             =                           substr($filedata, $filedataoffset,  7); // hard-coded to "\x80.'theora'
+			$info['ogg']['pageheader']['theora']['theora_magic']             = substr($filedata, $filedataoffset, 7); // hard-coded to "\x80.'theora'
 			$filedataoffset += 7;
-			$info['ogg']['pageheader']['theora']['version_major']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['version_major']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['version_minor']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['version_minor']            = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['version_revision']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['version_revision']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['frame_width_macroblocks']  = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['pageheader']['theora']['frame_width_macroblocks']  = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['pageheader']['theora']['frame_height_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['pageheader']['theora']['frame_height_macroblocks'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['pageheader']['theora']['resolution_x']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['resolution_x']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['resolution_y']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['resolution_y']             = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['picture_offset_x']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['picture_offset_x']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['picture_offset_y']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['picture_offset_y']         = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['frame_rate_numerator']     = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  4));
+			$info['ogg']['pageheader']['theora']['frame_rate_numerator']     = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4));
 			$filedataoffset += 4;
-			$info['ogg']['pageheader']['theora']['frame_rate_denominator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  4));
+			$info['ogg']['pageheader']['theora']['frame_rate_denominator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 4));
 			$filedataoffset += 4;
-			$info['ogg']['pageheader']['theora']['pixel_aspect_numerator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['pixel_aspect_numerator']   = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['pixel_aspect_denominator'] = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['color_space_id']           = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  1));
+			$info['ogg']['pageheader']['theora']['color_space_id']           = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 1));
 			$filedataoffset += 1;
-			$info['ogg']['pageheader']['theora']['nominal_bitrate']          = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  3));
+			$info['ogg']['pageheader']['theora']['nominal_bitrate']          = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 3));
 			$filedataoffset += 3;
-			$info['ogg']['pageheader']['theora']['flags']                    = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['pageheader']['theora']['flags']                    = getid3_lib::BigEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
 
 			$info['ogg']['pageheader']['theora']['quality']         = ($info['ogg']['pageheader']['theora']['flags'] & 0xFC00) >> 10;
-			$info['ogg']['pageheader']['theora']['kfg_shift']       = ($info['ogg']['pageheader']['theora']['flags'] & 0x03E0) >>  5;
-			$info['ogg']['pageheader']['theora']['pixel_format_id'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0018) >>  3;
-			$info['ogg']['pageheader']['theora']['reserved']        = ($info['ogg']['pageheader']['theora']['flags'] & 0x0007) >>  0; // should be 0
+			$info['ogg']['pageheader']['theora']['kfg_shift']       = ($info['ogg']['pageheader']['theora']['flags'] & 0x03E0) >> 5;
+			$info['ogg']['pageheader']['theora']['pixel_format_id'] = ($info['ogg']['pageheader']['theora']['flags'] & 0x0018) >> 3;
+			$info['ogg']['pageheader']['theora']['reserved']        = ($info['ogg']['pageheader']['theora']['flags'] & 0x0007) >> 0; // should be 0
 			$info['ogg']['pageheader']['theora']['color_space']     = self::TheoraColorSpace($info['ogg']['pageheader']['theora']['color_space_id']);
 			$info['ogg']['pageheader']['theora']['pixel_format']    = self::TheoraPixelFormat($info['ogg']['pageheader']['theora']['pixel_format_id']);
 
@@ -187,24 +187,24 @@ 
 			// Ogg Skeleton version 3.0 Format Specification
 			// http://xiph.org/ogg/doc/skeleton.html
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['version_major']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['skeleton']['fishead']['raw']['version_major']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['skeleton']['fishead']['raw']['version_minor']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+			$info['ogg']['skeleton']['fishead']['raw']['version_minor']                = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
 			$filedataoffset += 2;
-			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
-			$info['ogg']['skeleton']['fishead']['raw']['basetime_denominator']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+			$info['ogg']['skeleton']['fishead']['raw']['basetime_denominator']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 			$filedataoffset += 8;
 			$info['ogg']['skeleton']['fishead']['raw']['utc']                          = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 20));
 			$filedataoffset += 20;
 
 			$info['ogg']['skeleton']['fishead']['version']          = $info['ogg']['skeleton']['fishead']['raw']['version_major'].'.'.$info['ogg']['skeleton']['fishead']['raw']['version_minor'];
 			$info['ogg']['skeleton']['fishead']['presentationtime'] = $info['ogg']['skeleton']['fishead']['raw']['presentationtime_numerator'] / $info['ogg']['skeleton']['fishead']['raw']['presentationtime_denominator'];
-			$info['ogg']['skeleton']['fishead']['basetime']         = $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator']         / $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'];
+			$info['ogg']['skeleton']['fishead']['basetime']         = $info['ogg']['skeleton']['fishead']['raw']['basetime_numerator'] / $info['ogg']['skeleton']['fishead']['raw']['basetime_denominator'];
 			$info['ogg']['skeleton']['fishead']['utc']              = $info['ogg']['skeleton']['fishead']['raw']['utc'];
 
 
@@ -218,23 +218,23 @@ 
 				if (substr($filedata, 0, 8) == "fisbone\x00") {
 
 					$filedataoffset = 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['message_header_offset']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['message_header_offset']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['serial_number']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['serial_number']           = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['number_header_packets']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['number_header_packets']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_numerator']   = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+					$info['ogg']['skeleton']['fisbone']['raw']['granulerate_denominator'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['basegranule']             = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  8));
+					$info['ogg']['skeleton']['fisbone']['raw']['basegranule']             = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 8));
 					$filedataoffset += 8;
-					$info['ogg']['skeleton']['fisbone']['raw']['preroll']                 = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+					$info['ogg']['skeleton']['fisbone']['raw']['preroll']                 = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 					$filedataoffset += 4;
-					$info['ogg']['skeleton']['fisbone']['raw']['granuleshift']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+					$info['ogg']['skeleton']['fisbone']['raw']['granuleshift']            = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
 					$filedataoffset += 1;
-					$info['ogg']['skeleton']['fisbone']['raw']['padding']                 =                              substr($filedata, $filedataoffset,  3);
+					$info['ogg']['skeleton']['fisbone']['raw']['padding']                 = substr($filedata, $filedataoffset, 3);
 					$filedataoffset += 3;
 
 				} elseif (substr($filedata, 1, 6) == 'theora') {
@@ -276,14 +276,14 @@ 
 			case 'vorbis':
 				$filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
 				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['packet_type'] = getid3_lib::LittleEndian2Int(substr($filedata, 0, 1));
-				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] =                              substr($filedata, 1, 6); // hard-coded to 'vorbis'
+				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 1, 6); // hard-coded to 'vorbis'
 
 				$this->ParseVorbisComments();
 				break;
 
 			case 'flac':
 				$flac = new getid3_flac($this->getid3);
-				if (!$flac->parseMETAdata()) {
+				if ( ! $flac->parseMETAdata()) {
 					$info['error'][] = 'Failed to parse FLAC headers';
 					return false;
 				}
@@ -298,7 +298,7 @@ 
 			case 'opus':
 				$filedata = $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
 				$info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['stream_type'] = substr($filedata, 0, 8); // hard-coded to 'OpusTags'
-				if(substr($filedata, 0, 8)  != 'OpusTags') {
+				if (substr($filedata, 0, 8) != 'OpusTags') {
 					$info['error'][] = 'Expected "OpusTags" as header but got "'.substr($filedata, 0, 8).'"';
 					return false;
 				}
@@ -309,7 +309,7 @@ 
 		}
 
 		// Last Page - Number of Samples
-		if (!getid3_lib::intValueSupported($info['avdataend'])) {
+		if ( ! getid3_lib::intValueSupported($info['avdataend'])) {
 
 			$info['warning'][] = 'Unable to parse Ogg end chunk file (PHP does not support file operations beyond '.round(PHP_INT_MAX / 1073741824).'GB)';
 
@@ -321,26 +321,26 @@ 
 				$this->fseek($info['avdataend'] - ($LastOggSpostion + strlen('SggO')));
 				$info['avdataend'] = $this->ftell();
 				$info['ogg']['pageheader']['eos'] = $this->ParseOggPageHeader();
-				$info['ogg']['samples']   = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
+				$info['ogg']['samples'] = $info['ogg']['pageheader']['eos']['pcm_abs_position'];
 				if ($info['ogg']['samples'] == 0) {
 					$info['error'][] = 'Corrupt Ogg file: eos.number of samples == zero';
 					return false;
 				}
-				if (!empty($info['audio']['sample_rate'])) {
+				if ( ! empty($info['audio']['sample_rate'])) {
 					$info['ogg']['bitrate_average'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / ($info['ogg']['samples'] / $info['audio']['sample_rate']);
 				}
 			}
 
 		}
 
-		if (!empty($info['ogg']['bitrate_average'])) {
+		if ( ! empty($info['ogg']['bitrate_average'])) {
 			$info['audio']['bitrate'] = $info['ogg']['bitrate_average'];
-		} elseif (!empty($info['ogg']['bitrate_nominal'])) {
+		} elseif ( ! empty($info['ogg']['bitrate_nominal'])) {
 			$info['audio']['bitrate'] = $info['ogg']['bitrate_nominal'];
-		} elseif (!empty($info['ogg']['bitrate_min']) && !empty($info['ogg']['bitrate_max'])) {
+		} elseif ( ! empty($info['ogg']['bitrate_min']) && ! empty($info['ogg']['bitrate_max'])) {
 			$info['audio']['bitrate'] = ($info['ogg']['bitrate_min'] + $info['ogg']['bitrate_max']) / 2;
 		}
-		if (isset($info['audio']['bitrate']) && !isset($info['playtime_seconds'])) {
+		if (isset($info['audio']['bitrate']) && ! isset($info['playtime_seconds'])) {
 			if ($info['audio']['bitrate'] == 0) {
 				$info['error'][] = 'Corrupt Ogg file: bitrate_audio == zero';
 				return false;
@@ -355,7 +355,7 @@ 
 			if ($info['audio']['dataformat'] == 'vorbis') {
 
 				// Vorbis 1.0 starts with Xiph.Org
-				if  (preg_match('/^Xiph.Org/', $info['audio']['encoder'])) {
+				if (preg_match('/^Xiph.Org/', $info['audio']['encoder'])) {
 
 					if ($info['audio']['bitrate_mode'] == 'abr') {
 
@@ -369,7 +369,7 @@ 
 					}
 				}
 
-				if (empty($info['audio']['encoder_options']) && !empty($info['ogg']['bitrate_nominal'])) {
+				if (empty($info['audio']['encoder_options']) && ! empty($info['ogg']['bitrate_nominal'])) {
 					$info['audio']['encoder_options'] = 'Nominal bitrate: '.intval(round($info['ogg']['bitrate_nominal'] / 1000)).'kbps';
 				}
 			}
@@ -407,7 +407,7 @@ 
 		$filedataoffset += 4;
 		$info['ogg']['bitrate_min']      = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 		$filedataoffset += 4;
-		$info['ogg']['blocksize_small']  = pow(2,  getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
+		$info['ogg']['blocksize_small']  = pow(2, getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0x0F);
 		$info['ogg']['blocksize_large']  = pow(2, (getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)) & 0xF0) >> 4);
 		$info['ogg']['stop_bit']         = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1)); // must be 1, marks end of packet
 
@@ -439,7 +439,7 @@ 
 
 		$info['ogg']['pageheader']['opus']['opus_magic'] = substr($filedata, $filedataoffset, 8); // hard-coded to 'OpusHead'
 		$filedataoffset += 8;
-		$info['ogg']['pageheader']['opus']['version']    = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		$info['ogg']['pageheader']['opus']['version']    = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
 		$filedataoffset += 1;
 
 		if ($info['ogg']['pageheader']['opus']['version'] < 1 || $info['ogg']['pageheader']['opus']['version'] > 15) {
@@ -447,7 +447,7 @@ 
 			return false;
 		}
 
-		$info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  1));
+		$info['ogg']['pageheader']['opus']['out_channel_count'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 1));
 		$filedataoffset += 1;
 
 		if ($info['ogg']['pageheader']['opus']['out_channel_count'] == 0) {
@@ -455,10 +455,10 @@ 
 			return false;
 		}
 
-		$info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
+		$info['ogg']['pageheader']['opus']['pre_skip'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 2));
 		$filedataoffset += 2;
 
-		$info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  4));
+		$info['ogg']['pageheader']['opus']['sample_rate'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset, 4));
 		$filedataoffset += 4;
 
 		//$info['ogg']['pageheader']['opus']['output_gain'] = getid3_lib::LittleEndian2Int(substr($filedata, $filedataoffset,  2));
@@ -540,7 +540,7 @@ 
 			case 'vorbis':
 			case 'speex':
 			case 'opus':
-				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset'];  // Second Ogg page, after header block
+				$CommentStartOffset = $info['ogg']['pageheader'][$VorbisCommentPage]['page_start_offset']; // Second Ogg page, after header block
 				$this->fseek($CommentStartOffset);
 				$commentdataoffset = 27 + $info['ogg']['pageheader'][$VorbisCommentPage]['page_segments'];
 				$commentdata = $this->fread(self::OggPageSegmentLength($info['ogg']['pageheader'][$VorbisCommentPage], 1) + $commentdataoffset);
@@ -641,7 +641,7 @@ 
 				$commentdata .= $AsYetUnusedData;
 
 				//$commentdata .= $this->fread($info['ogg']['pageheader'][$oggpageinfo['page_seqno']]['page_length']);
-				if (!isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
+				if ( ! isset($info['ogg']['pageheader'][$VorbisCommentPage])) {
 					$info['warning'][] = 'undefined Vorbis Comment page "'.$VorbisCommentPage.'" at offset '.$this->ftell();
 					break;
 				}
@@ -658,7 +658,7 @@ 
 			$commentstring = substr($commentdata, $commentdataoffset, $ThisFileInfo_ogg_comments_raw[$i]['size']);
 			$commentdataoffset += $ThisFileInfo_ogg_comments_raw[$i]['size'];
 
-			if (!$commentstring) {
+			if ( ! $commentstring) {
 
 				// no comment?
 				$info['warning'][] = 'Blank Ogg comment ['.$i.']';
@@ -686,7 +686,7 @@ 
 					$this->notice('Found deprecated COVERART tag, it should be replaced in honor of METADATA_BLOCK_PICTURE structure');
 					/** @todo use 'coverartmime' where available */
 					$imageinfo = getid3_lib::GetDataImageSize($data);
-					if ($imageinfo === false || !isset($imageinfo['mime'])) {
+					if ($imageinfo === false || ! isset($imageinfo['mime'])) {
 						$this->warning('COVERART vorbiscomment tag contains invalid image');
 						continue;
 					}
@@ -775,7 +775,7 @@ 
 	}
 
 
-	public static function OggPageSegmentLength($OggInfoArray, $SegmentNumber=1) {
+	public static function OggPageSegmentLength($OggInfoArray, $SegmentNumber = 1) {
 		for ($i = 0; $i < $SegmentNumber; $i++) {
 			$segmentlength = 0;
 			foreach ($OggInfoArray['segment_table'] as $key => $value) {

Braces +1 added lines, -2 removed lines

@@ -547,8 +547,7 @@
 
 				if ($info['audio']['dataformat'] == 'vorbis') {
 					$commentdataoffset += (strlen('vorbis') + 1);
-				}
-				else if ($info['audio']['dataformat'] == 'opus') {
+				} else if ($info['audio']['dataformat'] == 'opus') {
 					$commentdataoffset += strlen('OpusTags');
 				}
 

src/wp-includes/ID3/module.tag.apetag.php

Doc Comments +3 added lines

@@ -331,6 +331,9 @@
 		return true;
 	}
 
+	/**
+	 * @param string $APEheaderFooterData
+	 */
 	public function parseAPEheaderFooter($APEheaderFooterData) {
 		// http://www.uni-jena.de/~pfk/mpp/sv8/apeheader.html
 

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
 	public function Analyze() {
 		$info = &$this->getid3->info;
 
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
+		if ( ! getid3_lib::intValueSupported($info['filesize'])) {
 			$info['warning'][] = 'Unable to check for APEtags because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
@@ -58,7 +58,7 @@ 
 			}
 
 		}
-		if (!isset($info['ape']['tag_offset_end'])) {
+		if ( ! isset($info['ape']['tag_offset_end'])) {
 
 			// APE tag not found
 			unset($info['ape']);
@@ -71,7 +71,7 @@ 
 
 		$this->fseek($thisfile_ape['tag_offset_end'] - $apetagheadersize);
 		$APEfooterData = $this->fread(32);
-		if (!($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) {
+		if ( ! ($thisfile_ape['footer'] = $this->parseAPEheaderFooter($APEfooterData))) {
 			$info['error'][] = 'Error parsing APE footer at offset '.$thisfile_ape['tag_offset_end'];
 			return false;
 		}
@@ -282,7 +282,7 @@ 
 							}
 						} elseif (is_string($this->inline_attachments)) {
 							$this->inline_attachments = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->inline_attachments), DIRECTORY_SEPARATOR);
-							if (!is_dir($this->inline_attachments) || !is_writable($this->inline_attachments)) {
+							if ( ! is_dir($this->inline_attachments) || ! is_writable($this->inline_attachments)) {
 								// cannot write, skip
 								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$this->inline_attachments.'" (not writable)';
 								unset($thisfile_ape_items_current['data']);
@@ -292,7 +292,7 @@ 
 						// if we get this far, must be OK
 						if (is_string($this->inline_attachments)) {
 							$destination_filename = $this->inline_attachments.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$thisfile_ape_items_current['data_offset'];
-							if (!file_exists($destination_filename) || is_writable($destination_filename)) {
+							if ( ! file_exists($destination_filename) || is_writable($destination_filename)) {
 								file_put_contents($destination_filename, $thisfile_ape_items_current['data']);
 							} else {
 								$info['warning'][] = 'attachment at '.$thisfile_ape_items_current['offset'].' cannot be saved to "'.$destination_filename.'" (not writable)';
@@ -300,7 +300,7 @@ 
 							$thisfile_ape_items_current['data_filename'] = $destination_filename;
 							unset($thisfile_ape_items_current['data']);
 						} else {
-							if (!isset($info['ape']['comments']['picture'])) {
+							if ( ! isset($info['ape']['comments']['picture'])) {
 								$info['ape']['comments']['picture'] = array();
 							}
 							$comments_picture_data = array();
@@ -338,17 +338,17 @@ 
 		$headerfooterinfo['raw'] = array();
 		$headerfooterinfo_raw = &$headerfooterinfo['raw'];
 
-		$headerfooterinfo_raw['footer_tag']   =                  substr($APEheaderFooterData,  0, 8);
+		$headerfooterinfo_raw['footer_tag'] = substr($APEheaderFooterData, 0, 8);
 		if ($headerfooterinfo_raw['footer_tag'] != 'APETAGEX') {
 			return false;
 		}
-		$headerfooterinfo_raw['version']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData,  8, 4));
+		$headerfooterinfo_raw['version']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 8, 4));
 		$headerfooterinfo_raw['tagsize']      = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 12, 4));
 		$headerfooterinfo_raw['tag_items']    = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 16, 4));
 		$headerfooterinfo_raw['global_flags'] = getid3_lib::LittleEndian2Int(substr($APEheaderFooterData, 20, 4));
-		$headerfooterinfo_raw['reserved']     =                              substr($APEheaderFooterData, 24, 8);
+		$headerfooterinfo_raw['reserved']     = substr($APEheaderFooterData, 24, 8);
 
-		$headerfooterinfo['tag_version']         = $headerfooterinfo_raw['version'] / 1000;
+		$headerfooterinfo['tag_version'] = $headerfooterinfo_raw['version'] / 1000;
 		if ($headerfooterinfo['tag_version'] >= 2) {
 			$headerfooterinfo['flags'] = $this->parseAPEtagFlags($headerfooterinfo_raw['global_flags']);
 		}
@@ -362,7 +362,7 @@ 
 		$flags['header']            = (bool) ($rawflagint & 0x80000000);
 		$flags['footer']            = (bool) ($rawflagint & 0x40000000);
 		$flags['this_is_header']    = (bool) ($rawflagint & 0x20000000);
-		$flags['item_contents_raw'] =        ($rawflagint & 0x00000006) >> 1;
+		$flags['item_contents_raw'] = ($rawflagint & 0x00000006) >> 1;
 		$flags['read_only']         = (bool) ($rawflagint & 0x00000001);
 
 		$flags['item_contents']     = $this->APEcontentTypeFlagLookup($flags['item_contents_raw']);

src/wp-includes/ID3/module.tag.id3v2.php

Doc Comments +27 added lines

@@ -2596,6 +2596,9 @@ 
 
 
 
+	/**
+	 * @param string $languagecode
+	 */
 	public static function LanguageLookup($languagecode, $casesensitive=false) {
 
 		if (!$casesensitive) {
@@ -3052,6 +3055,9 @@ 
 	}
 
 
+	/**
+	 * @param string $index
+	 */
 	public static function ETCOEventLookup($index) {
 		if (($index >= 0x17) && ($index <= 0xDF)) {
 			return 'reserved for future use';
@@ -3095,6 +3101,9 @@ 
 		return (isset($EventLookup[$index]) ? $EventLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function SYTLContentTypeLookup($index) {
 		static $SYTLContentTypeLookup = array(
 			0x00 => 'other',
@@ -3111,6 +3120,9 @@ 
 		return (isset($SYTLContentTypeLookup[$index]) ? $SYTLContentTypeLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function APICPictureTypeLookup($index, $returnarray=false) {
 		static $APICPictureTypeLookup = array(
 			0x00 => 'Other',
@@ -3141,6 +3153,9 @@ 
 		return (isset($APICPictureTypeLookup[$index]) ? $APICPictureTypeLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function COMRReceivedAsLookup($index) {
 		static $COMRReceivedAsLookup = array(
 			0x00 => 'Other',
@@ -3157,6 +3172,9 @@ 
 		return (isset($COMRReceivedAsLookup[$index]) ? $COMRReceivedAsLookup[$index] : '');
 	}
 
+	/**
+	 * @param integer $index
+	 */
 	public static function RVA2ChannelTypeLookup($index) {
 		static $RVA2ChannelTypeLookup = array(
 			0x00 => 'Other',
@@ -3536,6 +3554,9 @@ 
 		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_short');
 	}
 
+	/**
+	 * @param integer $encoding
+	 */
 	public static function TextEncodingTerminatorLookup($encoding) {
 		// http://www.id3.org/id3v2.4.0-structure.txt
 		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
@@ -3562,6 +3583,9 @@ 
 		return (isset($TextEncodingNameLookup[$encoding]) ? $TextEncodingNameLookup[$encoding] : 'ISO-8859-1');
 	}
 
+	/**
+	 * @param string $framename
+	 */
 	public static function IsValidID3v2FrameName($framename, $id3v2majorversion) {
 		switch ($id3v2majorversion) {
 			case 2:
@@ -3591,6 +3615,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $datestamp
+	 */
 	public static function IsValidDateStampString($datestamp) {
 		if (strlen($datestamp) != 8) {
 			return false;

Indentation +9 added lines, -14 removed lines

@@ -1972,9 +1972,9 @@ 
 			// Element ID      <text string> $00
 			// Start time      $xx xx xx xx
 			// End time        $xx xx xx xx
-            // Start offset    $xx xx xx xx
-            // End offset      $xx xx xx xx
-            // <Optional embedded sub-frames>
+			// Start offset    $xx xx xx xx
+			// End offset      $xx xx xx xx
+			// <Optional embedded sub-frames>
 
 			$frame_offset = 0;
 			@list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
@@ -2069,7 +2069,7 @@ 
 			// CTOC flags        %xx
 			// Entry count       $xx
 			// Child Element ID  <string>$00   /* zero or more child CHAP or CTOC entries */
-            // <Optional embedded sub-frames>
+			// <Optional embedded sub-frames>
 
 			$frame_offset = 0;
 			@list($parsedFrame['element_id']) = explode("\x00", $parsedFrame['data'], 2);
@@ -2392,8 +2392,7 @@ 
 			ZAR	Rand
 			ZMK	Kwacha
 			ZWD	Zimbabwe Dollars
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-units');
 	}
@@ -2588,8 +2587,7 @@ 
 			ZAR	South Africa
 			ZMK	Zambia
 			ZWD	Zimbabwe
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($currencyid, $begin, __LINE__, __FILE__, 'id3v2-currency-country');
 	}
@@ -3045,8 +3043,7 @@ 
 			zho	Chinese
 			zul	Zulu
 			zun	Zuni
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($languagecode, $begin, __LINE__, __FILE__, 'id3v2-languagecode');
 	}
@@ -3346,8 +3343,7 @@ 
 			TFEA	Featured Artist
 			TSTU	Recording Studio
 			rgad	Replay Gain Adjustment
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_long');
 
@@ -3530,8 +3526,7 @@ 
 			TFEA	featured_artist
 			TSTU	recording_studio
 			rgad	replay_gain_adjustment
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($framename, $begin, __LINE__, __FILE__, 'id3v2-framename_short');
 	}

Spacing +63 added lines, -63 removed lines

@@ -48,13 +48,13 @@ 
 		// shortcuts
 		$info['id3v2']['header'] = true;
 		$thisfile_id3v2                  = &$info['id3v2'];
-		$thisfile_id3v2['flags']         =  array();
+		$thisfile_id3v2['flags']         = array();
 		$thisfile_id3v2_flags            = &$thisfile_id3v2['flags'];
 
 
 		$this->fseek($this->StartingOffset);
 		$header = $this->fread(10);
-		if (substr($header, 0, 3) == 'ID3'  &&  strlen($header) == 10) {
+		if (substr($header, 0, 3) == 'ID3' && strlen($header) == 10) {
 
 			$thisfile_id3v2['majorversion'] = ord($header{3});
 			$thisfile_id3v2['minorversion'] = ord($header{4});
@@ -124,10 +124,10 @@ 
 	//        Flags         $xx xx
 
 		$sizeofframes = $thisfile_id3v2['headerlength'] - 10; // not including 10-byte initial header
-		if (!empty($thisfile_id3v2['exthead']['length'])) {
+		if ( ! empty($thisfile_id3v2['exthead']['length'])) {
 			$sizeofframes -= ($thisfile_id3v2['exthead']['length'] + 4);
 		}
-		if (!empty($thisfile_id3v2_flags['isfooter'])) {
+		if ( ! empty($thisfile_id3v2_flags['isfooter'])) {
 			$sizeofframes -= 10; // footer takes last 10 bytes of ID3v2 header, after frame data, before audio
 		}
 		if ($sizeofframes > 0) {
@@ -135,7 +135,7 @@ 
 			$framedata = $this->fread($sizeofframes); // read all frames from file into $framedata variable
 
 			//    if entire frame data is unsynched, de-unsynch it now (ID3v2.3.x)
-			if (!empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) {
+			if ( ! empty($thisfile_id3v2_flags['unsynch']) && ($id3v2_majorversion <= 3)) {
 				$framedata = $this->DeUnsynchronise($framedata);
 			}
 			//        [in ID3v2.4.0] Unsynchronisation [S:6.1] is done on frame level, instead
@@ -150,7 +150,7 @@ 
 
 
 			//    Extended Header
-			if (!empty($thisfile_id3v2_flags['exthead'])) {
+			if ( ! empty($thisfile_id3v2_flags['exthead'])) {
 				$extended_header_offset = 0;
 
 				if ($id3v2_majorversion == 3) {
@@ -272,7 +272,7 @@ 
 					// Flags     $xx xx
 
 					$frame_header = substr($framedata, 0, 6); // take next 6 bytes for header
-					$framedata    = substr($framedata, 6);    // and leave the rest in $framedata
+					$framedata    = substr($framedata, 6); // and leave the rest in $framedata
 					$frame_name   = substr($frame_header, 0, 3);
 					$frame_size   = getid3_lib::BigEndian2Int(substr($frame_header, 3, 3), 0);
 					$frame_flags  = 0; // not used for anything in ID3v2.2, just set to avoid E_NOTICEs
@@ -284,7 +284,7 @@ 
 					// Flags     $xx xx
 
 					$frame_header = substr($framedata, 0, 10); // take next 10 bytes for header
-					$framedata    = substr($framedata, 10);    // and leave the rest in $framedata
+					$framedata    = substr($framedata, 10); // and leave the rest in $framedata
 
 					$frame_name = substr($frame_header, 0, 4);
 					if ($id3v2_majorversion == 3) {
@@ -379,7 +379,7 @@ 
 						$info['warning'][] = 'Invalid ID3v2 frame size, aborting.';
 
 					}
-					if (!$this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion)) {
+					if ( ! $this->IsValidID3v2FrameName($frame_name, $id3v2_majorversion)) {
 
 						switch ($frame_name) {
 							case "\x00\x00".'MP':
@@ -397,7 +397,7 @@ 
 								break;
 						}
 
-					} elseif (!isset($framedata) || ($frame_size > strlen($framedata))) {
+					} elseif ( ! isset($framedata) || ($frame_size > strlen($framedata))) {
 
 						$info['error'][] = 'error parsing "'.$frame_name.'" ('.$framedataoffset.' bytes into the ID3v2.'.$id3v2_majorversion.' tag). (ERROR: $frame_size ('.$frame_size.') > strlen($framedata) ('.(isset($framedata) ? strlen($framedata) : 'null').')).';
 
@@ -456,27 +456,27 @@ 
 			}
 		}
 
-		if (!isset($thisfile_id3v2['comments']['year']) && !empty($thisfile_id3v2['comments']['recording_time'][0]) && preg_match('#^([0-9]{4})#', trim($thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
+		if ( ! isset($thisfile_id3v2['comments']['year']) && ! empty($thisfile_id3v2['comments']['recording_time'][0]) && preg_match('#^([0-9]{4})#', trim($thisfile_id3v2['comments']['recording_time'][0]), $matches)) {
 			$thisfile_id3v2['comments']['year'] = array($matches[1]);
 		}
 
 
-		if (!empty($thisfile_id3v2['TXXX'])) {
+		if ( ! empty($thisfile_id3v2['TXXX'])) {
 			// MediaMonkey does this, maybe others: write a blank RGAD frame, but put replay-gain adjustment values in TXXX frames
 			foreach ($thisfile_id3v2['TXXX'] as $txxx_array) {
 				switch ($txxx_array['description']) {
 					case 'replaygain_track_gain':
-						if (empty($info['replay_gain']['track']['adjustment']) && !empty($txxx_array['data'])) {
+						if (empty($info['replay_gain']['track']['adjustment']) && ! empty($txxx_array['data'])) {
 							$info['replay_gain']['track']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
 						}
 						break;
 					case 'replaygain_track_peak':
-						if (empty($info['replay_gain']['track']['peak']) && !empty($txxx_array['data'])) {
+						if (empty($info['replay_gain']['track']['peak']) && ! empty($txxx_array['data'])) {
 							$info['replay_gain']['track']['peak'] = floatval($txxx_array['data']);
 						}
 						break;
 					case 'replaygain_album_gain':
-						if (empty($info['replay_gain']['album']['adjustment']) && !empty($txxx_array['data'])) {
+						if (empty($info['replay_gain']['album']['adjustment']) && ! empty($txxx_array['data'])) {
 							$info['replay_gain']['album']['adjustment'] = floatval(trim(str_replace('dB', '', $txxx_array['data'])));
 						}
 						break;
@@ -524,7 +524,7 @@ 
 		$info = &$this->getid3->info;
 		$id3v2_majorversion = $info['id3v2']['majorversion'];
 
-		$parsedFrame['framenamelong']  = $this->FrameNameLongLookup($parsedFrame['frame_name']);
+		$parsedFrame['framenamelong'] = $this->FrameNameLongLookup($parsedFrame['frame_name']);
 		if (empty($parsedFrame['framenamelong'])) {
 			unset($parsedFrame['framenamelong']);
 		}
@@ -563,14 +563,14 @@ 
 
 				if ($parsedFrame['flags']['DataLengthIndicator']) {
 					$parsedFrame['data_length_indicator'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4), 1);
-					$parsedFrame['data']                  =                           substr($parsedFrame['data'], 4);
+					$parsedFrame['data']                  = substr($parsedFrame['data'], 4);
 				}
 			}
 
 			//    Frame-level de-compression
 			if ($parsedFrame['flags']['compression']) {
 				$parsedFrame['decompressed_size'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], 0, 4));
-				if (!function_exists('gzuncompress')) {
+				if ( ! function_exists('gzuncompress')) {
 					$info['warning'][] = 'gzuncompress() support required to decompress ID3v2 frame "'.$parsedFrame['frame_name'].'"';
 				} else {
 					if ($decompresseddata = @gzuncompress(substr($parsedFrame['data'], 4))) {
@@ -584,7 +584,7 @@ 
 			}
 		}
 
-		if (!empty($parsedFrame['flags']['DataLengthIndicator'])) {
+		if ( ! empty($parsedFrame['flags']['DataLengthIndicator'])) {
 			if ($parsedFrame['data_length_indicator'] != strlen($parsedFrame['data'])) {
 				$info['warning'][] = 'ID3v2 frame "'.$parsedFrame['frame_name'].'" should be '.$parsedFrame['data_length_indicator'].' bytes long according to DataLengthIndicator, but found '.strlen($parsedFrame['data']).' bytes of data';
 			}
@@ -643,9 +643,9 @@ 
 
 			$parsedFrame['description'] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $frame_description));
 			$parsedFrame['data'] = substr($parsedFrame['data'], $frame_terminatorpos + strlen($frame_textencoding_terminator));
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
-				if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+				if ( ! isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || ! array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
 					$info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
 				} else {
 					$info['id3v2']['comments'][$parsedFrame['framenameshort']][]            = trim(getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']));
@@ -672,7 +672,7 @@ 
 			$parsedFrame['encodingid'] = $frame_textencoding;
 			$parsedFrame['encoding']   = $this->TextEncodingNameLookup($frame_textencoding);
 
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				// ID3v2.3 specs say that TPE1 (and others) can contain multiple artist values separated with /
 				// This of course breaks when an artist name contains slash character, e.g. "AC/DC"
 				// MP3tag (maybe others) implement alternative system where multiple artists are null-separated, which makes more sense
@@ -700,7 +700,7 @@ 
 				$Txxx_elements[] = substr($parsedFrame['data'], $Txxx_elements_start_offset, $i - $Txxx_elements_start_offset);
 				foreach ($Txxx_elements as $Txxx_element) {
 					$string = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $Txxx_element);
-					if (!empty($string)) {
+					if ( ! empty($string)) {
 						$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $string;
 					}
 				}
@@ -752,7 +752,7 @@ 
 
 			$parsedFrame['url']         = $frame_urldata;
 			$parsedFrame['description'] = $frame_description;
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
+			if ( ! empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['url']);
 			}
 			unset($parsedFrame['data']);
@@ -766,7 +766,7 @@ 
 			// URL              <text string>
 
 			$parsedFrame['url'] = trim($parsedFrame['data']);
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
+			if ( ! empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['url'];
 			}
 			unset($parsedFrame['data']);
@@ -847,7 +847,7 @@ 
 			}
 			$parsedFrame['data'] = $IPLS_parts;
 
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
 			}
 
@@ -858,7 +858,7 @@ 
 			// <Header for 'Music CD identifier', ID: 'MCDI'>
 			// CD TOC                <binary data>
 
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = $parsedFrame['data'];
 			}
 
@@ -983,7 +983,7 @@ 
 			$parsedFrame['language']     = $frame_language;
 			$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
 			$parsedFrame['description']  = $frame_description;
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 			}
 			unset($parsedFrame['data']);
@@ -1091,9 +1091,9 @@ 
 				$parsedFrame['languagename'] = $this->LanguageLookup($frame_language, false);
 				$parsedFrame['description']  = $frame_description;
 				$parsedFrame['data']         = $frame_text;
-				if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-					$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : (!empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
-					if (!isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || !array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
+				if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
+					$commentkey = ($parsedFrame['description'] ? $parsedFrame['description'] : ( ! empty($info['id3v2']['comments'][$parsedFrame['framenameshort']]) ? count($info['id3v2']['comments'][$parsedFrame['framenameshort']]) : 0));
+					if ( ! isset($info['id3v2']['comments'][$parsedFrame['framenameshort']]) || ! array_key_exists($commentkey, $info['id3v2']['comments'][$parsedFrame['framenameshort']])) {
 						$info['id3v2']['comments'][$parsedFrame['framenameshort']][$commentkey] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 					} else {
 						$info['id3v2']['comments'][$parsedFrame['framenameshort']][]            = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
@@ -1136,7 +1136,7 @@ 
 					break;
 				}
 				$frame_bytespeakvolume = ceil($parsedFrame[$RVA2channelcounter]['bitspeakvolume'] / 8);
-				$parsedFrame[$RVA2channelcounter]['peakvolume']     = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
+				$parsedFrame[$RVA2channelcounter]['peakvolume'] = getid3_lib::BigEndian2Int(substr($frame_remainingdata, $frame_offset, $frame_bytespeakvolume));
 				$frame_remainingdata = substr($frame_remainingdata, $frame_offset + $frame_bytespeakvolume);
 				$RVA2channelcounter++;
 			}
@@ -1404,7 +1404,7 @@ 
 				$imageinfo = array();
 				$imagechunkcheck = getid3_lib::GetDataImageSize($parsedFrame['data'], $imageinfo);
 				if (($imagechunkcheck[2] >= 1) && ($imagechunkcheck[2] <= 3)) {
-					$parsedFrame['image_mime']       = 'image/'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]);
+					$parsedFrame['image_mime'] = 'image/'.getid3_lib::ImageTypesLookup($imagechunkcheck[2]);
 					if ($imagechunkcheck[0]) {
 						$parsedFrame['image_width']  = $imagechunkcheck[0];
 					}
@@ -1432,7 +1432,7 @@ 
 */
 					} elseif (is_string($this->getid3->option_save_attachments)) {
 						$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
-						if (!is_dir($dir) || !is_writable($dir)) {
+						if ( ! is_dir($dir) || ! is_writable($dir)) {
 							// cannot write, skip
 							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$dir.'" (not writable)';
 							unset($parsedFrame['data']);
@@ -1442,7 +1442,7 @@ 
 					// if we get this far, must be OK
 					if (is_string($this->getid3->option_save_attachments)) {
 						$destination_filename = $dir.DIRECTORY_SEPARATOR.md5($info['filenamepath']).'_'.$frame_offset;
-						if (!file_exists($destination_filename) || is_writable($destination_filename)) {
+						if ( ! file_exists($destination_filename) || is_writable($destination_filename)) {
 							file_put_contents($destination_filename, $parsedFrame['data']);
 						} else {
 							$info['warning'][] = 'attachment at '.$frame_offset.' cannot be saved to "'.$destination_filename.'" (not writable)';
@@ -1450,8 +1450,8 @@ 
 						$parsedFrame['data_filename'] = $destination_filename;
 						unset($parsedFrame['data']);
 					} else {
-						if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
-							if (!isset($info['id3v2']['comments']['picture'])) {
+						if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
+							if ( ! isset($info['id3v2']['comments']['picture'])) {
 								$info['id3v2']['comments']['picture'] = array();
 							}
 							$comments_picture_data = array();
@@ -1530,7 +1530,7 @@ 
 			// <Header for 'Play counter', ID: 'PCNT'>
 			// Counter        $xx xx xx xx (xx ...)
 
-			$parsedFrame['data']          = getid3_lib::BigEndian2Int($parsedFrame['data']);
+			$parsedFrame['data'] = getid3_lib::BigEndian2Int($parsedFrame['data']);
 
 
 		} elseif ((($id3v2_majorversion >= 3) && ($parsedFrame['frame_name'] == 'POPM')) || // 4.17  POPM Popularimeter
@@ -1654,7 +1654,7 @@ 
 			$parsedFrame['url'] = $frame_url;
 
 			$parsedFrame['additionaldata'] = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
+			if ( ! empty($parsedFrame['framenameshort']) && $parsedFrame['url']) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback_iso88591_utf8($parsedFrame['url']);
 			}
 			unset($parsedFrame['data']);
@@ -1693,7 +1693,7 @@ 
 			$parsedFrame['encoding']     = $this->TextEncodingNameLookup($frame_textencoding);
 
 			$parsedFrame['data']         = (string) substr($parsedFrame['data'], $frame_offset);
-			if (!empty($parsedFrame['framenameshort']) && !empty($parsedFrame['data'])) {
+			if ( ! empty($parsedFrame['framenameshort']) && ! empty($parsedFrame['data'])) {
 				$info['id3v2']['comments'][$parsedFrame['framenameshort']][] = getid3_lib::iconv_fallback($parsedFrame['encoding'], $info['id3v2']['encoding'], $parsedFrame['data']);
 			}
 			unset($parsedFrame['data']);
@@ -1724,8 +1724,8 @@ 
 			$parsedFrame['pricepaid']['value']      = substr($frame_pricepaid, 3);
 
 			$parsedFrame['purchasedate'] = substr($parsedFrame['data'], $frame_offset, 8);
-			if (!$this->IsValidDateStampString($parsedFrame['purchasedate'])) {
-				$parsedFrame['purchasedateunix'] = mktime (0, 0, 0, substr($parsedFrame['purchasedate'], 4, 2), substr($parsedFrame['purchasedate'], 6, 2), substr($parsedFrame['purchasedate'], 0, 4));
+			if ( ! $this->IsValidDateStampString($parsedFrame['purchasedate'])) {
+				$parsedFrame['purchasedateunix'] = mktime(0, 0, 0, substr($parsedFrame['purchasedate'], 4, 2), substr($parsedFrame['purchasedate'], 6, 2), substr($parsedFrame['purchasedate'], 0, 4));
 			}
 			$frame_offset += 8;
 
@@ -1896,7 +1896,7 @@ 
 			// Minimum offset to next tag       $xx xx xx xx
 
 			$frame_offset = 0;
-			$parsedFrame['data']          = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+			$parsedFrame['data'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 
 
 		} elseif (($id3v2_majorversion >= 4) && ($parsedFrame['frame_name'] == 'ASPI')) { // 4.30  ASPI Audio seek point index (ID3v2.4+ only)
@@ -1990,7 +1990,7 @@ 
 			$frame_offset += 4;
 			if (substr($parsedFrame['data'], $frame_offset, 4) != "\xFF\xFF\xFF\xFF") {
 				// "If these bytes are all set to 0xFF then the value should be ignored and the start time value should be utilized."
-				$parsedFrame['offset_end']   = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
+				$parsedFrame['offset_end'] = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 			}
 			$frame_offset += 4;
 
@@ -1999,7 +1999,7 @@ 
 				while ($frame_offset < strlen($parsedFrame['data'])) {
 					// <Optional embedded sub-frames>
 					$subframe = array();
-					$subframe['name']      =                           substr($parsedFrame['data'], $frame_offset, 4);
+					$subframe['name']      = substr($parsedFrame['data'], $frame_offset, 4);
 					$frame_offset += 4;
 					$subframe['size']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 					$frame_offset += 4;
@@ -2013,9 +2013,9 @@ 
 					$frame_offset += $subframe['size'];
 
 					$subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
-					$subframe['text']       =     substr($subframe_rawdata, 1);
+					$subframe['text']       = substr($subframe_rawdata, 1);
 					$subframe['encoding']   = $this->TextEncodingNameLookup($subframe['encodingid']);
-					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text'])); ;
 					switch (substr($encoding_converted_text, 0, 2)) {
 						case "\xFF\xFE":
 						case "\xFE\xFF":
@@ -2055,7 +2055,7 @@ 
 					$id3v2_chapter_entry[$id3v2_chapter_key] = $parsedFrame[$id3v2_chapter_key];
 				}
 			}
-			if (!isset($info['id3v2']['chapters'])) {
+			if ( ! isset($info['id3v2']['chapters'])) {
 				$info['id3v2']['chapters'] = array();
 			}
 			$info['id3v2']['chapters'][] = $id3v2_chapter_entry;
@@ -2096,7 +2096,7 @@ 
 				while ($frame_offset < strlen($parsedFrame['data'])) {
 					// <Optional embedded sub-frames>
 					$subframe = array();
-					$subframe['name']      =                           substr($parsedFrame['data'], $frame_offset, 4);
+					$subframe['name']      = substr($parsedFrame['data'], $frame_offset, 4);
 					$frame_offset += 4;
 					$subframe['size']      = getid3_lib::BigEndian2Int(substr($parsedFrame['data'], $frame_offset, 4));
 					$frame_offset += 4;
@@ -2110,9 +2110,9 @@ 
 					$frame_offset += $subframe['size'];
 
 					$subframe['encodingid'] = ord(substr($subframe_rawdata, 0, 1));
-					$subframe['text']       =     substr($subframe_rawdata, 1);
+					$subframe['text']       = substr($subframe_rawdata, 1);
 					$subframe['encoding']   = $this->TextEncodingNameLookup($subframe['encodingid']);
-					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text']));;
+					$encoding_converted_text = trim(getid3_lib::iconv_fallback($subframe['encoding'], $info['encoding'], $subframe['text'])); ;
 					switch (substr($encoding_converted_text, 0, 2)) {
 						case "\xFF\xFE":
 						case "\xFE\xFF":
@@ -2596,9 +2596,9 @@ 
 
 
 
-	public static function LanguageLookup($languagecode, $casesensitive=false) {
+	public static function LanguageLookup($languagecode, $casesensitive = false) {
 
-		if (!$casesensitive) {
+		if ( ! $casesensitive) {
 			$languagecode = strtolower($languagecode);
 		}
 
@@ -3101,8 +3101,8 @@ 
 			0x01 => 'lyrics',
 			0x02 => 'text transcription',
 			0x03 => 'movement/part name', // (e.g. 'Adagio')
-			0x04 => 'events',             // (e.g. 'Don Quijote enters the stage')
-			0x05 => 'chord',              // (e.g. 'Bb F Fsus')
+			0x04 => 'events', // (e.g. 'Don Quijote enters the stage')
+			0x05 => 'chord', // (e.g. 'Bb F Fsus')
 			0x06 => 'trivia/\'pop up\' information',
 			0x07 => 'URLs to webpages',
 			0x08 => 'URLs to images'
@@ -3111,7 +3111,7 @@ 
 		return (isset($SYTLContentTypeLookup[$index]) ? $SYTLContentTypeLookup[$index] : '');
 	}
 
-	public static function APICPictureTypeLookup($index, $returnarray=false) {
+	public static function APICPictureTypeLookup($index, $returnarray = false) {
 		static $APICPictureTypeLookup = array(
 			0x00 => 'Other',
 			0x01 => '32x32 pixels \'file icon\' (PNG only)',
@@ -3540,10 +3540,10 @@ 
 		// http://www.id3.org/id3v2.4.0-structure.txt
 		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
 		static $TextEncodingTerminatorLookup = array(
-			0   => "\x00",     // $00  ISO-8859-1. Terminated with $00.
+			0   => "\x00", // $00  ISO-8859-1. Terminated with $00.
 			1   => "\x00\x00", // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
 			2   => "\x00\x00", // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-			3   => "\x00",     // $03  UTF-8 encoded Unicode. Terminated with $00.
+			3   => "\x00", // $03  UTF-8 encoded Unicode. Terminated with $00.
 			255 => "\x00\x00"
 		);
 		return (isset($TextEncodingTerminatorLookup[$encoding]) ? $TextEncodingTerminatorLookup[$encoding] : "\x00");
@@ -3554,9 +3554,9 @@ 
 		// Frames that allow different types of text encoding contains a text encoding description byte. Possible encodings:
 		static $TextEncodingNameLookup = array(
 			0   => 'ISO-8859-1', // $00  ISO-8859-1. Terminated with $00.
-			1   => 'UTF-16',     // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
-			2   => 'UTF-16BE',   // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
-			3   => 'UTF-8',      // $03  UTF-8 encoded Unicode. Terminated with $00.
+			1   => 'UTF-16', // $01  UTF-16 encoded Unicode with BOM. All strings in the same frame SHALL have the same byteorder. Terminated with $00 00.
+			2   => 'UTF-16BE', // $02  UTF-16BE encoded Unicode without BOM. Terminated with $00 00.
+			3   => 'UTF-8', // $03  UTF-8 encoded Unicode. Terminated with $00.
 			255 => 'UTF-16BE'
 		);
 		return (isset($TextEncodingNameLookup[$encoding]) ? $TextEncodingNameLookup[$encoding] : 'ISO-8859-1');
@@ -3576,7 +3576,7 @@ 
 		return false;
 	}
 
-	public static function IsANumber($numberstring, $allowdecimal=false, $allownegative=false) {
+	public static function IsANumber($numberstring, $allowdecimal = false, $allownegative = false) {
 		for ($i = 0; $i < strlen($numberstring); $i++) {
 			if ((chr($numberstring{$i}) < chr('0')) || (chr($numberstring{$i}) > chr('9'))) {
 				if (($numberstring{$i} == '.') && $allowdecimal) {
@@ -3595,7 +3595,7 @@ 
 		if (strlen($datestamp) != 8) {
 			return false;
 		}
-		if (!self::IsANumber($datestamp, false)) {
+		if ( ! self::IsANumber($datestamp, false)) {
 			return false;
 		}
 		$year  = substr($datestamp, 0, 4);

src/wp-includes/ID3/module.tag.lyrics3.php

Doc Comments +6 added lines

@@ -126,6 +126,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param integer $version
+	 */
 	public function getLyrics3Data($endoffset, $version, $length) {
 		// http://www.volweb.cz/str/tags.htm
 
@@ -287,6 +290,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $char
+	 */
 	public function IntString2Bool($char) {
 		if ($char == '1') {
 			return true;

Spacing +10 added lines, -10 removed lines

@@ -23,15 +23,15 @@ 
 
 		// http://www.volweb.cz/str/tags.htm
 
-		if (!getid3_lib::intValueSupported($info['filesize'])) {
+		if ( ! getid3_lib::intValueSupported($info['filesize'])) {
 			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
 
-		$this->fseek((0 - 128 - 9 - 6), SEEK_END);          // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
+		$this->fseek((0 - 128 - 9 - 6), SEEK_END); // end - ID3v1 - "LYRICSEND" - [Lyrics3size]
 		$lyrics3_id3v1 = $this->fread(128 + 9 + 6);
-		$lyrics3lsz    = substr($lyrics3_id3v1,  0,   6); // Lyrics3size
-		$lyrics3end    = substr($lyrics3_id3v1,  6,   9); // LYRICSEND or LYRICS200
+		$lyrics3lsz    = substr($lyrics3_id3v1, 0, 6); // Lyrics3size
+		$lyrics3end    = substr($lyrics3_id3v1, 6, 9); // LYRICSEND or LYRICS200
 		$id3v1tag      = substr($lyrics3_id3v1, 15, 128); // ID3v1
 
 		if ($lyrics3end == 'LYRICSEND') {
@@ -100,7 +100,7 @@ 
 			$info['avdataend'] = $lyrics3offset;
 			$this->getLyrics3Data($lyrics3offset, $lyrics3version, $lyrics3size);
 
-			if (!isset($info['ape'])) {
+			if ( ! isset($info['ape'])) {
 				if (isset($info['lyrics3']['tag_offset_start'])) {
 					$GETID3_ERRORARRAY = &$info['warning'];
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.tag.apetag.php', __FILE__, true);
@@ -109,10 +109,10 @@ 
 					$getid3_apetag = new getid3_apetag($getid3_temp);
 					$getid3_apetag->overrideendoffset = $info['lyrics3']['tag_offset_start'];
 					$getid3_apetag->Analyze();
-					if (!empty($getid3_temp->info['ape'])) {
+					if ( ! empty($getid3_temp->info['ape'])) {
 						$info['ape'] = $getid3_temp->info['ape'];
 					}
-					if (!empty($getid3_temp->info['replay_gain'])) {
+					if ( ! empty($getid3_temp->info['replay_gain'])) {
 						$info['replay_gain'] = $getid3_temp->info['replay_gain'];
 					}
 					unset($getid3_temp, $getid3_apetag);
@@ -131,7 +131,7 @@ 
 
 		$info = &$this->getid3->info;
 
-		if (!getid3_lib::intValueSupported($endoffset)) {
+		if ( ! getid3_lib::intValueSupported($endoffset)) {
 			$info['warning'][] = 'Unable to check for Lyrics3 because file is larger than '.round(PHP_INT_MAX / 1073741824).'GB';
 			return false;
 		}
@@ -211,8 +211,8 @@ 
 						foreach ($imagestrings as $key => $imagestring) {
 							if (strpos($imagestring, '||') !== false) {
 								$imagearray = explode('||', $imagestring);
-								$ParsedLyrics3['images'][$key]['filename']     =                                (isset($imagearray[0]) ? $imagearray[0] : '');
-								$ParsedLyrics3['images'][$key]['description']  =                                (isset($imagearray[1]) ? $imagearray[1] : '');
+								$ParsedLyrics3['images'][$key]['filename']     = (isset($imagearray[0]) ? $imagearray[0] : '');
+								$ParsedLyrics3['images'][$key]['description']  = (isset($imagearray[1]) ? $imagearray[1] : '');
 								$ParsedLyrics3['images'][$key]['timestamp']    = $this->Lyrics3Timestamp2Seconds(isset($imagearray[2]) ? $imagearray[2] : '');
 							}
 						}

src/wp-includes/load.php

Doc Comments +1 added lines, -1 removed lines

@@ -218,7 +218,7 @@
  * @global float   $timestart Seconds from when timer_start() is called.
  * @global float   $timeend   Seconds from when function is called.
  *
- * @param int|bool $display   Whether to echo or return the results. Accepts 0|false for return,
+ * @param integer $display   Whether to echo or return the results. Accepts 0|false for return,
  *                            1|true for echo. Default 0|false.
  * @param int      $precision The number of digits from the right of the decimal to display.
  *                            Default 3.

Braces +145 added lines, -100 removed lines

@@ -29,19 +29,22 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
-		return;
+	if ( !ini_get( 'register_globals' ) ) {
+			return;
+	}
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if ( isset( $_REQUEST['GLOBALS'] ) ) {
+			die( 'GLOBALS overwrite attempt detected' );
+	}
 
 	// Variables that shouldn't be unset
 	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
 
 	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
+	foreach ( $input as $k => $v ) {
+			if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
 			unset( $GLOBALS[$k] );
+	}
 		}
 }
 
@@ -76,15 +79,17 @@ 
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
-				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) ) {
+							$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			}
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
 			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
-					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
-				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) {
+									$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
+				} else {
+									$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				}
 			}
 
 			// Append the query string if it exists and isn't null
@@ -95,18 +100,21 @@ 
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
-		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) ) {
+			$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	}
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) {
+			unset( $_SERVER['PATH_INFO'] );
+	}
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
-}
+	if ( empty( $PHP_SELF ) ) {
+			$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	}
+	}
 
 /**
  * Check for the required PHP version, and the MySQL extension or
@@ -174,15 +182,17 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
-		return;
+	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() ) {
+			return;
+	}
 
 	global $upgrading;
 
 	include( ABSPATH . '.maintenance' );
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
-		return;
+	if ( ( time() - $upgrading ) >= 600 ) {
+			return;
+	}
 
 	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
 		require_once( WP_CONTENT_DIR . '/maintenance.php' );
@@ -197,7 +207,10 @@ 
 	header( 'Retry-After: 600' );
 ?>
 	<!DOCTYPE html>
-	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 	<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<title><?php _e( 'Maintenance' ); ?></title>
@@ -248,8 +261,9 @@ 
 	$timeend = microtime( true );
 	$timetotal = $timeend - $timestart;
 	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
-		echo $r;
+	if ( $display ) {
+			echo $r;
+	}
 	return $r;
 }
 
@@ -288,10 +302,11 @@ 
 	if ( WP_DEBUG ) {
 		error_reporting( E_ALL );
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if ( WP_DEBUG_DISPLAY ) {
+					ini_set( 'display_errors', 1 );
+		} elseif ( null !== WP_DEBUG_DISPLAY ) {
+					ini_set( 'display_errors', 0 );
+		}
 
 		if ( WP_DEBUG_LOG ) {
 			ini_set( 'log_errors', 1 );
@@ -362,11 +377,13 @@ 
 	global $wpdb;
 
 	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+			require_once( WP_CONTENT_DIR . '/db.php' );
+	}
 
-	if ( isset( $wpdb ) )
-		return;
+	if ( isset( $wpdb ) ) {
+			return;
+	}
 
 	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
 }
@@ -385,8 +402,9 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
-		dead_db();
+	if ( !empty( $wpdb->error ) ) {
+			dead_db();
+	}
 
 	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
 		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
@@ -424,8 +442,9 @@ 
 function wp_using_ext_object_cache( $using = null ) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
-		$_wp_using_ext_object_cache = $using;
+	if ( null !== $using ) {
+			$_wp_using_ext_object_cache = $using;
+	}
 	return $current_using;
 }
 
@@ -447,8 +466,9 @@ 
  	if ( ! function_exists( 'wp_cache_init' ) ) {
 		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
 			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+			if ( function_exists( 'wp_cache_init' ) ) {
+							wp_using_ext_object_cache( true );
+			}
 		}
 
 		$first_init = true;
@@ -462,18 +482,20 @@ 
 		wp_using_ext_object_cache( true );
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache() ) {
+			require_once ( ABSPATH . WPINC . '/cache.php' );
+	}
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
-		wp_cache_init();
+	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) {
+			wp_cache_switch_to_blog( $blog_id );
+	} elseif ( function_exists( 'wp_cache_init' ) ) {
+			wp_cache_init();
+	}
 
 	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
 		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
@@ -524,13 +546,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
-		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
-		return $mu_plugins;
+	if ( !is_dir( WPMU_PLUGIN_DIR ) ) {
+			return $mu_plugins;
+	}
+	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) ) {
+			return $mu_plugins;
+	}
 	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		if ( substr( $plugin, -4 ) == '.php' ) {
+					$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	closedir( $dh );
 	sort( $mu_plugins );
@@ -562,8 +587,9 @@ 
 		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
-		return $plugins;
+	if ( empty( $active_plugins ) || wp_installing() ) {
+			return $plugins;
+	}
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
@@ -573,8 +599,9 @@ 
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
 			// not already included as a network plugin
 			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -591,8 +618,9 @@ 
 function wp_set_internal_encoding() {
 	if ( function_exists( 'mb_internal_encoding' ) ) {
 		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+		if ( ! $charset || ! @mb_internal_encoding( $charset ) ) {
+					mb_internal_encoding( 'UTF-8' );
+		}
 	}
 }
 
@@ -667,10 +695,11 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
-		return WP_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin();
+	} elseif ( defined( 'WP_ADMIN' ) ) {
+			return WP_ADMIN;
+	}
 
 	return false;
 }
@@ -690,10 +719,11 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
-		return WP_BLOG_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'site' );
+	} elseif ( defined( 'WP_BLOG_ADMIN' ) ) {
+			return WP_BLOG_ADMIN;
+	}
 
 	return false;
 }
@@ -713,10 +743,11 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
-		return WP_NETWORK_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'network' );
+	} elseif ( defined( 'WP_NETWORK_ADMIN' ) ) {
+			return WP_NETWORK_ADMIN;
+	}
 
 	return false;
 }
@@ -737,10 +768,11 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
-		return WP_USER_ADMIN;
+	if ( isset( $GLOBALS['current_screen'] ) ) {
+			return $GLOBALS['current_screen']->in_admin( 'user' );
+	} elseif ( defined( 'WP_USER_ADMIN' ) ) {
+			return WP_USER_ADMIN;
+	}
 
 	return false;
 }
@@ -753,11 +785,13 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
-		return MULTISITE;
+	if ( defined( 'MULTISITE' ) ) {
+			return MULTISITE;
+	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
-		return true;
+	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -798,12 +832,14 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
-		return;
+	if ( $loaded ) {
+			return;
+	}
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
-		return;
+	if ( function_exists( 'did_action' ) && did_action( 'init' ) ) {
+			return;
+	}
 
 	// We need $wp_local_package
 	require ABSPATH . WPINC . '/version.php';
@@ -820,31 +856,39 @@ 
 
 	while ( true ) {
 		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
-				break;
+			if ( '' == WPLANG ) {
+							break;
+			}
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
-			$locales[] = $wp_local_package;
+		if ( isset( $wp_local_package ) ) {
+					$locales[] = $wp_local_package;
+		}
 
-		if ( ! $locales )
-			break;
+		if ( ! $locales ) {
+					break;
+		}
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
-			$locations[] = WP_LANG_DIR;
+		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) ) {
+					$locations[] = WP_LANG_DIR;
+		}
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) ) {
+					$locations[] = WP_CONTENT_DIR . '/languages';
+		}
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if ( @is_dir( ABSPATH . 'wp-content/languages' ) ) {
+					$locations[] = ABSPATH . 'wp-content/languages';
+		}
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if ( @is_dir( ABSPATH . WPINC . '/languages' ) ) {
+					$locations[] = ABSPATH . WPINC . '/languages';
+		}
 
-		if ( ! $locations )
-			break;
+		if ( ! $locations ) {
+					break;
+		}
 
 		$locations = array_unique( $locations );
 
@@ -852,8 +896,9 @@ 
 			foreach ( $locations as $location ) {
 				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
 					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
+											load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					}
 					break 2;
 				}
 			}

Spacing +193 added lines, -193 removed lines

@@ -16,7 +16,7 @@ 
  */
 function wp_get_server_protocol() {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
 	return $protocol;
@@ -29,19 +29,19 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
+	if ( ! ini_get('register_globals'))
 		return;
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if (isset($_REQUEST['GLOBALS']))
+		die('GLOBALS overwrite attempt detected');
 
 	// Variables that shouldn't be unset
-	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
+	$no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
 
-	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
-			unset( $GLOBALS[$k] );
+	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
+	foreach ($input as $k => $v)
+		if ( ! in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+			unset($GLOBALS[$k]);
 		}
 }
 
@@ -62,50 +62,50 @@ 
 		'REQUEST_URI' => '',
 	);
 
-	$_SERVER = array_merge( $default_server_values, $_SERVER );
+	$_SERVER = array_merge($default_server_values, $_SERVER);
 
 	// Fix for IIS when running with PHP ISAPI
-	if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+	if (empty($_SERVER['REQUEST_URI']) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE']))) {
 
 		// IIS Mod-Rewrite
-		if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+		if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
 		}
 		// IIS Isapi_Rewrite
-		elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+		elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
+			if ( ! isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']))
 				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+			if (isset($_SERVER['PATH_INFO'])) {
+				if ($_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'])
 					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].$_SERVER['PATH_INFO'];
 			}
 
 			// Append the query string if it exists and isn't null
-			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
-				$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+			if ( ! empty($_SERVER['QUERY_STRING'])) {
+				$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
 			}
 		}
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
+	if (isset($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7))
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
+		unset($_SERVER['PATH_INFO']);
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	if (empty($PHP_SELF))
+		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER["REQUEST_URI"]);
 }
 
 /**
@@ -124,22 +124,22 @@ 
 	global $required_php_version, $wp_version;
 	$php_version = phpversion();
 
-	if ( version_compare( $required_php_version, $php_version, '>' ) ) {
+	if (version_compare($required_php_version, $php_version, '>')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(sprintf(__('Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.'), $php_version, $wp_version, $required_php_version));
 	}
 
-	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+	if ( ! extension_loaded('mysql') && ! extension_loaded('mysqli') && ! extension_loaded('mysqlnd') && ! file_exists(WP_CONTENT_DIR.'/db.php')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(__('Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'));
 	}
 }
 
@@ -151,7 +151,7 @@ 
  * @since 3.0.0
  */
 function wp_favicon_request() {
-	if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
+	if ('/favicon.ico' == $_SERVER['REQUEST_URI']) {
 		header('Content-Type: image/vnd.microsoft.icon');
 		exit;
 	}
@@ -174,14 +174,14 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+	if ( ! file_exists(ABSPATH.'.maintenance') || wp_installing())
 		return;
 
 	global $upgrading;
 
-	include( ABSPATH . '.maintenance' );
+	include(ABSPATH.'.maintenance');
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
+	if ((time() - $upgrading) >= 600)
 		return;
 
 	/**
@@ -197,31 +197,31 @@ 
 	 * @param bool $enable_checks Whether to enable maintenance mode. Default true.
 	 * @param int  $upgrading     The timestamp set in the .maintenance file.
 	 */
-	if ( ! apply_filters( 'enable_maintenance_mode', true, $upgrading ) ) {
+	if ( ! apply_filters('enable_maintenance_mode', true, $upgrading)) {
 		return;
 	}
 
-	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/maintenance.php' );
+	if (file_exists(WP_CONTENT_DIR.'/maintenance.php')) {
+		require_once(WP_CONTENT_DIR.'/maintenance.php');
 		die();
 	}
 
 	wp_load_translations_early();
 
 	$protocol = wp_get_server_protocol();
-	header( "$protocol 503 Service Unavailable", true, 503 );
-	header( 'Content-Type: text/html; charset=utf-8' );
-	header( 'Retry-After: 600' );
+	header("$protocol 503 Service Unavailable", true, 503);
+	header('Content-Type: text/html; charset=utf-8');
+	header('Retry-After: 600');
 ?>
 	<!DOCTYPE html>
-	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+	<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 	<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title><?php _e( 'Maintenance' ); ?></title>
+		<title><?php _e('Maintenance'); ?></title>
 
 	</head>
 	<body>
-		<h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
+		<h1><?php _e('Briefly unavailable for scheduled maintenance. Check back in a minute.'); ?></h1>
 	</body>
 	</html>
 <?php
@@ -241,7 +241,7 @@ 
  */
 function timer_start() {
 	global $timestart;
-	$timestart = microtime( true );
+	$timestart = microtime(true);
 	return true;
 }
 
@@ -260,12 +260,12 @@ 
  * @return string The "second.microsecond" finished time calculation. The number is formatted
  *                for human consumption, both localized and rounded.
  */
-function timer_stop( $display = 0, $precision = 3 ) {
+function timer_stop($display = 0, $precision = 3) {
 	global $timestart, $timeend;
-	$timeend = microtime( true );
+	$timeend = microtime(true);
 	$timetotal = $timeend - $timestart;
-	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
+	$r = (function_exists('number_format_i18n')) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
+	if ($display)
 		echo $r;
 	return $r;
 }
@@ -314,28 +314,28 @@ 
 	 *
 	 * @param bool $enable_debug_mode Whether to enable debug mode checks to occur. Default true.
 	 */
-	if ( ! apply_filters( 'enable_wp_debug_mode_checks', true ) ){
+	if ( ! apply_filters('enable_wp_debug_mode_checks', true)) {
 		return;
 	}
 
-	if ( WP_DEBUG ) {
-		error_reporting( E_ALL );
+	if (WP_DEBUG) {
+		error_reporting(E_ALL);
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if (WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 1);
+		elseif (null !== WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 0);
 
-		if ( WP_DEBUG_LOG ) {
-			ini_set( 'log_errors', 1 );
-			ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
+		if (WP_DEBUG_LOG) {
+			ini_set('log_errors', 1);
+			ini_set('error_log', WP_CONTENT_DIR.'/debug.log');
 		}
 	} else {
-		error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+		error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 	}
 
-	if ( defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-		@ini_set( 'display_errors', 0 );
+	if (defined('XMLRPC_REQUEST') || defined('REST_REQUEST') || (defined('DOING_AJAX') && DOING_AJAX)) {
+		@ini_set('display_errors', 0);
 	}
 }
 
@@ -353,8 +353,8 @@ 
  * @access private
  */
 function wp_set_lang_dir() {
-	if ( !defined( 'WP_LANG_DIR' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) {
+	if ( ! defined('WP_LANG_DIR')) {
+		if (file_exists(WP_CONTENT_DIR.'/languages') && @is_dir(WP_CONTENT_DIR.'/languages') || ! @is_dir(ABSPATH.WPINC.'/languages')) {
 			/**
 			 * Server path of the language directory.
 			 *
@@ -362,10 +362,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', WP_CONTENT_DIR.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old static relative path maintained for limited backward compatibility - won't work in some cases.
-				define( 'LANGDIR', 'wp-content/languages' );
+				define('LANGDIR', 'wp-content/languages');
 			}
 		} else {
 			/**
@@ -375,10 +375,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', ABSPATH.WPINC.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old relative path maintained for backward compatibility.
-				define( 'LANGDIR', WPINC . '/languages' );
+				define('LANGDIR', WPINC.'/languages');
 			}
 		}
 	}
@@ -394,14 +394,14 @@ 
 function require_wp_db() {
 	global $wpdb;
 
-	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	require_once(ABSPATH.WPINC.'/wp-db.php');
+	if (file_exists(WP_CONTENT_DIR.'/db.php'))
+		require_once(WP_CONTENT_DIR.'/db.php');
 
-	if ( isset( $wpdb ) )
+	if (isset($wpdb))
 		return;
 
-	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+	$wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
 }
 
 /**
@@ -418,24 +418,24 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
+	if ( ! empty($wpdb->error))
 		dead_db();
 
-	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
-		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
+	$wpdb->field_types = array('post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
+		'parent' => '%d', 'count' => '%d', 'object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
 		'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
 		'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d',
 		// multisite:
 		'active' => '%d', 'cat_id' => '%d', 'deleted' => '%d', 'lang_id' => '%d', 'mature' => '%d', 'public' => '%d', 'site_id' => '%d', 'spam' => '%d',
 	);
 
-	$prefix = $wpdb->set_prefix( $table_prefix );
+	$prefix = $wpdb->set_prefix($table_prefix);
 
-	if ( is_wp_error( $prefix ) ) {
+	if (is_wp_error($prefix)) {
 		wp_load_translations_early();
 		wp_die(
 			/* translators: 1: $table_prefix 2: wp-config.php */
-			sprintf( __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
+			sprintf(__('<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.'),
 				'<code>$table_prefix</code>',
 				'<code>wp-config.php</code>'
 			)
@@ -454,10 +454,10 @@ 
  * @param bool $using Whether external object cache is being used.
  * @return bool The current 'using' setting.
  */
-function wp_using_ext_object_cache( $using = null ) {
+function wp_using_ext_object_cache($using = null) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
+	if (null !== $using)
 		$_wp_using_ext_object_cache = $using;
 	return $current_using;
 }
@@ -477,40 +477,40 @@ 
 	global $blog_id;
 
 	$first_init = false;
- 	if ( ! function_exists( 'wp_cache_init' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
-			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+ 	if ( ! function_exists('wp_cache_init')) {
+		if (file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
+			require_once (WP_CONTENT_DIR.'/object-cache.php');
+			if (function_exists('wp_cache_init'))
+				wp_using_ext_object_cache(true);
 		}
 
 		$first_init = true;
-	} elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+	} elseif ( ! wp_using_ext_object_cache() && file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
 		/*
 		 * Sometimes advanced-cache.php can load object-cache.php before
 		 * it is loaded here. This breaks the function_exists check above
 		 * and can result in `$_wp_using_ext_object_cache` being set
 		 * incorrectly. Double check if an external cache exists.
 		 */
-		wp_using_ext_object_cache( true );
+		wp_using_ext_object_cache(true);
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache())
+		require_once (ABSPATH.WPINC.'/cache.php');
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
+	if ( ! $first_init && function_exists('wp_cache_switch_to_blog'))
+		wp_cache_switch_to_blog($blog_id);
+	elseif (function_exists('wp_cache_init'))
 		wp_cache_init();
 
-	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
-		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+	if (function_exists('wp_cache_add_global_groups')) {
+		wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
+		wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 	}
 }
 
@@ -523,22 +523,22 @@ 
  * @access private
  */
 function wp_not_installed() {
-	if ( is_multisite() ) {
-		if ( ! is_blog_installed() && ! wp_installing() ) {
+	if (is_multisite()) {
+		if ( ! is_blog_installed() && ! wp_installing()) {
 			nocache_headers();
 
-			wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
+			wp_die(__('The site you have requested is not installed properly. Please contact the system administrator.'));
 		}
-	} elseif ( ! is_blog_installed() && ! wp_installing() ) {
+	} elseif ( ! is_blog_installed() && ! wp_installing()) {
 		nocache_headers();
 
-		require( ABSPATH . WPINC . '/kses.php' );
-		require( ABSPATH . WPINC . '/pluggable.php' );
-		require( ABSPATH . WPINC . '/formatting.php' );
+		require(ABSPATH.WPINC.'/kses.php');
+		require(ABSPATH.WPINC.'/pluggable.php');
+		require(ABSPATH.WPINC.'/formatting.php');
 
-		$link = wp_guess_url() . '/wp-admin/install.php';
+		$link = wp_guess_url().'/wp-admin/install.php';
 
-		wp_redirect( $link );
+		wp_redirect($link);
 		die();
 	}
 }
@@ -557,16 +557,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
+	if ( ! $dh = opendir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+	while (($plugin = readdir($dh)) !== false) {
+		if (substr($plugin, -4) == '.php')
+			$mu_plugins[] = WPMU_PLUGIN_DIR.'/'.$plugin;
 	}
-	closedir( $dh );
-	sort( $mu_plugins );
+	closedir($dh);
+	sort($mu_plugins);
 
 	return $mu_plugins;
 }
@@ -587,27 +587,27 @@ 
  */
 function wp_get_active_and_valid_plugins() {
 	$plugins = array();
-	$active_plugins = (array) get_option( 'active_plugins', array() );
+	$active_plugins = (array) get_option('active_plugins', array());
 
 	// Check for hacks file if the option is enabled
-	if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
-		_deprecated_file( 'my-hacks.php', '1.5' );
-		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
+	if (get_option('hack_file') && file_exists(ABSPATH.'my-hacks.php')) {
+		_deprecated_file('my-hacks.php', '1.5');
+		array_unshift($plugins, ABSPATH.'my-hacks.php');
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
+	if (empty($active_plugins) || wp_installing())
 		return $plugins;
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			// not already included as a network plugin
-			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
+			&& ( ! $network_plugins || ! in_array(WP_PLUGIN_DIR.'/'.$plugin, $network_plugins))
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -622,10 +622,10 @@ 
  * @access private
  */
 function wp_set_internal_encoding() {
-	if ( function_exists( 'mb_internal_encoding' ) ) {
-		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+	if (function_exists('mb_internal_encoding')) {
+		$charset = get_option('blog_charset');
+		if ( ! $charset || ! @mb_internal_encoding($charset))
+			mb_internal_encoding('UTF-8');
 	}
 }
 
@@ -640,20 +640,20 @@ 
  */
 function wp_magic_quotes() {
 	// If already slashed, strip.
-	if ( get_magic_quotes_gpc() ) {
-		$_GET    = stripslashes_deep( $_GET    );
-		$_POST   = stripslashes_deep( $_POST   );
-		$_COOKIE = stripslashes_deep( $_COOKIE );
+	if (get_magic_quotes_gpc()) {
+		$_GET    = stripslashes_deep($_GET);
+		$_POST   = stripslashes_deep($_POST);
+		$_COOKIE = stripslashes_deep($_COOKIE);
 	}
 
 	// Escape with wpdb.
-	$_GET    = add_magic_quotes( $_GET    );
-	$_POST   = add_magic_quotes( $_POST   );
-	$_COOKIE = add_magic_quotes( $_COOKIE );
-	$_SERVER = add_magic_quotes( $_SERVER );
+	$_GET    = add_magic_quotes($_GET);
+	$_POST   = add_magic_quotes($_POST);
+	$_COOKIE = add_magic_quotes($_COOKIE);
+	$_SERVER = add_magic_quotes($_SERVER);
 
 	// Force REQUEST to be GET + POST.
-	$_REQUEST = array_merge( $_GET, $_POST );
+	$_REQUEST = array_merge($_GET, $_POST);
 }
 
 /**
@@ -668,7 +668,7 @@ 
 	 *
 	 * @since 1.2.0
 	 */
-	do_action( 'shutdown' );
+	do_action('shutdown');
 
 	wp_cache_close();
 }
@@ -682,9 +682,9 @@ 
  * @param object $object The object to clone.
  * @return object The cloned object.
  */
-function wp_clone( $object ) {
+function wp_clone($object) {
 	// Use parens for clone to accommodate PHP 4. See #17880
-	return clone( $object );
+	return clone($object);
 }
 
 /**
@@ -700,9 +700,9 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if (isset($GLOBALS['current_screen']))
 		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
+	elseif (defined('WP_ADMIN'))
 		return WP_ADMIN;
 
 	return false;
@@ -723,9 +723,9 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('site');
+	elseif (defined('WP_BLOG_ADMIN'))
 		return WP_BLOG_ADMIN;
 
 	return false;
@@ -746,9 +746,9 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('network');
+	elseif (defined('WP_NETWORK_ADMIN'))
 		return WP_NETWORK_ADMIN;
 
 	return false;
@@ -770,9 +770,9 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('user');
+	elseif (defined('WP_USER_ADMIN'))
 		return WP_USER_ADMIN;
 
 	return false;
@@ -786,10 +786,10 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
+	if (defined('MULTISITE'))
 		return MULTISITE;
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if (defined('SUBDOMAIN_INSTALL') || defined('VHOST') || defined('SUNRISE'))
 		return true;
 
 	return false;
@@ -819,17 +819,17 @@ 
  * @return int The ID of the current network.
  */
 function get_current_network_id() {
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
 	$current_site = get_current_site();
 
-	if ( ! isset( $current_site->id ) ) {
+	if ( ! isset($current_site->id)) {
 		return get_main_network_id();
 	}
 
-	return absint( $current_site->id );
+	return absint($current_site->id);
 }
 
 /**
@@ -854,62 +854,62 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
+	if ($loaded)
 		return;
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
+	if (function_exists('did_action') && did_action('init'))
 		return;
 
 	// We need $wp_local_package
-	require ABSPATH . WPINC . '/version.php';
+	require ABSPATH.WPINC.'/version.php';
 
 	// Translation and localization
-	require_once ABSPATH . WPINC . '/pomo/mo.php';
-	require_once ABSPATH . WPINC . '/l10n.php';
-	require_once ABSPATH . WPINC . '/locale.php';
+	require_once ABSPATH.WPINC.'/pomo/mo.php';
+	require_once ABSPATH.WPINC.'/l10n.php';
+	require_once ABSPATH.WPINC.'/locale.php';
 
 	// General libraries
-	require_once ABSPATH . WPINC . '/plugin.php';
+	require_once ABSPATH.WPINC.'/plugin.php';
 
 	$locales = $locations = array();
 
-	while ( true ) {
-		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
+	while (true) {
+		if (defined('WPLANG')) {
+			if ('' == WPLANG)
 				break;
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
+		if (isset($wp_local_package))
 			$locales[] = $wp_local_package;
 
-		if ( ! $locales )
+		if ( ! $locales)
 			break;
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
+		if (defined('WP_LANG_DIR') && @is_dir(WP_LANG_DIR))
 			$locations[] = WP_LANG_DIR;
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if (defined('WP_CONTENT_DIR') && @is_dir(WP_CONTENT_DIR.'/languages'))
+			$locations[] = WP_CONTENT_DIR.'/languages';
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if (@is_dir(ABSPATH.'wp-content/languages'))
+			$locations[] = ABSPATH.'wp-content/languages';
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if (@is_dir(ABSPATH.WPINC.'/languages'))
+			$locations[] = ABSPATH.WPINC.'/languages';
 
-		if ( ! $locations )
+		if ( ! $locations)
 			break;
 
-		$locations = array_unique( $locations );
+		$locations = array_unique($locations);
 
-		foreach ( $locales as $locale ) {
-			foreach ( $locations as $location ) {
-				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+		foreach ($locales as $locale) {
+			foreach ($locations as $location) {
+				if (file_exists($location.'/'.$locale.'.mo')) {
+					load_textdomain('default', $location.'/'.$locale.'.mo');
+					if (defined('WP_SETUP_CONFIG') && file_exists($location.'/admin-'.$locale.'.mo'))
+						load_textdomain('default', $location.'/admin-'.$locale.'.mo');
 					break 2;
 				}
 			}
@@ -935,15 +935,15 @@ 
  * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
  *              report whether WP was in installing mode prior to the change to `$is_installing`.
  */
-function wp_installing( $is_installing = null ) {
+function wp_installing($is_installing = null) {
 	static $installing = null;
 
 	// Support for the `WP_INSTALLING` constant, defined before WP is loaded.
-	if ( is_null( $installing ) ) {
-		$installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+	if (is_null($installing)) {
+		$installing = defined('WP_INSTALLING') && WP_INSTALLING;
 	}
 
-	if ( ! is_null( $is_installing ) ) {
+	if ( ! is_null($is_installing)) {
 		$old_installing = $installing;
 		$installing = $is_installing;
 		return (bool) $old_installing;
@@ -961,15 +961,15 @@ 
  * @return bool True if SSL, otherwise false.
  */
 function is_ssl() {
-	if ( isset( $_SERVER['HTTPS'] ) ) {
-		if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
+	if (isset($_SERVER['HTTPS'])) {
+		if ('on' == strtolower($_SERVER['HTTPS'])) {
 			return true;
 		}
 
-		if ( '1' == $_SERVER['HTTPS'] ) {
+		if ('1' == $_SERVER['HTTPS']) {
 			return true;
 		}
-	} elseif ( isset($_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
 		return true;
 	}
 	return false;

src/wp-includes/ms-blogs.php

Doc Comments +1 added lines, -1 removed lines

@@ -595,7 +595,7 @@
  *
  * @param int  $new_blog   The id of the blog you want to switch to. Default: current blog
  * @param bool $deprecated Deprecated argument
- * @return true Always returns True.
+ * @return boolean Always returns True.
  */
 function switch_to_blog( $new_blog, $deprecated = null ) {
 	global $wpdb;

Indentation +1 added lines, -1 removed lines

@@ -845,7 +845,7 @@
 		 *
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
- 		 */
+		 */
 		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
 	}
 

Braces +90 added lines, -62 removed lines

@@ -52,11 +52,13 @@ 
  */
 function get_blogaddress_by_name( $blogname ) {
 	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
-			$blogname = 'www';
+		if ( $blogname == 'main' ) {
+					$blogname = 'www';
+		}
 		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		if ( !empty( $blogname ) ) {
+					$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		}
 	} else {
 		$url = network_home_url( $blogname );
 	}
@@ -80,8 +82,9 @@ 
 	$slug = trim( $slug, '/' );
 
 	$blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
-	if ( $blog_id )
-		return $blog_id;
+	if ( $blog_id ) {
+			return $blog_id;
+	}
 
 	if ( is_subdomain_install() ) {
 		$domain = $slug . '.' . $current_site->domain;
@@ -118,8 +121,9 @@ 
 		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
 			$key = md5( $fields['domain'] . $fields['path'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
-				return $blog;
+			if ( false !== $blog ) {
+							return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
@@ -135,8 +139,9 @@ 
 		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
 			$key = md5( $fields['domain'] );
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
-				return $blog;
+			if ( false !== $blog ) {
+							return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
@@ -153,12 +158,13 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
-			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
-		else
-			$blog_id = $fields;
+		if ( ! $fields ) {
+					$blog_id = get_current_blog_id();
+		} elseif ( ! is_numeric( $fields ) ) {
+					$blog_id = get_id_from_blogname( $fields );
+		} else {
+					$blog_id = $fields;
+		}
 	}
 
 	$blog_id = (int) $blog_id;
@@ -289,15 +295,18 @@ 
 function update_blog_details( $blog_id, $details = array() ) {
 	global $wpdb;
 
-	if ( empty($details) )
-		return false;
+	if ( empty($details) ) {
+			return false;
+	}
 
-	if ( is_object($details) )
-		$details = get_object_vars($details);
+	if ( is_object($details) ) {
+			$details = get_object_vars($details);
+	}
 
 	$current_details = get_blog_details($blog_id, false);
-	if ( empty($current_details) )
-		return false;
+	if ( empty($current_details) ) {
+			return false;
+	}
 
 	$current_details = get_object_vars($current_details);
 
@@ -316,8 +325,9 @@ 
 
 	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
 
-	if ( false === $result )
-		return false;
+	if ( false === $result ) {
+			return false;
+	}
 
 	// If spam status changed, issue actions.
 	if ( $details['spam'] != $current_details['spam'] ) {
@@ -462,11 +472,13 @@ 
 function get_blog_option( $id, $option, $default = false ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if ( get_current_blog_id() == $id ) {
+			return get_option( $option, $default );
+	}
 
 	switch_to_blog( $id );
 	$value = get_option( $option, $default );
@@ -507,11 +519,13 @@ 
 function add_blog_option( $id, $option, $value ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if ( get_current_blog_id() == $id ) {
+			return add_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = add_option( $option, $value );
@@ -532,11 +546,13 @@ 
 function delete_blog_option( $id, $option ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
-		$id = get_current_blog_id();
+	if ( empty( $id ) ) {
+			$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if ( get_current_blog_id() == $id ) {
+			return delete_option( $option );
+	}
 
 	switch_to_blog( $id );
 	$return = delete_option( $option );
@@ -558,11 +574,13 @@ 
 function update_blog_option( $id, $option, $value, $deprecated = null ) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( null !== $deprecated  ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if ( get_current_blog_id() == $id ) {
+			return update_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = update_option( $option, $value );
@@ -600,8 +618,9 @@ 
 function switch_to_blog( $new_blog, $deprecated = null ) {
 	global $wpdb;
 
-	if ( empty( $new_blog ) )
-		$new_blog = $GLOBALS['blog_id'];
+	if ( empty( $new_blog ) ) {
+			$new_blog = $GLOBALS['blog_id'];
+	}
 
 	$GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
 
@@ -634,10 +653,11 @@ 
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
-			$global_groups = $wp_object_cache->global_groups;
-		else
-			$global_groups = false;
+		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
+					$global_groups = $wp_object_cache->global_groups;
+		} else {
+					$global_groups = false;
+		}
 
 		wp_cache_init();
 
@@ -682,8 +702,9 @@ 
 function restore_current_blog() {
 	global $wpdb;
 
-	if ( empty( $GLOBALS['_wp_switched_stack'] ) )
-		return false;
+	if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
+			return false;
+	}
 
 	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
 
@@ -705,10 +726,11 @@ 
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
-			$global_groups = $wp_object_cache->global_groups;
-		else
-			$global_groups = false;
+		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
+					$global_groups = $wp_object_cache->global_groups;
+		} else {
+					$global_groups = false;
+		}
 
 		wp_cache_init();
 
@@ -792,16 +814,19 @@ 
 function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( null !== $deprecated  ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
-		return $value;
+	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) ) {
+			return $value;
+	}
 
 	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
 
-	if ( false === $result )
-		return false;
+	if ( false === $result ) {
+			return false;
+	}
 
 	refresh_blog_details( $blog_id );
 
@@ -867,8 +892,9 @@ 
 	global $wpdb;
 
 	$details = get_blog_details( $id, false );
-	if ( $details )
-		return $details->$pref;
+	if ( $details ) {
+			return $details->$pref;
+	}
 
 	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
 }
@@ -888,8 +914,10 @@ 
 function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, 'MU' );
+	}
+	// never used
 
 	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
 }

Spacing +285 added lines, -285 removed lines

@@ -18,7 +18,7 @@ 
 function wpmu_update_blogs_date() {
 	global $wpdb;
 
-	update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
+	update_blog_details($wpdb->blogid, array('last_updated' => current_time('mysql', true)));
 	/**
 	 * Fires after the blog details are updated.
 	 *
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param int $blog_id Site ID.
 	 */
-	do_action( 'wpmu_blog_updated', $wpdb->blogid );
+	do_action('wpmu_blog_updated', $wpdb->blogid);
 }
 
 /**
@@ -37,17 +37,17 @@ 
  * @param int $blog_id Blog ID
  * @return string Full URL of the blog if found. Empty string if not.
  */
-function get_blogaddress_by_id( $blog_id ) {
-	$bloginfo = get_blog_details( (int) $blog_id );
+function get_blogaddress_by_id($blog_id) {
+	$bloginfo = get_blog_details((int) $blog_id);
 
-	if ( empty( $bloginfo ) ) {
+	if (empty($bloginfo)) {
 		return '';
 	}
 
-	$scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
-	$scheme = empty( $scheme ) ? 'http' : $scheme;
+	$scheme = parse_url($bloginfo->home, PHP_URL_SCHEME);
+	$scheme = empty($scheme) ? 'http' : $scheme;
 
-	return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
+	return esc_url($scheme.'://'.$bloginfo->domain.$bloginfo->path);
 }
 
 /**
@@ -58,17 +58,17 @@ 
  * @param string $blogname The (subdomain or directory) name
  * @return string
  */
-function get_blogaddress_by_name( $blogname ) {
-	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
+function get_blogaddress_by_name($blogname) {
+	if (is_subdomain_install()) {
+		if ($blogname == 'main')
 			$blogname = 'www';
-		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		$url = rtrim(network_home_url(), '/');
+		if ( ! empty($blogname))
+			$url = preg_replace('|^([^\.]+://)|', "\${1}".$blogname.'.', $url);
 	} else {
-		$url = network_home_url( $blogname );
+		$url = network_home_url($blogname);
 	}
-	return esc_url( $url . '/' );
+	return esc_url($url.'/');
 }
 
 /**
@@ -81,26 +81,26 @@ 
  * @param string $slug
  * @return int A blog id
  */
-function get_id_from_blogname( $slug ) {
+function get_id_from_blogname($slug) {
 	global $wpdb;
 
 	$current_site = get_current_site();
-	$slug = trim( $slug, '/' );
+	$slug = trim($slug, '/');
 
-	$blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
-	if ( $blog_id )
+	$blog_id = wp_cache_get('get_id_from_blogname_'.$slug, 'blog-details');
+	if ($blog_id)
 		return $blog_id;
 
-	if ( is_subdomain_install() ) {
-		$domain = $slug . '.' . $current_site->domain;
+	if (is_subdomain_install()) {
+		$domain = $slug.'.'.$current_site->domain;
 		$path = $current_site->path;
 	} else {
 		$domain = $current_site->domain;
-		$path = $current_site->path . $slug . '/';
+		$path = $current_site->path.$slug.'/';
 	}
 
-	$blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
-	wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
+	$blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path));
+	wp_cache_set('get_id_from_blogname_'.$slug, $blog_id, 'blog-details');
 	return $blog_id;
 }
 
@@ -117,42 +117,42 @@ 
  *                                  Default is true.
  * @return WP_Site|false Blog details on success. False on failure.
  */
-function get_blog_details( $fields = null, $get_all = true ) {
+function get_blog_details($fields = null, $get_all = true) {
 	global $wpdb;
 
-	if ( is_array($fields ) ) {
-		if ( isset($fields['blog_id']) ) {
+	if (is_array($fields)) {
+		if (isset($fields['blog_id'])) {
 			$blog_id = $fields['blog_id'];
-		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
-			$key = md5( $fields['domain'] . $fields['path'] );
+		} elseif (isset($fields['domain']) && isset($fields['path'])) {
+			$key = md5($fields['domain'].$fields['path']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
 			}
-		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
-			$key = md5( $fields['domain'] );
+		} elseif (isset($fields['domain']) && is_subdomain_install()) {
+			$key = md5($fields['domain']);
 			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+			if (false !== $blog)
 				return $blog;
-			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
-				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
+			if (substr($fields['domain'], 0, 4) == 'www.') {
+				$nowww = substr($fields['domain'], 4);
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain']));
 			} else {
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
+				$blog = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain']));
 			}
-			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+			if ($blog) {
+				wp_cache_set($blog->blog_id.'short', $blog, 'blog-details');
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
@@ -161,10 +161,10 @@ 
 			return false;
 		}
 	} else {
-		if ( ! $fields )
+		if ( ! $fields)
 			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
-			$blog_id = get_id_from_blogname( $fields );
+		elseif ( ! is_numeric($fields))
+			$blog_id = get_id_from_blogname($fields);
 		else
 			$blog_id = $fields;
 	}
@@ -172,20 +172,20 @@ 
 	$blog_id = (int) $blog_id;
 
 	$all = $get_all == true ? '' : 'short';
-	$details = wp_cache_get( $blog_id . $all, 'blog-details' );
+	$details = wp_cache_get($blog_id.$all, 'blog-details');
 
-	if ( $details ) {
-		if ( ! is_object( $details ) ) {
-			if ( $details == -1 ) {
+	if ($details) {
+		if ( ! is_object($details)) {
+			if ($details == -1) {
 				return false;
 			} else {
 				// Clear old pre-serialized objects. Cache clients do better with that.
-				wp_cache_delete( $blog_id . $all, 'blog-details' );
+				wp_cache_delete($blog_id.$all, 'blog-details');
 				unset($details);
 			}
-		} elseif ( ! $details->blog_id || ! $details->site_id ) {
+		} elseif ( ! $details->blog_id || ! $details->site_id) {
 			// Clear objects missing critical properties.
-			wp_cache_delete( $blog_id . $all, 'blog-details' );
+			wp_cache_delete($blog_id.$all, 'blog-details');
 			unset($details);
 		} else {
 			return $details;
@@ -193,23 +193,23 @@ 
 	}
 
 	// Try the other cache.
-	if ( $get_all ) {
-		$details = wp_cache_get( $blog_id . 'short', 'blog-details' );
+	if ($get_all) {
+		$details = wp_cache_get($blog_id.'short', 'blog-details');
 	} else {
-		$details = wp_cache_get( $blog_id, 'blog-details' );
+		$details = wp_cache_get($blog_id, 'blog-details');
 		// If short was requested and full cache is set, we can return.
-		if ( $details ) {
-			if ( ! is_object( $details ) ) {
-				if ( $details == -1 ) {
+		if ($details) {
+			if ( ! is_object($details)) {
+				if ($details == -1) {
 					return false;
 				} else {
 					// Clear old pre-serialized objects. Cache clients do better with that.
-					wp_cache_delete( $blog_id, 'blog-details' );
+					wp_cache_delete($blog_id, 'blog-details');
 					unset($details);
 				}
-			} elseif ( ! $details->blog_id || ! $details->site_id ) {
+			} elseif ( ! $details->blog_id || ! $details->site_id) {
 				// Clear objects missing critical properties.
-				wp_cache_delete( $blog_id, 'blog-details' );
+				wp_cache_delete($blog_id, 'blog-details');
 				unset($details);
 			} else {
 				return $details;
@@ -217,29 +217,29 @@ 
 		}
 	}
 
-	if ( empty( $details ) || ! $details->blog_id || ! $details->site_id ) {
-		$details = WP_Site::get_instance( $blog_id );
-		if ( ! $details ) {
+	if (empty($details) || ! $details->blog_id || ! $details->site_id) {
+		$details = WP_Site::get_instance($blog_id);
+		if ( ! $details) {
 			// Set the full cache.
-			wp_cache_set( $blog_id, -1, 'blog-details' );
+			wp_cache_set($blog_id, -1, 'blog-details');
 			return false;
 		}
 	}
 
-	if ( ! $details instanceof WP_Site ) {
-		$details = new WP_Site( $details );
+	if ( ! $details instanceof WP_Site) {
+		$details = new WP_Site($details);
 	}
 
-	if ( ! $get_all ) {
-		wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	if ( ! $get_all) {
+		wp_cache_set($blog_id.$all, $details, 'blog-details');
 		return $details;
 	}
 
-	switch_to_blog( $blog_id );
-	$details->blogname   = get_option( 'blogname' );
-	$details->siteurl    = get_option( 'siteurl' );
-	$details->post_count = get_option( 'post_count' );
-	$details->home       = get_option( 'home' );
+	switch_to_blog($blog_id);
+	$details->blogname   = get_option('blogname');
+	$details->siteurl    = get_option('siteurl');
+	$details->post_count = get_option('post_count');
+	$details->home       = get_option('home');
 	restore_current_blog();
 
 	/**
@@ -249,12 +249,12 @@ 
 	 *
 	 * @param object $details The blog details.
 	 */
-	$details = apply_filters( 'blog_details', $details );
+	$details = apply_filters('blog_details', $details);
 
-	wp_cache_set( $blog_id . $all, $details, 'blog-details' );
+	wp_cache_set($blog_id.$all, $details, 'blog-details');
 
-	$key = md5( $details->domain . $details->path );
-	wp_cache_set( $key, $details, 'blog-lookup' );
+	$key = md5($details->domain.$details->path);
+	wp_cache_set($key, $details, 'blog-lookup');
 
 	return $details;
 }
@@ -266,14 +266,14 @@ 
  *
  * @param int $blog_id Optional. Blog ID. Defaults to current blog.
  */
-function refresh_blog_details( $blog_id = 0 ) {
+function refresh_blog_details($blog_id = 0) {
 	$blog_id = (int) $blog_id;
-	if ( ! $blog_id ) {
+	if ( ! $blog_id) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$details = get_blog_details( $blog_id, false );
-	if ( ! $details ) {
+	$details = get_blog_details($blog_id, false);
+	if ( ! $details) {
 		// Make sure clean_blog_cache() gets the blog ID
 		// when the blog has been previously cached as
 		// non-existent.
@@ -284,7 +284,7 @@ 
 		);
 	}
 
-	clean_blog_cache( $details );
+	clean_blog_cache($details);
 
 	/**
 	 * Fires after the blog details cache is cleared.
@@ -293,7 +293,7 @@ 
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'refresh_blog_details', $blog_id );
+	do_action('refresh_blog_details', $blog_id);
 }
 
 /**
@@ -307,17 +307,17 @@ 
  * @param array $details Array of details keyed by blogs table field names.
  * @return bool True if update succeeds, false otherwise.
  */
-function update_blog_details( $blog_id, $details = array() ) {
+function update_blog_details($blog_id, $details = array()) {
 	global $wpdb;
 
-	if ( empty($details) )
+	if (empty($details))
 		return false;
 
-	if ( is_object($details) )
+	if (is_object($details))
 		$details = get_object_vars($details);
 
 	$current_details = get_blog_details($blog_id, false);
-	if ( empty($current_details) )
+	if (empty($current_details))
 		return false;
 
 	$current_details = get_object_vars($current_details);
@@ -326,23 +326,23 @@ 
 	$details['last_updated'] = current_time('mysql', true);
 
 	$update_details = array();
-	$fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
-	foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
-		if ( 'path' === $field ) {
-			$details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
+	$fields = array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
+	foreach (array_intersect(array_keys($details), $fields) as $field) {
+		if ('path' === $field) {
+			$details[$field] = trailingslashit('/'.trim($details[$field], '/'));
 		}
 
-		$update_details[ $field ] = $details[ $field ];
+		$update_details[$field] = $details[$field];
 	}
 
-	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, $update_details, array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
 	// If spam status changed, issue actions.
-	if ( $details['spam'] != $current_details['spam'] ) {
-		if ( $details['spam'] == 1 ) {
+	if ($details['spam'] != $current_details['spam']) {
+		if ($details['spam'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'spam'.
 			 *
@@ -350,7 +350,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'ham'.
@@ -359,13 +359,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
 	}
 
 	// If mature status changed, issue actions.
-	if ( $details['mature'] != $current_details['mature'] ) {
-		if ( $details['mature'] == 1 ) {
+	if ($details['mature'] != $current_details['mature']) {
+		if ($details['mature'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'mature'.
 			 *
@@ -373,7 +373,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'unmature'.
@@ -382,13 +382,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
 	}
 
 	// If archived status changed, issue actions.
-	if ( $details['archived'] != $current_details['archived'] ) {
-		if ( $details['archived'] == 1 ) {
+	if ($details['archived'] != $current_details['archived']) {
+		if ($details['archived'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'archived'.
 			 *
@@ -396,7 +396,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'unarchived'.
@@ -405,13 +405,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
 	}
 
 	// If deleted status changed, issue actions.
-	if ( $details['deleted'] != $current_details['deleted'] ) {
-		if ( $details['deleted'] == 1 ) {
+	if ($details['deleted'] != $current_details['deleted']) {
+		if ($details['deleted'] == 1) {
 			/**
 			 * Fires when the blog status is changed to 'deleted'.
 			 *
@@ -419,7 +419,7 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/**
 			 * Fires when the blog status is changed to 'undeleted'.
@@ -428,13 +428,13 @@ 
 			 *
 			 * @param int $blog_id Blog ID.
 			 */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
 	}
 
-	if ( isset( $details['public'] ) ) {
-		switch_to_blog( $blog_id );
-		update_option( 'blog_public', $details['public'] );
+	if (isset($details['public'])) {
+		switch_to_blog($blog_id);
+		update_option('blog_public', $details['public']);
 		restore_current_blog();
 	}
 
@@ -450,18 +450,18 @@ 
  *
  * @param WP_Site $blog The blog details as returned from get_blog_details()
  */
-function clean_blog_cache( $blog ) {
+function clean_blog_cache($blog) {
 	$blog_id = $blog->blog_id;
-	$domain_path_key = md5( $blog->domain . $blog->path );
+	$domain_path_key = md5($blog->domain.$blog->path);
 
-	wp_cache_delete( $blog_id, 'sites' );
-	wp_cache_delete( $blog_id , 'blog-details' );
-	wp_cache_delete( $blog_id . 'short' , 'blog-details' );
-	wp_cache_delete(  $domain_path_key, 'blog-lookup' );
-	wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
-	wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
-	wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
-	wp_cache_delete( $domain_path_key, 'blog-id-cache' );
+	wp_cache_delete($blog_id, 'sites');
+	wp_cache_delete($blog_id, 'blog-details');
+	wp_cache_delete($blog_id.'short', 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-lookup');
+	wp_cache_delete('current_blog_'.$blog->domain, 'site-options');
+	wp_cache_delete('current_blog_'.$blog->domain.$blog->path, 'site-options');
+	wp_cache_delete('get_id_from_blogname_'.trim($blog->path, '/'), 'blog-details');
+	wp_cache_delete($domain_path_key, 'blog-id-cache');
 
 	/**
 	 * Fires immediately after a site has been removed from the object cache.
@@ -472,9 +472,9 @@ 
 	 * @param WP_Site $blog
 	 * @param string  $domain_path_key md5 hash of domain and path.
 	 */
-	do_action( 'clean_site_cache', $blog_id, $blog, $domain_path_key );
+	do_action('clean_site_cache', $blog_id, $blog, $domain_path_key);
 
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set('last_changed', microtime(), 'sites');
 }
 
 /**
@@ -490,21 +490,21 @@ 
  * @param WP_Site|int|null $site Optional. Site to retrieve. Default is the current site.
  * @return WP_Site|null The site object or null if not found.
  */
-function get_site( &$site = null ) {
+function get_site(&$site = null) {
 	global $current_blog;
-	if ( empty( $site ) && isset( $current_blog ) ) {
+	if (empty($site) && isset($current_blog)) {
 		$site = $current_blog;
 	}
 
-	if ( $site instanceof WP_Site ) {
+	if ($site instanceof WP_Site) {
 		$_site = $site;
-	} elseif ( is_object( $site ) ) {
-		$_site = new WP_Site( $site );
+	} elseif (is_object($site)) {
+		$_site = new WP_Site($site);
 	} else {
-		$_site = WP_Site::get_instance( $site );
+		$_site = WP_Site::get_instance($site);
 	}
 
-	if ( ! $_site ) {
+	if ( ! $_site) {
 		return null;
 	}
 
@@ -515,7 +515,7 @@ 
 	 *
 	 * @param WP_Site $_site Site data.
 	 */
-	$_site = apply_filters( 'get_site', $_site );
+	$_site = apply_filters('get_site', $_site);
 
 	return $_site;
 }
@@ -532,14 +532,14 @@ 
  *
  * @param array $ids ID list.
  */
-function _prime_site_caches( $ids ) {
+function _prime_site_caches($ids) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
-	if ( ! empty( $non_cached_ids ) ) {
-		$fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($ids, 'sites');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_sites = $wpdb->get_results(sprintf("SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_site_cache( $fresh_sites );
+		update_site_cache($fresh_sites);
 	}
 }
 
@@ -550,14 +550,14 @@ 
  *
  * @param array $sites Array of site objects, passed by reference.
  */
-function update_site_cache( &$sites ) {
-	if ( ! $sites ) {
+function update_site_cache(&$sites) {
+	if ( ! $sites) {
 		return;
 	}
 
-	foreach ( $sites as $site ) {
-		wp_cache_add( $site->blog_id, $site, 'sites' );
-		wp_cache_add( $site->blog_id . 'short', $site, 'blog-details' );
+	foreach ($sites as $site) {
+		wp_cache_add($site->blog_id, $site, 'sites');
+		wp_cache_add($site->blog_id.'short', $site, 'blog-details');
 	}
 }
 
@@ -612,10 +612,10 @@ 
  * }
  * @return array List of sites.
  */
-function get_sites( $args = array() ) {
+function get_sites($args = array()) {
 	$query = new WP_Site_Query();
 
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -635,17 +635,17 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_blog_option( $id, $option, $default = false ) {
+function get_blog_option($id, $option, $default = false) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return get_option( $option, $default );
+	if (get_current_blog_id() == $id)
+		return get_option($option, $default);
 
-	switch_to_blog( $id );
-	$value = get_option( $option, $default );
+	switch_to_blog($id);
+	$value = get_option($option, $default);
 	restore_current_blog();
 
 	/**
@@ -658,7 +658,7 @@ 
 	 * @param string  $value The option value.
 	 * @param int     $id    Blog ID.
 	 */
-	return apply_filters( "blog_option_{$option}", $value, $id );
+	return apply_filters("blog_option_{$option}", $value, $id);
 }
 
 /**
@@ -680,17 +680,17 @@ 
  * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_blog_option( $id, $option, $value ) {
+function add_blog_option($id, $option, $value) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return add_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return add_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = add_option( $option, $value );
+	switch_to_blog($id);
+	$return = add_option($option, $value);
 	restore_current_blog();
 
 	return $return;
@@ -705,17 +705,17 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_blog_option( $id, $option ) {
+function delete_blog_option($id, $option) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if (empty($id))
 		$id = get_current_blog_id();
 
-	if ( get_current_blog_id() == $id )
-		return delete_option( $option );
+	if (get_current_blog_id() == $id)
+		return delete_option($option);
 
-	switch_to_blog( $id );
-	$return = delete_option( $option );
+	switch_to_blog($id);
+	$return = delete_option($option);
 	restore_current_blog();
 
 	return $return;
@@ -732,20 +732,20 @@ 
  * @param mixed  $deprecated Not used.
  * @return bool True on success, false on failure.
  */
-function update_blog_option( $id, $option, $value, $deprecated = null ) {
+function update_blog_option($id, $option, $value, $deprecated = null) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	if ( get_current_blog_id() == $id )
-		return update_option( $option, $value );
+	if (get_current_blog_id() == $id)
+		return update_option($option, $value);
 
-	switch_to_blog( $id );
-	$return = update_option( $option, $value );
+	switch_to_blog($id);
+	$return = update_option($option, $value);
 	restore_current_blog();
 
-	refresh_blog_details( $id );
+	refresh_blog_details($id);
 
 	return $return;
 }
@@ -774,10 +774,10 @@ 
  * @param bool $deprecated Deprecated argument
  * @return true Always returns True.
  */
-function switch_to_blog( $new_blog, $deprecated = null ) {
+function switch_to_blog($new_blog, $deprecated = null) {
 	global $wpdb;
 
-	if ( empty( $new_blog ) )
+	if (empty($new_blog))
 		$new_blog = $GLOBALS['blog_id'];
 
 	$GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
@@ -787,7 +787,7 @@ 
 	 * set the right vars, do the associated actions, but skip
 	 * the extra unnecessary work
 	 */
-	if ( $new_blog == $GLOBALS['blog_id'] ) {
+	if ($new_blog == $GLOBALS['blog_id']) {
 		/**
 		 * Fires when the blog is switched.
 		 *
@@ -796,46 +796,46 @@ 
 		 * @param int $new_blog New blog ID.
 		 * @param int $new_blog Blog ID.
 		 */
-		do_action( 'switch_blog', $new_blog, $new_blog );
+		do_action('switch_blog', $new_blog, $new_blog);
 		$GLOBALS['switched'] = true;
 		return true;
 	}
 
-	$wpdb->set_blog_id( $new_blog );
+	$wpdb->set_blog_id($new_blog);
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 	$prev_blog_id = $GLOBALS['blog_id'];
 	$GLOBALS['blog_id'] = $new_blog;
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $new_blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($new_blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups))
 			$global_groups = $wp_object_cache->global_groups;
 		else
 			$global_groups = false;
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		wp_roles()->reinit();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $new_blog );
+		$current_user->for_blog($new_blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $new_blog, $prev_blog_id );
+	do_action('switch_blog', $new_blog, $prev_blog_id);
 	$GLOBALS['switched'] = true;
 
 	return true;
@@ -859,57 +859,57 @@ 
 function restore_current_blog() {
 	global $wpdb;
 
-	if ( empty( $GLOBALS['_wp_switched_stack'] ) )
+	if (empty($GLOBALS['_wp_switched_stack']))
 		return false;
 
-	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
+	$blog = array_pop($GLOBALS['_wp_switched_stack']);
 
-	if ( $GLOBALS['blog_id'] == $blog ) {
+	if ($GLOBALS['blog_id'] == $blog) {
 		/** This filter is documented in wp-includes/ms-blogs.php */
-		do_action( 'switch_blog', $blog, $blog );
+		do_action('switch_blog', $blog, $blog);
 		// If we still have items in the switched stack, consider ourselves still 'switched'
-		$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+		$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 		return true;
 	}
 
-	$wpdb->set_blog_id( $blog );
+	$wpdb->set_blog_id($blog);
 	$prev_blog_id = $GLOBALS['blog_id'];
 	$GLOBALS['blog_id'] = $blog;
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
-	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
-		wp_cache_switch_to_blog( $blog );
+	if (function_exists('wp_cache_switch_to_blog')) {
+		wp_cache_switch_to_blog($blog);
 	} else {
 		global $wp_object_cache;
 
-		if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+		if (is_object($wp_object_cache) && isset($wp_object_cache->global_groups))
 			$global_groups = $wp_object_cache->global_groups;
 		else
 			$global_groups = false;
 
 		wp_cache_init();
 
-		if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-			if ( is_array( $global_groups ) ) {
-				wp_cache_add_global_groups( $global_groups );
+		if (function_exists('wp_cache_add_global_groups')) {
+			if (is_array($global_groups)) {
+				wp_cache_add_global_groups($global_groups);
 			} else {
-				wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
+				wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
 			}
-			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 		}
 	}
 
-	if ( did_action( 'init' ) ) {
+	if (did_action('init')) {
 		wp_roles()->reinit();
 		$current_user = wp_get_current_user();
-		$current_user->for_blog( $blog );
+		$current_user->for_blog($blog);
 	}
 
 	/** This filter is documented in wp-includes/ms-blogs.php */
-	do_action( 'switch_blog', $blog, $prev_blog_id );
+	do_action('switch_blog', $blog, $prev_blog_id);
 
 	// If we still have items in the switched stack, consider ourselves still 'switched'
-	$GLOBALS['switched'] = ! empty( $GLOBALS['_wp_switched_stack'] );
+	$GLOBALS['switched'] = ! empty($GLOBALS['_wp_switched_stack']);
 
 	return true;
 }
@@ -924,7 +924,7 @@ 
  * @return bool True if switched, false otherwise.
  */
 function ms_is_switched() {
-	return ! empty( $GLOBALS['_wp_switched_stack'] );
+	return ! empty($GLOBALS['_wp_switched_stack']);
 }
 
 /**
@@ -935,7 +935,7 @@ 
  * @param int $id The blog id
  * @return string Whether the blog is archived or not
  */
-function is_archived( $id ) {
+function is_archived($id) {
 	return get_blog_status($id, 'archived');
 }
 
@@ -948,7 +948,7 @@ 
  * @param string $archived The new status
  * @return string $archived
  */
-function update_archived( $id, $archived ) {
+function update_archived($id, $archived) {
 	update_blog_status($id, 'archived', $archived);
 	return $archived;
 }
@@ -966,55 +966,55 @@ 
  * @param null   $deprecated
  * @return string|false $value
  */
-function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
+function update_blog_status($blog_id, $pref, $value, $deprecated = null) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
+	if ( ! in_array($pref, array('site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
 		return $value;
 
-	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
+	$result = $wpdb->update($wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id));
 
-	if ( false === $result )
+	if (false === $result)
 		return false;
 
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
-	if ( 'spam' == $pref ) {
-		if ( $value == 1 ) {
+	if ('spam' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_spam_blog', $blog_id );
+			do_action('make_spam_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_ham_blog', $blog_id );
+			do_action('make_ham_blog', $blog_id);
 		}
-	} elseif ( 'mature' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('mature' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'mature_blog', $blog_id );
+			do_action('mature_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unmature_blog', $blog_id );
+			do_action('unmature_blog', $blog_id);
 		}
-	} elseif ( 'archived' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('archived' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'archive_blog', $blog_id );
+			do_action('archive_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'unarchive_blog', $blog_id );
+			do_action('unarchive_blog', $blog_id);
 		}
-	} elseif ( 'deleted' == $pref ) {
-		if ( $value == 1 ) {
+	} elseif ('deleted' == $pref) {
+		if ($value == 1) {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_delete_blog', $blog_id );
+			do_action('make_delete_blog', $blog_id);
 		} else {
 			/** This filter is documented in wp-includes/ms-blogs.php */
-			do_action( 'make_undelete_blog', $blog_id );
+			do_action('make_undelete_blog', $blog_id);
 		}
-	} elseif ( 'public' == $pref ) {
+	} elseif ('public' == $pref) {
 		/**
 		 * Fires after the current blog's 'public' setting is updated.
 		 *
@@ -1023,7 +1023,7 @@ 
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
  		 */
-		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
+		do_action('update_blog_public', $blog_id, $value); // Moved here from update_blog_public().
 	}
 
 	return $value;
@@ -1040,14 +1040,14 @@ 
  * @param string $pref A field name
  * @return bool|string|null $value
  */
-function get_blog_status( $id, $pref ) {
+function get_blog_status($id, $pref) {
 	global $wpdb;
 
-	$details = get_blog_details( $id, false );
-	if ( $details )
+	$details = get_blog_details($id, false);
+	if ($details)
 		return $details->$pref;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
+	return $wpdb->get_var($wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id));
 }
 
 /**
@@ -1062,13 +1062,13 @@ 
  * @param int   $quantity   The maximum number of blogs to retrieve. Default is 40.
  * @return array The list of blogs
  */
-function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
+function get_last_updated($deprecated = '', $start = 0, $quantity = 40) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, 'MU'); // never used
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+	return $wpdb->get_results($wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity), ARRAY_A);
 }
 
 /**
@@ -1080,10 +1080,10 @@ 
  *                           for information on accepted arguments. Default empty.
  * @return int|array List of networks or number of found networks if `$count` argument is true.
  */
-function get_networks( $args = '' ) {
+function get_networks($args = '') {
 	$query = new WP_Network_Query();
 
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -1099,21 +1099,21 @@ 
  * @param WP_Network|int|null $network Network to retrieve.
  * @return WP_Network|null The network object or null if not found.
  */
-function get_network( &$network = null ) {
+function get_network(&$network = null) {
 	global $current_site;
-	if ( empty( $network ) && isset( $current_site ) ) {
+	if (empty($network) && isset($current_site)) {
 		$network = $current_site;
 	}
 
-	if ( $network instanceof WP_Network ) {
+	if ($network instanceof WP_Network) {
 		$_network = $network;
-	} elseif ( is_object( $network ) ) {
-		$_network = new WP_Network( $network );
+	} elseif (is_object($network)) {
+		$_network = new WP_Network($network);
 	} else {
-		$_network = WP_Network::get_instance( $network );
+		$_network = WP_Network::get_instance($network);
 	}
 
-	if ( ! $_network ) {
+	if ( ! $_network) {
 		return null;
 	}
 
@@ -1124,7 +1124,7 @@ 
 	 *
 	 * @param WP_Network $_network Network data.
 	 */
-	$_network = apply_filters( 'get_network', $_network );
+	$_network = apply_filters('get_network', $_network);
 
 	return $_network;
 }
@@ -1136,9 +1136,9 @@ 
  *
  * @param int|array $ids Network ID or an array of network IDs to remove from cache.
  */
-function clean_network_cache( $ids ) {
-	foreach ( (array) $ids as $id ) {
-		wp_cache_delete( $id, 'networks' );
+function clean_network_cache($ids) {
+	foreach ((array) $ids as $id) {
+		wp_cache_delete($id, 'networks');
 
 		/**
 		 * Fires immediately after a network has been removed from the object cache.
@@ -1147,10 +1147,10 @@ 
 		 *
 		 * @param int $id Network ID.
 		 */
-		do_action( 'clean_network_cache', $id );
+		do_action('clean_network_cache', $id);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'networks' );
+	wp_cache_set('last_changed', microtime(), 'networks');
 }
 
 /**
@@ -1164,9 +1164,9 @@ 
  *
  * @param array $networks Array of network row objects.
  */
-function update_network_cache( $networks ) {
-	foreach ( (array) $networks as $network ) {
-		wp_cache_add( $network->id, $network, 'networks' );
+function update_network_cache($networks) {
+	foreach ((array) $networks as $network) {
+		wp_cache_add($network->id, $network, 'networks');
 	}
 }
 
@@ -1181,14 +1181,14 @@ 
  *
  * @param array $network_ids Array of network IDs.
  */
-function _prime_network_caches( $network_ids ) {
+function _prime_network_caches($network_ids) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($network_ids, 'networks');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_networks = $wpdb->get_results(sprintf("SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_network_cache( $fresh_networks );
+		update_network_cache($fresh_networks);
 	}
 }
 
@@ -1201,13 +1201,13 @@ 
  * @param string $old_status The old post status
  * @param object $post       Post object
  */
-function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) {
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+function _update_blog_date_on_post_publish($new_status, $old_status, $post) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $new_status && 'publish' != $old_status ) {
+	if ('publish' != $new_status && 'publish' != $old_status) {
 		return;
 	}
 
@@ -1223,15 +1223,15 @@ 
  *
  * @param int $post_id Post ID
  */
-function _update_blog_date_on_post_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_blog_date_on_post_delete($post_id) {
+	$post = get_post($post_id);
 
-	$post_type_obj = get_post_type_object( $post->post_type );
-	if ( ! $post_type_obj || ! $post_type_obj->public ) {
+	$post_type_obj = get_post_type_object($post->post_type);
+	if ( ! $post_type_obj || ! $post_type_obj->public) {
 		return;
 	}
 
-	if ( 'publish' != $post->post_status ) {
+	if ('publish' != $post->post_status) {
 		return;
 	}
 
@@ -1245,10 +1245,10 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _update_posts_count_on_delete( $post_id ) {
-	$post = get_post( $post_id );
+function _update_posts_count_on_delete($post_id) {
+	$post = get_post($post_id);
 
-	if ( ! $post || 'publish' !== $post->post_status ) {
+	if ( ! $post || 'publish' !== $post->post_status) {
 		return;
 	}
 
@@ -1263,12 +1263,12 @@ 
  * @param string $new_status The status the post is changing to.
  * @param string $old_status The status the post is changing from.
  */
-function _update_posts_count_on_transition_post_status( $new_status, $old_status ) {
-	if ( $new_status === $old_status ) {
+function _update_posts_count_on_transition_post_status($new_status, $old_status) {
+	if ($new_status === $old_status) {
 		return;
 	}
 
-	if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
+	if ('publish' !== $new_status && 'publish' !== $old_status) {
 		return;
 	}
 

src/wp-includes/ms-load.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
  *
  * @since 3.0.0
  *
- * @return true|string Returns true on success, or drop-in file to include.
+ * @return boolean|string Returns true on success, or drop-in file to include.
  */
 function ms_site_check() {
 	$blog = get_blog_details();

Braces +28 added lines, -20 removed lines

@@ -16,8 +16,9 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
-		return SUBDOMAIN_INSTALL;
+	if ( defined('SUBDOMAIN_INSTALL') ) {
+			return SUBDOMAIN_INSTALL;
+	}
 
 	return ( defined( 'VHOST' ) && VHOST == 'yes' );
 }
@@ -35,8 +36,9 @@ 
  */
 function wp_get_active_network_plugins() {
 	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
-		return array();
+	if ( empty( $active_plugins ) ) {
+			return array();
+	}
 
 	$plugins = array();
 	$active_plugins = array_keys( $active_plugins );
@@ -46,8 +48,9 @@ 
 		if ( ! validate_file( $plugin ) // $plugin must validate as file
 			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+				$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -78,18 +81,21 @@ 
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
 	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
-		return true;
+	if ( null !== $check ) {
+			return true;
+	}
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
-		return true;
+	if ( is_super_admin() ) {
+			return true;
+	}
 
 	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
-		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-deleted.php';
+		} else {
+					wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	if ( '2' == $blog->deleted ) {
@@ -107,10 +113,11 @@ 
 	}
 
 	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
-		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
+					return WP_CONTENT_DIR . '/blog-suspended.php';
+		} else {
+					wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	return true;
@@ -311,8 +318,9 @@ 
 	);
 	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
 	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
-			continue;
+		if ( 'sitecategories' == $t ) {
+					continue;
+		}
 		$msg .= '<li>' . $table . '</li>';
 	}
 	$msg .= '</ul>';

Indentation +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	 * @since 3.0.0
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
-	*/
+	 */
 	$check = apply_filters( 'ms_site_check', null );
 	if ( null !== $check )
 		return true;

Spacing +127 added lines, -127 removed lines

@@ -16,10 +16,10 @@ 
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
+	if (defined('SUBDOMAIN_INSTALL'))
 		return SUBDOMAIN_INSTALL;
 
-	return ( defined( 'VHOST' ) && VHOST == 'yes' );
+	return (defined('VHOST') && VHOST == 'yes');
 }
 
 /**
@@ -34,20 +34,20 @@ 
  * @return array Files to include.
  */
 function wp_get_active_network_plugins() {
-	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
+	$active_plugins = (array) get_site_option('active_sitewide_plugins', array());
+	if (empty($active_plugins))
 		return array();
 
 	$plugins = array();
-	$active_plugins = array_keys( $active_plugins );
-	sort( $active_plugins );
+	$active_plugins = array_keys($active_plugins);
+	sort($active_plugins);
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -76,42 +76,42 @@ 
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
 	*/
-	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
+	$check = apply_filters('ms_site_check', null);
+	if (null !== $check)
 		return true;
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
+	if (is_super_admin())
 		return true;
 
 	$blog = get_blog_details();
 
-	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
-			return WP_CONTENT_DIR . '/blog-deleted.php';
+	if ('1' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-deleted.php'))
+			return WP_CONTENT_DIR.'/blog-deleted.php';
 		else
-			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site is no longer available.'), '', array('response' => 410));
 	}
 
-	if ( '2' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
-			return WP_CONTENT_DIR . '/blog-inactive.php';
+	if ('2' == $blog->deleted) {
+		if (file_exists(WP_CONTENT_DIR.'/blog-inactive.php')) {
+			return WP_CONTENT_DIR.'/blog-inactive.php';
 		} else {
-			$admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) );
+			$admin_email = str_replace('@', ' AT ', get_site_option('admin_email', 'support@'.get_current_site()->domain));
 			wp_die(
 				/* translators: %s: admin email link */
-				sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
-					sprintf( '<a href="mailto:%s">%s</a>', $admin_email )
+				sprintf(__('This site has not been activated yet. If you are having problems activating your site, please contact %s.'),
+					sprintf('<a href="mailto:%s">%s</a>', $admin_email)
 				)
 			);
 		}
 	}
 
-	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
-			return WP_CONTENT_DIR . '/blog-suspended.php';
+	if ($blog->archived == '1' || $blog->spam == '1') {
+		if (file_exists(WP_CONTENT_DIR.'/blog-suspended.php'))
+			return WP_CONTENT_DIR.'/blog-suspended.php';
 		else
-			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+			wp_die(__('This site has been archived or suspended.'), '', array('response' => 410));
 	}
 
 	return true;
@@ -128,8 +128,8 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return WP_Network|false Network object if successful. False when no network is found.
  */
-function get_network_by_path( $domain, $path, $segments = null ) {
-	return WP_Network::get_by_path( $domain, $path, $segments );
+function get_network_by_path($domain, $path, $segments = null) {
+	return WP_Network::get_by_path($domain, $path, $segments);
 }
 
 /**
@@ -142,9 +142,9 @@ 
  * @param object|int $network The network's database row or ID.
  * @return WP_Network|false Object containing network information if found, false if not.
  */
-function wp_get_network( $network ) {
-	$network = get_network( $network );
-	if ( null === $network ) {
+function wp_get_network($network) {
+	$network = get_network($network);
+	if (null === $network) {
 		return false;
 	}
 
@@ -164,8 +164,8 @@ 
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
  * @return object|false Site object if successful. False when no site is found.
  */
-function get_site_by_path( $domain, $path, $segments = null ) {
-	$path_segments = array_filter( explode( '/', trim( $path, '/' ) ) );
+function get_site_by_path($domain, $path, $segments = null) {
+	$path_segments = array_filter(explode('/', trim($path, '/')));
 
 	/**
 	 * Filters the number of path segments to consider when searching for a site.
@@ -178,17 +178,17 @@ 
 	 * @param string   $domain   The requested domain.
 	 * @param string   $path     The requested path, in full.
 	 */
-	$segments = apply_filters( 'site_by_path_segments_count', $segments, $domain, $path );
+	$segments = apply_filters('site_by_path_segments_count', $segments, $domain, $path);
 
-	if ( null !== $segments && count( $path_segments ) > $segments ) {
-		$path_segments = array_slice( $path_segments, 0, $segments );
+	if (null !== $segments && count($path_segments) > $segments) {
+		$path_segments = array_slice($path_segments, 0, $segments);
 	}
 
 	$paths = array();
 
-	while ( count( $path_segments ) ) {
-		$paths[] = '/' . implode( '/', $path_segments ) . '/';
-		array_pop( $path_segments );
+	while (count($path_segments)) {
+		$paths[] = '/'.implode('/', $path_segments).'/';
+		array_pop($path_segments);
 	}
 
 	$paths[] = '/';
@@ -212,8 +212,8 @@ 
 	 *                                   Default null, meaning the entire path was to be consulted.
 	 * @param array            $paths    The paths to search for, based on $path and $segments.
 	 */
-	$pre = apply_filters( 'pre_get_site_by_path', null, $domain, $path, $segments, $paths );
-	if ( null !== $pre ) {
+	$pre = apply_filters('pre_get_site_by_path', null, $domain, $path, $segments, $paths);
+	if (null !== $pre) {
 		return $pre;
 	}
 
@@ -228,9 +228,9 @@ 
 
 	// Either www or non-www is supported, not both. If a www domain is requested,
 	// query for both to provide the proper redirect.
-	$domains = array( $domain );
-	if ( 'www.' === substr( $domain, 0, 4 ) ) {
-		$domains[] = substr( $domain, 4 );
+	$domains = array($domain);
+	if ('www.' === substr($domain, 0, 4)) {
+		$domains[] = substr($domain, 4);
 	}
 
 	$args = array(
@@ -239,21 +239,21 @@ 
 		'number' => 1,
 	);
 
-	if ( count( $domains ) > 1 && count( $paths ) > 1 ) {
+	if (count($domains) > 1 && count($paths) > 1) {
 		$args['orderby'] = 'domain_length path_length';
 		$args['order'] = 'DESC DESC';
-	} elseif ( count( $domains ) > 1 ) {
+	} elseif (count($domains) > 1) {
 		$args['orderby'] = 'domain_length';
 		$args['order'] = 'DESC';
-	} elseif ( count( $paths ) > 1 ) {
+	} elseif (count($paths) > 1) {
 		$args['orderby'] = 'path_length';
 		$args['order'] = 'DESC';
 	}
 
-	$result = get_sites( $args );
-	$site = array_shift( $result );
+	$result = get_sites($args);
+	$site = array_shift($result);
 
-	if ( $site ) {
+	if ($site) {
 		// @todo get_blog_details()
 		return $site;
 	}
@@ -291,55 +291,55 @@ 
  *                     False if bootstrap could not be properly completed.
  *                     Redirect URL if parts exist, but the request as a whole can not be fulfilled.
  */
-function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) {
+function ms_load_current_site_and_network($domain, $path, $subdomain = false) {
 	global $wpdb, $current_site, $current_blog;
 
 	// If the network is defined in wp-config.php, we can simply use that.
-	if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+	if (defined('DOMAIN_CURRENT_SITE') && defined('PATH_CURRENT_SITE')) {
 		$current_site = new stdClass;
-		$current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
+		$current_site->id = defined('SITE_ID_CURRENT_SITE') ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
 		$current_site->path = PATH_CURRENT_SITE;
-		if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
+		if (defined('BLOG_ID_CURRENT_SITE')) {
 			$current_site->blog_id = BLOG_ID_CURRENT_SITE;
-		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
+		} elseif (defined('BLOGID_CURRENT_SITE')) { // deprecated.
 			$current_site->blog_id = BLOGID_CURRENT_SITE;
 		}
 
-		if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
-			$current_blog = get_site_by_path( $domain, $path );
-		} elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
+		if (0 === strcasecmp($current_site->domain, $domain) && 0 === strcasecmp($current_site->path, $path)) {
+			$current_blog = get_site_by_path($domain, $path);
+		} elseif ('/' !== $current_site->path && 0 === strcasecmp($current_site->domain, $domain) && 0 === stripos($path, $current_site->path)) {
 			// If the current network has a path and also matches the domain and path of the request,
 			// we need to look for a site using the first path segment following the network's path.
-			$current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
+			$current_blog = get_site_by_path($domain, $path, 1 + count(explode('/', trim($current_site->path, '/'))));
 		} else {
 			// Otherwise, use the first path segment (as usual).
-			$current_blog = get_site_by_path( $domain, $path, 1 );
+			$current_blog = get_site_by_path($domain, $path, 1);
 		}
 
-	} elseif ( ! $subdomain ) {
+	} elseif ( ! $subdomain) {
 		/*
 		 * A "subdomain" install can be re-interpreted to mean "can support any domain".
 		 * If we're not dealing with one of these installs, then the important part is determining
 		 * the network first, because we need the network's path to identify any sites.
 		 */
-		if ( ! $current_site = wp_cache_get( 'current_network', 'site-options' ) ) {
+		if ( ! $current_site = wp_cache_get('current_network', 'site-options')) {
 			// Are there even two networks installed?
-			$one_network = $wpdb->get_row( "SELECT * FROM $wpdb->site LIMIT 2" ); // [sic]
-			if ( 1 === $wpdb->num_rows ) {
-				$current_site = new WP_Network( $one_network );
-				wp_cache_add( 'current_network', $current_site, 'site-options' );
-			} elseif ( 0 === $wpdb->num_rows ) {
+			$one_network = $wpdb->get_row("SELECT * FROM $wpdb->site LIMIT 2"); // [sic]
+			if (1 === $wpdb->num_rows) {
+				$current_site = new WP_Network($one_network);
+				wp_cache_add('current_network', $current_site, 'site-options');
+			} elseif (0 === $wpdb->num_rows) {
 				// A network not found hook should fire here.
 				return false;
 			}
 		}
 
-		if ( empty( $current_site ) ) {
-			$current_site = WP_Network::get_by_path( $domain, $path, 1 );
+		if (empty($current_site)) {
+			$current_site = WP_Network::get_by_path($domain, $path, 1);
 		}
 
-		if ( empty( $current_site ) ) {
+		if (empty($current_site)) {
 			/**
 			 * Fires when a network cannot be found based on the requested domain and path.
 			 *
@@ -351,48 +351,48 @@ 
 			 * @param string $domain       The domain used to search for a network.
 			 * @param string $path         The path used to search for a path.
 			 */
-			do_action( 'ms_network_not_found', $domain, $path );
+			do_action('ms_network_not_found', $domain, $path);
 
 			return false;
-		} elseif ( $path === $current_site->path ) {
-			$current_blog = get_site_by_path( $domain, $path );
+		} elseif ($path === $current_site->path) {
+			$current_blog = get_site_by_path($domain, $path);
 		} else {
 			// Search the network path + one more path segment (on top of the network path).
-			$current_blog = get_site_by_path( $domain, $path, substr_count( $current_site->path, '/' ) );
+			$current_blog = get_site_by_path($domain, $path, substr_count($current_site->path, '/'));
 		}
 	} else {
 		// Find the site by the domain and at most the first path segment.
-		$current_blog = get_site_by_path( $domain, $path, 1 );
-		if ( $current_blog ) {
-			$current_site = WP_Network::get_instance( $current_blog->site_id ? $current_blog->site_id : 1 );
+		$current_blog = get_site_by_path($domain, $path, 1);
+		if ($current_blog) {
+			$current_site = WP_Network::get_instance($current_blog->site_id ? $current_blog->site_id : 1);
 		} else {
 			// If you don't have a site with the same domain/path as a network, you're pretty screwed, but:
-			$current_site = WP_Network::get_by_path( $domain, $path, 1 );
+			$current_site = WP_Network::get_by_path($domain, $path, 1);
 		}
 	}
 
 	// The network declared by the site trumps any constants.
-	if ( $current_blog && $current_blog->site_id != $current_site->id ) {
-		$current_site = WP_Network::get_instance( $current_blog->site_id );
+	if ($current_blog && $current_blog->site_id != $current_site->id) {
+		$current_site = WP_Network::get_instance($current_blog->site_id);
 	}
 
 	// No network has been found, bail.
-	if ( empty( $current_site ) ) {
+	if (empty($current_site)) {
 		/** This action is documented in wp-includes/ms-settings.php */
-		do_action( 'ms_network_not_found', $domain, $path );
+		do_action('ms_network_not_found', $domain, $path);
 
 		return false;
 	}
 
 	// During activation of a new subdomain, the requested site does not yet exist.
-	if ( empty( $current_blog ) && wp_installing() ) {
+	if (empty($current_blog) && wp_installing()) {
 		$current_blog = new stdClass;
 		$current_blog->blog_id = $blog_id = 1;
 		$current_blog->public = 1;
 	}
 
 	// No site has been found, bail.
-	if ( empty( $current_blog ) ) {
+	if (empty($current_blog)) {
 		// We're going to redirect to the network URL, with some possible modifications.
 		$scheme = is_ssl() ? 'https' : 'http';
 		$destination = "$scheme://{$current_site->domain}{$current_site->path}";
@@ -409,19 +409,19 @@ 
 		 * @param string $domain       The domain used to search for a site.
 		 * @param string $path         The path used to search for a site.
 		 */
-		do_action( 'ms_site_not_found', $current_site, $domain, $path );
+		do_action('ms_site_not_found', $current_site, $domain, $path);
 
-		if ( $subdomain && ! defined( 'NOBLOGREDIRECT' ) ) {
+		if ($subdomain && ! defined('NOBLOGREDIRECT')) {
 			// For a "subdomain" install, redirect to the signup form specifically.
-			$destination .= 'wp-signup.php?new=' . str_replace( '.' . $current_site->domain, '', $domain );
-		} elseif ( $subdomain ) {
+			$destination .= 'wp-signup.php?new='.str_replace('.'.$current_site->domain, '', $domain);
+		} elseif ($subdomain) {
 			// For a "subdomain" install, the NOBLOGREDIRECT constant
 			// can be used to avoid a redirect to the signup form.
 			// Using the ms_site_not_found action is preferred to the constant.
-			if ( '%siteurl%' !== NOBLOGREDIRECT ) {
+			if ('%siteurl%' !== NOBLOGREDIRECT) {
 				$destination = NOBLOGREDIRECT;
 			}
-		} elseif ( 0 === strcasecmp( $current_site->domain, $domain ) ) {
+		} elseif (0 === strcasecmp($current_site->domain, $domain)) {
 			/*
 			 * If the domain we were searching for matches the network's domain,
 			 * it's no use redirecting back to ourselves -- it'll cause a loop.
@@ -434,13 +434,13 @@ 
 	}
 
 	// Figure out the current network's main site.
-	if ( empty( $current_site->blog_id ) ) {
-		if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
+	if (empty($current_site->blog_id)) {
+		if ($current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path) {
 			$current_site->blog_id = $current_blog->blog_id;
-		} elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {
-			$current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
-				$current_site->domain, $current_site->path ) );
-			wp_cache_add( 'network:' . $current_site->id . ':main_site', $current_site->blog_id, 'site-options' );
+		} elseif ( ! $current_site->blog_id = wp_cache_get('network:'.$current_site->id.':main_site', 'site-options')) {
+			$current_site->blog_id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s",
+				$current_site->domain, $current_site->path));
+			wp_cache_add('network:'.$current_site->id.':main_site', $current_site->blog_id, 'site-options');
 		}
 	}
 
@@ -461,50 +461,50 @@ 
  * @param string $domain The requested domain for the error to reference.
  * @param string $path   The requested path for the error to reference.
  */
-function ms_not_installed( $domain, $path ) {
+function ms_not_installed($domain, $path) {
 	global $wpdb;
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		dead_db();
 	}
 
 	wp_load_translations_early();
 
-	$title = __( 'Error establishing a database connection' );
+	$title = __('Error establishing a database connection');
 
-	$msg  = '<h1>' . $title . '</h1>';
-	$msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
-	$msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
-	if ( ! $wpdb->get_var( $query ) ) {
-		$msg .= '<p>' . sprintf(
+	$msg  = '<h1>'.$title.'</h1>';
+	$msg .= '<p>'.__('If your site does not display, please contact the owner of this network.').'';
+	$msg .= ' '.__('If you are the owner of this network please check that MySQL is running properly and all tables are error free.').'</p>';
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->site));
+	if ( ! $wpdb->get_var($query)) {
+		$msg .= '<p>'.sprintf(
 			/* translators: %s: table name */
-			__( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.' ),
-			'<code>' . $wpdb->site . '</code>'
-		) . '</p>';
+			__('<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s. You really should look at your database now.'),
+			'<code>'.$wpdb->site.'</code>'
+		).'</p>';
 	} else {
-		$msg .= '<p>' . sprintf(
+		$msg .= '<p>'.sprintf(
 			/* translators: 1: site url, 2: table name, 3: database name */
-			__( '<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?' ),
-			'<code>' . rtrim( $domain . $path, '/' ) . '</code>',
-			'<code>' . $wpdb->blogs . '</code>',
-			'<code>' . DB_NAME . '</code>'
-		) . '</p>';
+			__('<strong>Could not find site %1$s.</strong> Searched for table %2$s in database %3$s. Is that right?'),
+			'<code>'.rtrim($domain.$path, '/').'</code>',
+			'<code>'.$wpdb->blogs.'</code>',
+			'<code>'.DB_NAME.'</code>'
+		).'</p>';
 	}
-	$msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
+	$msg .= '<p><strong>'.__('What do I do now?').'</strong> ';
 	/* translators: %s: Codex URL */
-	$msg .= sprintf( __( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
-		__( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' )
+	$msg .= sprintf(__('Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'),
+		__('https://codex.wordpress.org/Debugging_a_WordPress_Network')
 	);
-	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
-	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
+	$msg .= ' '.__('If you&#8217;re still stuck with this message, then check that your database contains the following tables:').'</p><ul>';
+	foreach ($wpdb->tables('global') as $t => $table) {
+		if ('sitecategories' == $t)
 			continue;
-		$msg .= '<li>' . $table . '</li>';
+		$msg .= '<li>'.$table.'</li>';
 	}
 	$msg .= '</ul>';
 
-	wp_die( $msg, $title, array( 'response' => 500 ) );
+	wp_die($msg, $title, array('response' => 500));
 }
 
 /**
@@ -520,8 +520,8 @@ 
  * @param object $current_site
  * @return object
  */
-function get_current_site_name( $current_site ) {
-	_deprecated_function( __FUNCTION__, '3.9', 'get_current_site()' );
+function get_current_site_name($current_site) {
+	_deprecated_function(__FUNCTION__, '3.9', 'get_current_site()');
 	return $current_site;
 }
 
@@ -541,6 +541,6 @@ 
  */
 function wpmu_current_site() {
 	global $current_site;
-	_deprecated_function( __FUNCTION__, '3.9' );
+	_deprecated_function(__FUNCTION__, '3.9');
 	return $current_site;
 }

src/wp-includes/pomo/mo.php

Doc Comments +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 	/**
 	 * @param resource $fh
-	 * @return true
+	 * @return boolean
 	 */
 	function export_to_file_handle($fh) {
 		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );

Spacing +40 added lines, -40 removed lines

@@ -7,10 +7,10 @@ 
  * @subpackage mo
  */
 
-require_once dirname(__FILE__) . '/translations.php';
-require_once dirname(__FILE__) . '/streams.php';
+require_once dirname(__FILE__).'/translations.php';
+require_once dirname(__FILE__).'/streams.php';
 
-if ( ! class_exists( 'MO', false ) ):
+if ( ! class_exists('MO', false)):
 class MO extends Gettext_Translations {
 
 	var $_nplurals = 2;
@@ -22,7 +22,7 @@ 
 	 */
 	function import_from_file($filename) {
 		$reader = new POMO_FileReader($filename);
-		if (!$reader->is_resource())
+		if ( ! $reader->is_resource())
 			return false;
 		return $this->import_from_reader($reader);
 	}
@@ -33,8 +33,8 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
-		$res = $this->export_to_file_handle( $fh );
+		if ( ! $fh) return false;
+		$res = $this->export_to_file_handle($fh);
 		fclose($fh);
 		return $res;
 	}
@@ -44,22 +44,22 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
-		$this->export_to_file_handle( $tmp_fh );
-		rewind( $tmp_fh );
-		return stream_get_contents( $tmp_fh );
+		if ( ! $tmp_fh) return false;
+		$this->export_to_file_handle($tmp_fh);
+		rewind($tmp_fh);
+		return stream_get_contents($tmp_fh);
 	}
 
 	/**
 	 * @param Translation_Entry $entry
 	 * @return bool
 	 */
-	function is_entry_good_for_export( $entry ) {
-		if ( empty( $entry->translations ) ) {
+	function is_entry_good_for_export($entry) {
+		if (empty($entry->translations)) {
 			return false;
 		}
 
-		if ( !array_filter( $entry->translations ) ) {
+		if ( ! array_filter($entry->translations)) {
 			return false;
 		}
 
@@ -71,7 +71,7 @@ 
 	 * @return true
 	 */
 	function export_to_file_handle($fh) {
-		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
+		$entries = array_filter($this->entries, array($this, 'is_entry_good_for_export'));
 		ksort($entries);
 		$magic = 0x950412de;
 		$revision = 0;
@@ -92,8 +92,8 @@ 
 
 		$reader = new POMO_Reader();
 
-		foreach($entries as $entry) {
-			$originals_table .= $this->export_original($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$originals_table .= $this->export_original($entry).chr(0);
 			$length = $reader->strlen($this->export_original($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1; // account for the NULL byte after
@@ -102,10 +102,10 @@ 
 		$exported_headers = $this->export_headers();
 		fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
 		$current_addr += strlen($exported_headers) + 1;
-		$translations_table = $exported_headers . chr(0);
+		$translations_table = $exported_headers.chr(0);
 
-		foreach($entries as $entry) {
-			$translations_table .= $this->export_translations($entry) . chr(0);
+		foreach ($entries as $entry) {
+			$translations_table .= $this->export_translations($entry).chr(0);
 			$length = $reader->strlen($this->export_translations($entry));
 			fwrite($fh, pack('VV', $length, $current_addr));
 			$current_addr += $length + 1;
@@ -124,7 +124,7 @@ 
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
 		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->context) $exported = $entry->context.chr(4).$exported;
 		return $exported;
 	}
 
@@ -142,8 +142,8 @@ 
 	 */
 	function export_headers() {
 		$exported = '';
-		foreach($this->headers as $header => $value) {
-			$exported.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$exported .= "$header: $value\n";
 		}
 		return $exported;
 	}
@@ -156,10 +156,10 @@ 
 		// The magic is 0x950412de
 
 		// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
-		$magic_little = (int) - 1794895138;
+		$magic_little = (int) -1794895138;
 		$magic_little_64 = (int) 2500072158;
 		// 0xde120495
-		$magic_big = ((int) - 569244523) & 0xFFFFFFFF;
+		$magic_big = ((int) -569244523) & 0xFFFFFFFF;
 		if ($magic_little == $magic || $magic_little_64 == $magic) {
 			return 'little';
 		} else if ($magic_big == $magic) {
@@ -179,7 +179,7 @@ 
 		}
 		$reader->setEndian($endian_string);
 
-		$endian = ('big' == $endian_string)? 'N' : 'V';
+		$endian = ('big' == $endian_string) ? 'N' : 'V';
 
 		$header = $reader->read(24);
 		if ($reader->strlen($header) != 24)
@@ -187,42 +187,42 @@ 
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
+		if ( ! is_array($header))
 			return false;
 
 		// support revision 0 of MO format specs, only
-		if ( $header['revision'] != 0 ) {
+		if ($header['revision'] != 0) {
 			return false;
 		}
 
 		// seek to data blocks
-		$reader->seekto( $header['originals_lenghts_addr'] );
+		$reader->seekto($header['originals_lenghts_addr']);
 
 		// read originals' indices
 		$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
-		if ( $originals_lengths_length != $header['total'] * 8 ) {
+		if ($originals_lengths_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$originals = $reader->read($originals_lengths_length);
-		if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+		if ($reader->strlen($originals) != $originals_lengths_length) {
 			return false;
 		}
 
 		// read translations' indices
 		$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
-		if ( $translations_lenghts_length != $header['total'] * 8 ) {
+		if ($translations_lenghts_length != $header['total'] * 8) {
 			return false;
 		}
 
 		$translations = $reader->read($translations_lenghts_length);
-		if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+		if ($reader->strlen($translations) != $translations_lenghts_length) {
 			return false;
 		}
 
 		// transform raw data into set of indices
-		$originals    = $reader->str_split( $originals, 8 );
-		$translations = $reader->str_split( $translations, 8 );
+		$originals    = $reader->str_split($originals, 8);
+		$translations = $reader->str_split($translations, 8);
 
 		// skip hash table
 		$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
@@ -232,17 +232,17 @@ 
 		$strings = $reader->read_all();
 		$reader->close();
 
-		for ( $i = 0; $i < $header['total']; $i++ ) {
-			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
-			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+		for ($i = 0; $i < $header['total']; $i++) {
+			$o = unpack("{$endian}length/{$endian}pos", $originals[$i]);
+			$t = unpack("{$endian}length/{$endian}pos", $translations[$i]);
+			if ( ! $o || ! $t) return false;
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;
 			$t['pos'] -= $strings_addr;
 
-			$original    = $reader->substr( $strings, $o['pos'], $o['length'] );
-			$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
+			$original    = $reader->substr($strings, $o['pos'], $o['length']);
+			$translation = $reader->substr($strings, $t['pos'], $t['length']);
 
 			if ('' === $original) {
 				$this->set_headers($this->make_headers($translation));

Braces +24 added lines, -11 removed lines

@@ -22,8 +22,9 @@ 
 	 */
 	function import_from_file($filename) {
 		$reader = new POMO_FileReader($filename);
-		if (!$reader->is_resource())
-			return false;
+		if (!$reader->is_resource()) {
+					return false;
+		}
 		return $this->import_from_reader($reader);
 	}
 
@@ -33,7 +34,9 @@ 
 	 */
 	function export_to_file($filename) {
 		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
+		if ( !$fh ) {
+			return false;
+		}
 		$res = $this->export_to_file_handle( $fh );
 		fclose($fh);
 		return $res;
@@ -44,7 +47,9 @@ 
 	 */
 	function export() {
 		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
+		if ( !$tmp_fh ) {
+			return false;
+		}
 		$this->export_to_file_handle( $tmp_fh );
 		rewind( $tmp_fh );
 		return stream_get_contents( $tmp_fh );
@@ -123,8 +128,12 @@ 
 	function export_original($entry) {
 		//TODO: warnings for control characters
 		$exported = $entry->singular;
-		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
+		if ($entry->is_plural) {
+			$exported .= chr(0).$entry->plural;
+		}
+		if ($entry->context) {
+			$exported = $entry->context . chr(4) . $exported;
+		}
 		return $exported;
 	}
 
@@ -182,13 +191,15 @@ 
 		$endian = ('big' == $endian_string)? 'N' : 'V';
 
 		$header = $reader->read(24);
-		if ($reader->strlen($header) != 24)
-			return false;
+		if ($reader->strlen($header) != 24) {
+					return false;
+		}
 
 		// parse header
 		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
-			return false;
+		if (!is_array($header)) {
+					return false;
+		}
 
 		// support revision 0 of MO format specs, only
 		if ( $header['revision'] != 0 ) {
@@ -235,7 +246,9 @@ 
 		for ( $i = 0; $i < $header['total']; $i++ ) {
 			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
 			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
+			if ( !$o || !$t ) {
+				return false;
+			}
 
 			// adjust offset due to reading strings to separate space before
 			$o['pos'] -= $strings_addr;

src/wp-includes/pomo/streams.php

Doc Comments +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * Sets the endianness of the file.
 	 *
-	 * @param $endian string 'big' or 'little'
+	 * @param string $endian string 'big' or 'little'
 	 */
 	function setEndian($endian) {
 		$this->endian = $endian;
@@ -41,7 +41,7 @@ 
 	/**
 	 * Reads a 32bit Integer from the Stream
 	 *
-	 * @return mixed The integer, corresponding to the next 32 bits from
+	 * @return integer The integer, corresponding to the next 32 bits from
 	 * 	the stream of false if there are not enough bytes or on error
 	 */
 	function readint32() {
@@ -119,14 +119,14 @@ 
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function is_resource() {
 		return true;
 	}
 
 	/**
-	 * @return true
+	 * @return boolean
 	 */
 	function close() {
 		return true;

Braces +21 added lines, -12 removed lines

@@ -46,8 +46,9 @@ 
 	 */
 	function readint32() {
 		$bytes = $this->read(4);
-		if (4 != $this->strlen($bytes))
-			return false;
+		if (4 != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
 		return reset( $int );
@@ -62,8 +63,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
-			return false;
+		if (4*$count != $this->strlen($bytes)) {
+					return false;
+		}
 		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
@@ -103,8 +105,9 @@ 
 		if (!function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
-			for ($i = 0; $i < $length; $i += $chunk_size)
-				$out[] = $this->substr($string, $i, $chunk_size);
+			for ($i = 0; $i < $length; $i += $chunk_size) {
+							$out[] = $this->substr($string, $i, $chunk_size);
+			}
 			return $out;
 		} else {
 			return str_split( $string, $chunk_size );
@@ -197,8 +200,9 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
-			$all .= $this->read(4096);
+		while ( !$this->feof() ) {
+					$all .= $this->read(4096);
+		}
 		return $all;
 	}
 }
@@ -236,7 +240,9 @@ 
 	function read($bytes) {
 		$data = $this->substr($this->_str, $this->_pos, $bytes);
 		$this->_pos += $bytes;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $data;
 	}
 
@@ -246,7 +252,9 @@ 
 	 */
 	function seekto($pos) {
 		$this->_pos = $pos;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+		if ($this->strlen($this->_str) < $this->_pos) {
+			$this->_pos = $this->strlen($this->_str);
+		}
 		return $this->_pos;
 	}
 
@@ -278,8 +286,9 @@ 
 	function __construct( $filename ) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
-		if (false === $this->_str)
-			return false;
+		if (false === $this->_str) {
+					return false;
+		}
 		$this->_pos = 0;
 	}
 

Spacing +24 added lines, -24 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage streams
  */
 
-if ( ! class_exists( 'POMO_Reader', false ) ):
+if ( ! class_exists('POMO_Reader', false)):
 class POMO_Reader {
 
 	var $endian = 'little';
@@ -48,9 +48,9 @@ 
 		$bytes = $this->read(4);
 		if (4 != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		$int = unpack($endian_letter, $bytes);
-		return reset( $int );
+		return reset($int);
 	}
 
 	/**
@@ -62,9 +62,9 @@ 
 	 */
 	function readint32array($count) {
 		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
+		if (4 * $count != $this->strlen($bytes))
 			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
+		$endian_letter = ('big' == $this->endian) ? 'N' : 'V';
 		return unpack($endian_letter.$count, $bytes);
 	}
 
@@ -100,14 +100,14 @@ 
 	 * @return array
 	 */
 	function str_split($string, $chunk_size) {
-		if (!function_exists('str_split')) {
+		if ( ! function_exists('str_split')) {
 			$length = $this->strlen($string);
 			$out = array();
 			for ($i = 0; $i < $length; $i += $chunk_size)
 				$out[] = $this->substr($string, $i, $chunk_size);
 			return $out;
 		} else {
-			return str_split( $string, $chunk_size );
+			return str_split($string, $chunk_size);
 		}
 	}
 
@@ -134,13 +134,13 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_FileReader', false ) ):
+if ( ! class_exists('POMO_FileReader', false)):
 class POMO_FileReader extends POMO_Reader {
 
 	/**
 	 * @param string $filename
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_Reader();
 		$this->_f = fopen($filename, 'rb');
 	}
@@ -148,8 +148,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_FileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_FileReader($filename) {
+		self::__construct($filename);
 	}
 
 	/**
@@ -197,14 +197,14 @@ 
 	 */
 	function read_all() {
 		$all = '';
-		while ( !$this->feof() )
+		while ( ! $this->feof())
 			$all .= $this->read(4096);
 		return $all;
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_StringReader', false ) ):
+if ( ! class_exists('POMO_StringReader', false)):
 /**
  * Provides file-like methods for manipulating a string instead
  * of a physical file.
@@ -216,7 +216,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $str = '' ) {
+	function __construct($str = '') {
 		parent::POMO_Reader();
 		$this->_str = $str;
 		$this->_pos = 0;
@@ -225,8 +225,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_StringReader( $str = '' ) {
-		self::__construct( $str );
+	public function POMO_StringReader($str = '') {
+		self::__construct($str);
 	}
 
 	/**
@@ -267,7 +267,7 @@ 
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedFileReader', false ) ):
+if ( ! class_exists('POMO_CachedFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -275,7 +275,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $filename ) {
+	function __construct($filename) {
 		parent::POMO_StringReader();
 		$this->_str = file_get_contents($filename);
 		if (false === $this->_str)
@@ -286,13 +286,13 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POMO_CachedFileReader( $filename ) {
-		self::__construct( $filename );
+	public function POMO_CachedFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;
 
-if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ):
+if ( ! class_exists('POMO_CachedIntFileReader', false)):
 /**
  * Reads the contents of the file in the beginning.
  */
@@ -300,15 +300,15 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	public function __construct( $filename ) {
+	public function __construct($filename) {
 		parent::POMO_CachedFileReader($filename);
 	}
 
 	/**
 	 * PHP4 constructor.
 	 */
-	function POMO_CachedIntFileReader( $filename ) {
-		self::__construct( $filename );
+	function POMO_CachedIntFileReader($filename) {
+		self::__construct($filename);
 	}
 }
 endif;