ntwb / wordpress

src/wp-includes/general-template.php

Doc Comments +3 added lines, -3 removed lines

@@ -1583,7 +1583,7 @@ 
  * @since 1.5.0
  *
  * @param int $num Number of day.
- * @return int Days since the start of the week.
+ * @return double Days since the start of the week.
  */
 function calendar_week_mod($num) {
 	$base = 7;
@@ -2737,7 +2737,7 @@ 
  *     @type string $before_page_number A string to appear before the page number. Default empty.
  *     @type string $after_page_number  A string to append after the page number. Default empty.
  * }
- * @return array|string|void String of page links or array of page links.
+ * @return string String of page links or array of page links.
  */
 function paginate_links( $args = '' ) {
 	global $wp_query, $wp_rewrite;
@@ -2900,7 +2900,7 @@ 
  * @param string $key    The unique key for this theme.
  * @param string $name   The name of the theme.
  * @param string $url    The url of the css file containing the colour scheme.
- * @param array  $colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
+ * @param string[]  $colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
  * @param array  $icons  Optional An array of CSS color definitions used to color any SVG icons
  */
 function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * General template tags that can go anywhere in a template.
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * General template tags that can go anywhere in a template.
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Load header template.

Spacing +634 added lines, -634 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @param string $name The name of the specialised header.
  */
-function get_header( $name = null ) {
+function get_header($name = null) {
 	/**
 	 * Fires before the header template file is loaded.
 	 *
@@ -32,18 +32,18 @@ 
 	 *
 	 * @param string $name Name of the specific header file to use.
 	 */
-	do_action( 'get_header', $name );
+	do_action('get_header', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "header-{$name}.php";
 
 	$templates[] = 'header.php';
 
 	// Backward compat code will be removed in a future release
 	if ('' == locate_template($templates, true))
-		load_template( ABSPATH . WPINC . '/theme-compat/header.php');
+		load_template(ABSPATH.WPINC.'/theme-compat/header.php');
 }
 
 /**
@@ -59,7 +59,7 @@ 
  *
  * @param string $name The name of the specialised footer.
  */
-function get_footer( $name = null ) {
+function get_footer($name = null) {
 	/**
 	 * Fires before the footer template file is loaded.
 	 *
@@ -72,18 +72,18 @@ 
 	 *
 	 * @param string $name Name of the specific footer file to use.
 	 */
-	do_action( 'get_footer', $name );
+	do_action('get_footer', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "footer-{$name}.php";
 
 	$templates[] = 'footer.php';
 
 	// Backward compat code will be removed in a future release
 	if ('' == locate_template($templates, true))
-		load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
+		load_template(ABSPATH.WPINC.'/theme-compat/footer.php');
 }
 
 /**
@@ -99,7 +99,7 @@ 
  *
  * @param string $name The name of the specialised sidebar.
  */
-function get_sidebar( $name = null ) {
+function get_sidebar($name = null) {
 	/**
 	 * Fires before the sidebar template file is loaded.
 	 *
@@ -112,18 +112,18 @@ 
 	 *
 	 * @param string $name Name of the specific sidebar file to use.
 	 */
-	do_action( 'get_sidebar', $name );
+	do_action('get_sidebar', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "sidebar-{$name}.php";
 
 	$templates[] = 'sidebar.php';
 
 	// Backward compat code will be removed in a future release
 	if ('' == locate_template($templates, true))
-		load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
+		load_template(ABSPATH.WPINC.'/theme-compat/sidebar.php');
 }
 
 /**
@@ -147,7 +147,7 @@ 
  * @param string $slug The slug name for the generic template.
  * @param string $name The name of the specialised template.
  */
-function get_template_part( $slug, $name = null ) {
+function get_template_part($slug, $name = null) {
 	/**
 	 * Fires before the specified template part file is loaded.
 	 *
@@ -159,11 +159,11 @@ 
 	 * @param string $slug The slug name for the generic template.
 	 * @param string $name The name of the specialized template.
 	 */
-	do_action( "get_template_part_{$slug}", $slug, $name );
+	do_action("get_template_part_{$slug}", $slug, $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "{$slug}-{$name}.php";
 
 	$templates[] = "{$slug}.php";
@@ -193,7 +193,7 @@ 
  * @param bool $echo Default to echo and not return the form.
  * @return string|void String when $echo is false.
  */
-function get_search_form( $echo = true ) {
+function get_search_form($echo = true) {
 	/**
 	 * Fires before the search form is retrieved, at the start of get_search_form().
 	 *
@@ -202,9 +202,9 @@ 
 	 *
 	 * @link https://core.trac.wordpress.org/ticket/19321
 	 */
-	do_action( 'pre_get_search_form' );
+	do_action('pre_get_search_form');
 
-	$format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
+	$format = current_theme_supports('html5', 'search-form') ? 'html5' : 'xhtml';
 
 	/**
 	 * Filter the HTML format of the search form.
@@ -214,28 +214,28 @@ 
 	 * @param string $format The type of markup to use in the search form.
 	 *                       Accepts 'html5', 'xhtml'.
 	 */
-	$format = apply_filters( 'search_form_format', $format );
+	$format = apply_filters('search_form_format', $format);
 
-	$search_form_template = locate_template( 'searchform.php' );
-	if ( '' != $search_form_template ) {
+	$search_form_template = locate_template('searchform.php');
+	if ('' != $search_form_template) {
 		ob_start();
-		require( $search_form_template );
+		require($search_form_template);
 		$form = ob_get_clean();
 	} else {
-		if ( 'html5' == $format ) {
-			$form = '<form role="search" method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
+		if ('html5' == $format) {
+			$form = '<form role="search" method="get" class="search-form" action="'.esc_url(home_url('/')).'">
 				<label>
-					<span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
-					<input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" title="' . esc_attr_x( 'Search for:', 'label' ) . '" />
+					<span class="screen-reader-text">' . _x('Search for:', 'label').'</span>
+					<input type="search" class="search-field" placeholder="' . esc_attr_x('Search &hellip;', 'placeholder').'" value="'.get_search_query().'" name="s" title="'.esc_attr_x('Search for:', 'label').'" />
 				</label>
-				<input type="submit" class="search-submit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+				<input type="submit" class="search-submit" value="'. esc_attr_x('Search', 'submit button').'" />
 			</form>';
 		} else {
-			$form = '<form role="search" method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
+			$form = '<form role="search" method="get" id="searchform" class="searchform" action="'.esc_url(home_url('/')).'">
 				<div>
-					<label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
-					<input type="text" value="' . get_search_query() . '" name="s" id="s" />
-					<input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+					<label class="screen-reader-text" for="s">' . _x('Search for:', 'label').'</label>
+					<input type="text" value="' . get_search_query().'" name="s" id="s" />
+					<input type="submit" id="searchsubmit" value="'. esc_attr_x('Search', 'submit button').'" />
 				</div>
 			</form>';
 		}
@@ -248,12 +248,12 @@ 
 	 *
 	 * @param string $form The search form HTML output.
 	 */
-	$result = apply_filters( 'get_search_form', $form );
+	$result = apply_filters('get_search_form', $form);
 
-	if ( null === $result )
+	if (null === $result)
 		$result = $form;
 
-	if ( $echo )
+	if ($echo)
 		echo $result;
 	else
 		return $result;
@@ -272,12 +272,12 @@ 
  * @return string|void String when retrieving.
  */
 function wp_loginout($redirect = '', $echo = true) {
-	if ( ! is_user_logged_in() )
-		$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
+	if ( ! is_user_logged_in())
+		$link = '<a href="'.esc_url(wp_login_url($redirect)).'">'.__('Log in').'</a>';
 	else
-		$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+		$link = '<a href="'.esc_url(wp_logout_url($redirect)).'">'.__('Log out').'</a>';
 
-	if ( $echo ) {
+	if ($echo) {
 		/**
 		 * Filter the HTML output for the Log In/Log Out link.
 		 *
@@ -285,10 +285,10 @@ 
 		 *
 		 * @param string $link The HTML link content.
 		 */
-		echo apply_filters( 'loginout', $link );
+		echo apply_filters('loginout', $link);
 	} else {
 		/** This filter is documented in wp-includes/general-template.php */
-		return apply_filters( 'loginout', $link );
+		return apply_filters('loginout', $link);
 	}
 }
 
@@ -303,13 +303,13 @@ 
  * @return string A log out URL.
  */
 function wp_logout_url($redirect = '') {
-	$args = array( 'action' => 'logout' );
-	if ( !empty($redirect) ) {
-		$args['redirect_to'] = urlencode( $redirect );
+	$args = array('action' => 'logout');
+	if ( ! empty($redirect)) {
+		$args['redirect_to'] = urlencode($redirect);
 	}
 
 	$logout_url = add_query_arg($args, site_url('wp-login.php', 'login'));
-	$logout_url = wp_nonce_url( $logout_url, 'log-out' );
+	$logout_url = wp_nonce_url($logout_url, 'log-out');
 
 	/**
 	 * Filter the logout URL.
@@ -319,7 +319,7 @@ 
 	 * @param string $logout_url The Log Out URL.
 	 * @param string $redirect   Path to redirect to on logout.
 	 */
-	return apply_filters( 'logout_url', $logout_url, $redirect );
+	return apply_filters('logout_url', $logout_url, $redirect);
 }
 
 /**
@@ -334,10 +334,10 @@ 
 function wp_login_url($redirect = '', $force_reauth = false) {
 	$login_url = site_url('wp-login.php', 'login');
 
-	if ( !empty($redirect) )
+	if ( ! empty($redirect))
 		$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
 
-	if ( $force_reauth )
+	if ($force_reauth)
 		$login_url = add_query_arg('reauth', '1', $login_url);
 
 	/**
@@ -350,7 +350,7 @@ 
 	 * @param string $redirect     The path to redirect to on login, if supplied.
 	 * @param bool   $force_reauth Whether to force reauthorization, even if a cookie is present.
 	 */
-	return apply_filters( 'login_url', $login_url, $redirect, $force_reauth );
+	return apply_filters('login_url', $login_url, $redirect, $force_reauth);
 }
 
 /**
@@ -368,7 +368,7 @@ 
 	 *
 	 * @param string $register The user registration URL.
 	 */
-	return apply_filters( 'register_url', site_url( 'wp-login.php?action=register', 'login' ) );
+	return apply_filters('register_url', site_url('wp-login.php?action=register', 'login'));
 }
 
 /**
@@ -380,15 +380,15 @@ 
  * @param array $args Configuration options to modify the form output.
  * @return string|void String when retrieving.
  */
-function wp_login_form( $args = array() ) {
+function wp_login_form($args = array()) {
 	$defaults = array(
 		'echo' => true,
-		'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], // Default redirect is back to the current page
+		'redirect' => (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], // Default redirect is back to the current page
 		'form_id' => 'loginform',
-		'label_username' => __( 'Username' ),
-		'label_password' => __( 'Password' ),
-		'label_remember' => __( 'Remember Me' ),
-		'label_log_in' => __( 'Log In' ),
+		'label_username' => __('Username'),
+		'label_password' => __('Password'),
+		'label_remember' => __('Remember Me'),
+		'label_log_in' => __('Log In'),
 		'id_username' => 'user_login',
 		'id_password' => 'user_pass',
 		'id_remember' => 'rememberme',
@@ -407,7 +407,7 @@ 
 	 *
 	 * @param array $defaults An array of default login form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('login_form_defaults', $defaults));
 
 	/**
 	 * Filter content to display at the top of the login form.
@@ -419,7 +419,7 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_top = apply_filters( 'login_form_top', '', $args );
+	$login_form_top = apply_filters('login_form_top', '', $args);
 
 	/**
 	 * Filter content to display in the middle of the login form.
@@ -432,7 +432,7 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_middle = apply_filters( 'login_form_middle', '', $args );
+	$login_form_middle = apply_filters('login_form_middle', '', $args);
 
 	/**
 	 * Filter content to display at the bottom of the login form.
@@ -444,29 +444,29 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_bottom = apply_filters( 'login_form_bottom', '', $args );
+	$login_form_bottom = apply_filters('login_form_bottom', '', $args);
 
 	$form = '
-		<form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( site_url( 'wp-login.php', 'login_post' ) ) . '" method="post">
-			' . $login_form_top . '
+		<form name="' . $args['form_id'].'" id="'.$args['form_id'].'" action="'.esc_url(site_url('wp-login.php', 'login_post')).'" method="post">
+			' . $login_form_top.'
 			<p class="login-username">
-				<label for="' . esc_attr( $args['id_username'] ) . '">' . esc_html( $args['label_username'] ) . '</label>
-				<input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20" />
+				<label for="' . esc_attr($args['id_username']).'">'.esc_html($args['label_username']).'</label>
+				<input type="text" name="log" id="' . esc_attr($args['id_username']).'" class="input" value="'.esc_attr($args['value_username']).'" size="20" />
 			</p>
 			<p class="login-password">
-				<label for="' . esc_attr( $args['id_password'] ) . '">' . esc_html( $args['label_password'] ) . '</label>
-				<input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
+				<label for="' . esc_attr($args['id_password']).'">'.esc_html($args['label_password']).'</label>
+				<input type="password" name="pwd" id="' . esc_attr($args['id_password']).'" class="input" value="" size="20" />
 			</p>
-			' . $login_form_middle . '
-			' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
+			' . $login_form_middle.'
+			' . ($args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="'.esc_attr($args['id_remember']).'" value="forever"'.($args['value_remember'] ? ' checked="checked"' : '').' /> '.esc_html($args['label_remember']).'</label></p>' : '').'
 			<p class="login-submit">
-				<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" />
-				<input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
+				<input type="submit" name="wp-submit" id="' . esc_attr($args['id_submit']).'" class="button-primary" value="'.esc_attr($args['label_log_in']).'" />
+				<input type="hidden" name="redirect_to" value="' . esc_url($args['redirect']).'" />
 			</p>
-			' . $login_form_bottom . '
+			' . $login_form_bottom.'
 		</form>';
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $form;
 	else
 		return $form;
@@ -480,13 +480,13 @@ 
  * @param string $redirect Path to redirect to on login.
  * @return string Lost password URL.
  */
-function wp_lostpassword_url( $redirect = '' ) {
-	$args = array( 'action' => 'lostpassword' );
-	if ( !empty($redirect) ) {
+function wp_lostpassword_url($redirect = '') {
+	$args = array('action' => 'lostpassword');
+	if ( ! empty($redirect)) {
 		$args['redirect_to'] = $redirect;
 	}
 
-	$lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+	$lostpassword_url = add_query_arg($args, network_site_url('wp-login.php', 'login'));
 
 	/**
 	 * Filter the Lost Password URL.
@@ -496,7 +496,7 @@ 
 	 * @param string $lostpassword_url The lost password page URL.
 	 * @param string $redirect         The path to redirect to on login.
 	 */
-	return apply_filters( 'lostpassword_url', $lostpassword_url, $redirect );
+	return apply_filters('lostpassword_url', $lostpassword_url, $redirect);
 }
 
 /**
@@ -512,14 +512,14 @@ 
  * @param bool   $echo   Default to echo and not return the link.
  * @return string|void String when retrieving.
  */
-function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
-	if ( ! is_user_logged_in() ) {
-		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
+function wp_register($before = '<li>', $after = '</li>', $echo = true) {
+	if ( ! is_user_logged_in()) {
+		if (get_option('users_can_register'))
+			$link = $before.'<a href="'.esc_url(wp_registration_url()).'">'.__('Register').'</a>'.$after;
 		else
 			$link = '';
 	} else {
-		$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
+		$link = $before.'<a href="'.admin_url().'">'.__('Site Admin').'</a>'.$after;
 	}
 
 	/**
@@ -532,9 +532,9 @@ 
 	 *
 	 * @param string $link The HTML code for the link to the Registration or Admin page.
 	 */
-	$link = apply_filters( 'register', $link );
+	$link = apply_filters('register', $link);
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $link;
 	} else {
 		return $link;
@@ -557,7 +557,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_meta' );
+	do_action('wp_meta');
 }
 
 /**
@@ -568,8 +568,8 @@ 
  *
  * @param string $show What to display.
  */
-function bloginfo( $show='' ) {
-	echo get_bloginfo( $show, 'display' );
+function bloginfo($show = '') {
+	echo get_bloginfo($show, 'display');
 }
 
 /**
@@ -599,17 +599,17 @@ 
  * @param string $filter How to filter what is retrieved.
  * @return string Mostly string values, might be empty.
  */
-function get_bloginfo( $show = '', $filter = 'raw' ) {
-	switch( $show ) {
+function get_bloginfo($show = '', $filter = 'raw') {
+	switch ($show) {
 		case 'home' : // DEPRECATED
 		case 'siteurl' : // DEPRECATED
-			_deprecated_argument( __FUNCTION__, '2.2', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2', sprintf(
 				/* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
-				__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
-				'<code>' . $show . '</code>',
+				__('The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.'),
+				'<code>'.$show.'</code>',
 				'<code>bloginfo()</code>',
 				'<code>url</code>'
-			) );
+			));
 		case 'url' :
 			$output = home_url();
 			break;
@@ -638,7 +638,7 @@ 
 			$output = get_feed_link('comments_rss2');
 			break;
 		case 'pingback_url':
-			$output = site_url( 'xmlrpc.php' );
+			$output = site_url('xmlrpc.php');
 			break;
 		case 'stylesheet_url':
 			$output = get_stylesheet_uri();
@@ -669,14 +669,14 @@ 
 			$output = str_replace('_', '-', $output);
 			break;
 		case 'text_direction':
-			_deprecated_argument( __FUNCTION__, '2.2', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2', sprintf(
 				/* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
-				__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
-				'<code>' . $show . '</code>',
+				__('The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.'),
+				'<code>'.$show.'</code>',
 				'<code>bloginfo()</code>',
 				'<code>is_rtl()</code>'
-			) );
-			if ( function_exists( 'is_rtl' ) ) {
+			));
+			if (function_exists('is_rtl')) {
 				$output = is_rtl() ? 'rtl' : 'ltr';
 			} else {
 				$output = 'ltr';
@@ -694,8 +694,8 @@ 
 		strpos($show, 'home') === false)
 		$url = false;
 
-	if ( 'display' == $filter ) {
-		if ( $url ) {
+	if ('display' == $filter) {
+		if ($url) {
 			/**
 			 * Filter the URL returned by get_bloginfo().
 			 *
@@ -704,7 +704,7 @@ 
 			 * @param mixed $output The URL returned by bloginfo().
 			 * @param mixed $show   Type of information requested.
 			 */
-			$output = apply_filters( 'bloginfo_url', $output, $show );
+			$output = apply_filters('bloginfo_url', $output, $show);
 		} else {
 			/**
 			 * Filter the site information returned by get_bloginfo().
@@ -714,7 +714,7 @@ 
 			 * @param mixed $output The requested non-URL site information.
 			 * @param mixed $show   Type of information requested.
 			 */
-			$output = apply_filters( 'bloginfo', $output, $show );
+			$output = apply_filters('bloginfo', $output, $show);
 		}
 	}
 
@@ -729,21 +729,21 @@ 
  * @param  int    $blog_id Id of the blog to get the site icon for.
  * @return string          Site Icon URL.
  */
-function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-	if ( $blog_id && is_multisite() ) {
-		$site_icon_id = get_blog_option( $blog_id, 'site_icon' );
+function get_site_icon_url($size = 512, $url = '', $blog_id = 0) {
+	if ($blog_id && is_multisite()) {
+		$site_icon_id = get_blog_option($blog_id, 'site_icon');
 	} else {
-		$site_icon_id = get_option( 'site_icon' );
+		$site_icon_id = get_option('site_icon');
 	}
 
-	if ( $site_icon_id ) {
-		if ( $size >= 512 ) {
+	if ($site_icon_id) {
+		if ($size >= 512) {
 			$size_data = 'full';
 		} else {
-			$size_data = array( $size, $size );
+			$size_data = array($size, $size);
 		}
-		$url_data = wp_get_attachment_image_src( $site_icon_id, $size_data );
-		if ( $url_data ) {
+		$url_data = wp_get_attachment_image_src($site_icon_id, $size_data);
+		if ($url_data) {
 			$url = $url_data[0];
 		}
 	}
@@ -758,8 +758,8 @@ 
  * @param  string $url     Fallback url if no site icon is found.
  * @param  int    $blog_id Id of the blog to get the site icon for.
  */
-function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-	echo esc_url( get_site_icon_url( $size, $url, $blog_id ) );
+function site_icon_url($size = 512, $url = '', $blog_id = 0) {
+	echo esc_url(get_site_icon_url($size, $url, $blog_id));
 }
 
 /**
@@ -768,8 +768,8 @@ 
  * @param int $blog_id Optional. Blog ID. Default: Current blog.
  * @return bool
  */
-function has_site_icon( $blog_id = 0 ) {
-	return (bool) get_site_icon_url( 512, '', $blog_id );
+function has_site_icon($blog_id = 0) {
+	return (bool) get_site_icon_url(512, '', $blog_id);
 }
 
 /**
@@ -782,16 +782,16 @@ 
  * @see wp_title()
  */
 function _wp_render_title_tag() {
-	if ( ! current_theme_supports( 'title-tag' ) ) {
+	if ( ! current_theme_supports('title-tag')) {
 		return;
 	}
 
 	// This can only work internally on wp_head.
-	if ( ! did_action( 'wp_head' ) && ! doing_action( 'wp_head' ) ) {
+	if ( ! did_action('wp_head') && ! doing_action('wp_head')) {
 		return;
 	}
 
-	echo '<title>' . wp_title( '|', false, 'right' ) . "</title>\n";
+	echo '<title>'.wp_title('|', false, 'right')."</title>\n";
 }
 
 /**
@@ -820,7 +820,7 @@ 
  * @param string $seplocation Optional. Direction to display title, 'right'.
  * @return string|void String on retrieve.
  */
-function wp_title( $sep = '&raquo;', $display = true, $seplocation = '' ) {
+function wp_title($sep = '&raquo;', $display = true, $seplocation = '') {
 	global $wp_locale, $page, $paged;
 
 	$m = get_query_var('m');
@@ -833,75 +833,75 @@ 
 	$t_sep = '%WP_TITILE_SEP%'; // Temporary separator, for accurate flipping, if necessary
 
 	// If there is a post
-	if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) {
-		$title = single_post_title( '', false );
+	if (is_single() || (is_home() && ! is_front_page()) || (is_page() && ! is_front_page())) {
+		$title = single_post_title('', false);
 	}
 
 	// If there's a post type archive
-	if ( is_post_type_archive() ) {
-		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
-		$post_type_object = get_post_type_object( $post_type );
-		if ( ! $post_type_object->has_archive )
-			$title = post_type_archive_title( '', false );
+	if (is_post_type_archive()) {
+		$post_type = get_query_var('post_type');
+		if (is_array($post_type))
+			$post_type = reset($post_type);
+		$post_type_object = get_post_type_object($post_type);
+		if ( ! $post_type_object->has_archive)
+			$title = post_type_archive_title('', false);
 	}
 
 	// If there's a category or tag
-	if ( is_category() || is_tag() ) {
-		$title = single_term_title( '', false );
+	if (is_category() || is_tag()) {
+		$title = single_term_title('', false);
 	}
 
 	// If there's a taxonomy
-	if ( is_tax() ) {
+	if (is_tax()) {
 		$term = get_queried_object();
-		if ( $term ) {
-			$tax = get_taxonomy( $term->taxonomy );
-			$title = single_term_title( $tax->labels->name . $t_sep, false );
+		if ($term) {
+			$tax = get_taxonomy($term->taxonomy);
+			$title = single_term_title($tax->labels->name.$t_sep, false);
 		}
 	}
 
 	// If there's an author
-	if ( is_author() && ! is_post_type_archive() ) {
+	if (is_author() && ! is_post_type_archive()) {
 		$author = get_queried_object();
-		if ( $author )
+		if ($author)
 			$title = $author->display_name;
 	}
 
 	// Post type archives with has_archive should override terms.
-	if ( is_post_type_archive() && $post_type_object->has_archive )
-		$title = post_type_archive_title( '', false );
+	if (is_post_type_archive() && $post_type_object->has_archive)
+		$title = post_type_archive_title('', false);
 
 	// If there's a month
-	if ( is_archive() && !empty($m) ) {
+	if (is_archive() && ! empty($m)) {
 		$my_year = substr($m, 0, 4);
 		$my_month = $wp_locale->get_month(substr($m, 4, 2));
 		$my_day = intval(substr($m, 6, 2));
-		$title = $my_year . ( $my_month ? $t_sep . $my_month : '' ) . ( $my_day ? $t_sep . $my_day : '' );
+		$title = $my_year.($my_month ? $t_sep.$my_month : '').($my_day ? $t_sep.$my_day : '');
 	}
 
 	// If there's a year
-	if ( is_archive() && !empty($year) ) {
+	if (is_archive() && ! empty($year)) {
 		$title = $year;
-		if ( !empty($monthnum) )
-			$title .= $t_sep . $wp_locale->get_month($monthnum);
-		if ( !empty($day) )
-			$title .= $t_sep . zeroise($day, 2);
+		if ( ! empty($monthnum))
+			$title .= $t_sep.$wp_locale->get_month($monthnum);
+		if ( ! empty($day))
+			$title .= $t_sep.zeroise($day, 2);
 	}
 
 	// If it's a search
-	if ( is_search() ) {
+	if (is_search()) {
 		/* translators: 1: separator, 2: search phrase */
 		$title = sprintf(__('Search Results %1$s %2$s'), $t_sep, strip_tags($search));
 	}
 
 	// If it's a 404 page
-	if ( is_404() ) {
+	if (is_404()) {
 		$title = __('Page not found');
 	}
 
 	$prefix = '';
-	if ( !empty($title) )
+	if ( ! empty($title))
 		$prefix = " $sep ";
 
 	/**
@@ -911,26 +911,26 @@ 
 	 *
 	 * @param array $title_array Parts of the page title.
 	 */
-	$title_array = apply_filters( 'wp_title_parts', explode( $t_sep, $title ) );
+	$title_array = apply_filters('wp_title_parts', explode($t_sep, $title));
 
  	// Determines position of the separator and direction of the breadcrumb
-	if ( 'right' == $seplocation ) { // sep on right, so reverse the order
-		$title_array = array_reverse( $title_array );
-		$title = implode( " $sep ", $title_array ) . $prefix;
+	if ('right' == $seplocation) { // sep on right, so reverse the order
+		$title_array = array_reverse($title_array);
+		$title = implode(" $sep ", $title_array).$prefix;
 	} else {
-		$title = $prefix . implode( " $sep ", $title_array );
+		$title = $prefix.implode(" $sep ", $title_array);
 	}
 
-	if ( current_theme_supports( 'title-tag' ) && ! is_feed() ) {
-		$title .= get_bloginfo( 'name', 'display' );
+	if (current_theme_supports('title-tag') && ! is_feed()) {
+		$title .= get_bloginfo('name', 'display');
 
-		$site_description = get_bloginfo( 'description', 'display' );
-		if ( $site_description && ( is_home() || is_front_page() ) ) {
+		$site_description = get_bloginfo('description', 'display');
+		if ($site_description && (is_home() || is_front_page())) {
 			$title .= " $sep $site_description";
 		}
 
-		if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
-			$title .= " $sep " . sprintf( __( 'Page %s' ), max( $paged, $page ) );
+		if (($paged >= 2 || $page >= 2) && ! is_404()) {
+			$title .= " $sep ".sprintf(__('Page %s'), max($paged, $page));
 		}
 	}
 
@@ -943,10 +943,10 @@ 
 	 * @param string $sep         Title separator.
 	 * @param string $seplocation Location of the separator (left or right).
 	 */
-	$title = apply_filters( 'wp_title', $title, $sep, $seplocation );
+	$title = apply_filters('wp_title', $title, $sep, $seplocation);
 
 	// Send it out
-	if ( $display )
+	if ($display)
 		echo $title;
 	else
 		return $title;
@@ -969,10 +969,10 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_post_title( $prefix = '', $display = true ) {
+function single_post_title($prefix = '', $display = true) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
+	if ( ! isset($_post->post_title))
 		return;
 
 	/**
@@ -983,11 +983,11 @@ 
 	 * @param string $_post_title The single post page title.
 	 * @param object $_post       The current queried object as returned by get_queried_object().
 	 */
-	$title = apply_filters( 'single_post_title', $_post->post_title, $_post );
-	if ( $display )
-		echo $prefix . $title;
+	$title = apply_filters('single_post_title', $_post->post_title, $_post);
+	if ($display)
+		echo $prefix.$title;
 	else
-		return $prefix . $title;
+		return $prefix.$title;
 }
 
 /**
@@ -1002,15 +1002,15 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving, null when displaying or failure.
  */
-function post_type_archive_title( $prefix = '', $display = true ) {
-	if ( ! is_post_type_archive() )
+function post_type_archive_title($prefix = '', $display = true) {
+	if ( ! is_post_type_archive())
 		return;
 
-	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	$post_type = get_query_var('post_type');
+	if (is_array($post_type))
+		$post_type = reset($post_type);
 
-	$post_type_obj = get_post_type_object( $post_type );
+	$post_type_obj = get_post_type_object($post_type);
 
 	/**
 	 * Filter the post type archive title.
@@ -1020,12 +1020,12 @@ 
 	 * @param string $post_type_name Post type 'name' label.
 	 * @param string $post_type      Post type.
 	 */
-	$title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type );
+	$title = apply_filters('post_type_archive_title', $post_type_obj->labels->name, $post_type);
 
-	if ( $display )
-		echo $prefix . $title;
+	if ($display)
+		echo $prefix.$title;
 	else
-		return $prefix . $title;
+		return $prefix.$title;
 }
 
 /**
@@ -1045,8 +1045,8 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_cat_title( $prefix = '', $display = true ) {
-	return single_term_title( $prefix, $display );
+function single_cat_title($prefix = '', $display = true) {
+	return single_term_title($prefix, $display);
 }
 
 /**
@@ -1066,8 +1066,8 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_tag_title( $prefix = '', $display = true ) {
-	return single_term_title( $prefix, $display );
+function single_tag_title($prefix = '', $display = true) {
+	return single_term_title($prefix, $display);
 }
 
 /**
@@ -1087,13 +1087,13 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_term_title( $prefix = '', $display = true ) {
+function single_term_title($prefix = '', $display = true) {
 	$term = get_queried_object();
 
-	if ( !$term )
+	if ( ! $term)
 		return;
 
-	if ( is_category() ) {
+	if (is_category()) {
 		/**
 		 * Filter the category archive page title.
 		 *
@@ -1101,8 +1101,8 @@ 
 		 *
 		 * @param string $term_name Category name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_cat_title', $term->name );
-	} elseif ( is_tag() ) {
+		$term_name = apply_filters('single_cat_title', $term->name);
+	} elseif (is_tag()) {
 		/**
 		 * Filter the tag archive page title.
 		 *
@@ -1110,8 +1110,8 @@ 
 		 *
 		 * @param string $term_name Tag name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_tag_title', $term->name );
-	} elseif ( is_tax() ) {
+		$term_name = apply_filters('single_tag_title', $term->name);
+	} elseif (is_tax()) {
 		/**
 		 * Filter the custom taxonomy archive page title.
 		 *
@@ -1119,18 +1119,18 @@ 
 		 *
 		 * @param string $term_name Term name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_term_title', $term->name );
+		$term_name = apply_filters('single_term_title', $term->name);
 	} else {
 		return;
 	}
 
-	if ( empty( $term_name ) )
+	if (empty($term_name))
 		return;
 
-	if ( $display )
-		echo $prefix . $term_name;
+	if ($display)
+		echo $prefix.$term_name;
 	else
-		return $prefix . $term_name;
+		return $prefix.$term_name;
 }
 
 /**
@@ -1153,27 +1153,27 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_month_title($prefix = '', $display = true ) {
+function single_month_title($prefix = '', $display = true) {
 	global $wp_locale;
 
 	$m = get_query_var('m');
 	$year = get_query_var('year');
 	$monthnum = get_query_var('monthnum');
 
-	if ( !empty($monthnum) && !empty($year) ) {
+	if ( ! empty($monthnum) && ! empty($year)) {
 		$my_year = $year;
 		$my_month = $wp_locale->get_month($monthnum);
-	} elseif ( !empty($m) ) {
+	} elseif ( ! empty($m)) {
 		$my_year = substr($m, 0, 4);
 		$my_month = $wp_locale->get_month(substr($m, 4, 2));
 	}
 
-	if ( empty($my_month) )
+	if (empty($my_month))
 		return false;
 
-	$result = $prefix . $my_month . $prefix . $my_year;
+	$result = $prefix.$my_month.$prefix.$my_year;
 
-	if ( !$display )
+	if ( ! $display)
 		return $result;
 	echo $result;
 }
@@ -1188,11 +1188,11 @@ 
  * @param string $before Optional. Content to prepend to the title. Default empty.
  * @param string $after  Optional. Content to append to the title. Default empty.
  */
-function the_archive_title( $before = '', $after = '' ) {
+function the_archive_title($before = '', $after = '') {
 	$title = get_the_archive_title();
 
-	if ( ! empty( $title ) ) {
-		echo $before . $title . $after;
+	if ( ! empty($title)) {
+		echo $before.$title.$after;
 	}
 }
 
@@ -1204,46 +1204,46 @@ 
  * @return string Archive title.
  */
 function get_the_archive_title() {
-	if ( is_category() ) {
-		$title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
-	} elseif ( is_tag() ) {
-		$title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
-	} elseif ( is_author() ) {
-		$title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
-	} elseif ( is_year() ) {
-		$title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
-	} elseif ( is_month() ) {
-		$title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
-	} elseif ( is_day() ) {
-		$title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
-	} elseif ( is_tax( 'post_format' ) ) {
-		if ( is_tax( 'post_format', 'post-format-aside' ) ) {
-			$title = _x( 'Asides', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) {
-			$title = _x( 'Galleries', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-image' ) ) {
-			$title = _x( 'Images', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-video' ) ) {
-			$title = _x( 'Videos', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-quote' ) ) {
-			$title = _x( 'Quotes', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-link' ) ) {
-			$title = _x( 'Links', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-status' ) ) {
-			$title = _x( 'Statuses', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-audio' ) ) {
-			$title = _x( 'Audio', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-chat' ) ) {
-			$title = _x( 'Chats', 'post format archive title' );
+	if (is_category()) {
+		$title = sprintf(__('Category: %s'), single_cat_title('', false));
+	} elseif (is_tag()) {
+		$title = sprintf(__('Tag: %s'), single_tag_title('', false));
+	} elseif (is_author()) {
+		$title = sprintf(__('Author: %s'), '<span class="vcard">'.get_the_author().'</span>');
+	} elseif (is_year()) {
+		$title = sprintf(__('Year: %s'), get_the_date(_x('Y', 'yearly archives date format')));
+	} elseif (is_month()) {
+		$title = sprintf(__('Month: %s'), get_the_date(_x('F Y', 'monthly archives date format')));
+	} elseif (is_day()) {
+		$title = sprintf(__('Day: %s'), get_the_date(_x('F j, Y', 'daily archives date format')));
+	} elseif (is_tax('post_format')) {
+		if (is_tax('post_format', 'post-format-aside')) {
+			$title = _x('Asides', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-gallery')) {
+			$title = _x('Galleries', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-image')) {
+			$title = _x('Images', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-video')) {
+			$title = _x('Videos', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-quote')) {
+			$title = _x('Quotes', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-link')) {
+			$title = _x('Links', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-status')) {
+			$title = _x('Statuses', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-audio')) {
+			$title = _x('Audio', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-chat')) {
+			$title = _x('Chats', 'post format archive title');
 		}
-	} elseif ( is_post_type_archive() ) {
-		$title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
-	} elseif ( is_tax() ) {
-		$tax = get_taxonomy( get_queried_object()->taxonomy );
+	} elseif (is_post_type_archive()) {
+		$title = sprintf(__('Archives: %s'), post_type_archive_title('', false));
+	} elseif (is_tax()) {
+		$tax = get_taxonomy(get_queried_object()->taxonomy);
 		/* translators: 1: Taxonomy singular name, 2: Current taxonomy term */
-		$title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
+		$title = sprintf(__('%1$s: %2$s'), $tax->labels->singular_name, single_term_title('', false));
 	} else {
-		$title = __( 'Archives' );
+		$title = __('Archives');
 	}
 
 	/**
@@ -1253,7 +1253,7 @@ 
 	 *
 	 * @param string $title Archive title to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_title', $title );
+	return apply_filters('get_the_archive_title', $title);
 }
 
 /**
@@ -1266,10 +1266,10 @@ 
  * @param string $before Optional. Content to prepend to the description. Default empty.
  * @param string $after  Optional. Content to append to the description. Default empty.
  */
-function the_archive_description( $before = '', $after = '' ) {
+function the_archive_description($before = '', $after = '') {
 	$description = get_the_archive_description();
-	if ( $description ) {
-		echo $before . $description . $after;
+	if ($description) {
+		echo $before.$description.$after;
 	}
 }
 
@@ -1290,7 +1290,7 @@ 
 	 *
 	 * @param string $description Archive description to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_description', term_description() );
+	return apply_filters('get_the_archive_description', term_description());
 }
 
 /**
@@ -1333,7 +1333,7 @@ 
 	$url = esc_url($url);
 
 	if ('link' == $format)
-		$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
+		$link_html = "\t<link rel='archives' title='".esc_attr($text)."' href='$url' />\n";
 	elseif ('option' == $format)
 		$link_html = "\t<option value='$url'>$before $text $after</option>\n";
 	elseif ('html' == $format)
@@ -1348,7 +1348,7 @@ 
 	 *
 	 * @param string $link_html The archive HTML link content.
 	 */
-	return apply_filters( 'get_archives_link', $link_html );
+	return apply_filters('get_archives_link', $link_html);
 }
 
 /**
@@ -1384,7 +1384,7 @@ 
  * }
  * @return string|void String when retrieving.
  */
-function wp_get_archives( $args = '' ) {
+function wp_get_archives($args = '') {
 	global $wpdb, $wp_locale;
 
 	$defaults = array(
@@ -1394,19 +1394,19 @@ 
 		'echo' => 1, 'order' => 'DESC',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	if ( '' == $r['type'] ) {
+	if ('' == $r['type']) {
 		$r['type'] = 'monthly';
 	}
 
-	if ( ! empty( $r['limit'] ) ) {
-		$r['limit'] = absint( $r['limit'] );
-		$r['limit'] = ' LIMIT ' . $r['limit'];
+	if ( ! empty($r['limit'])) {
+		$r['limit'] = absint($r['limit']);
+		$r['limit'] = ' LIMIT '.$r['limit'];
 	}
 
-	$order = strtoupper( $r['order'] );
-	if ( $order !== 'ASC' ) {
+	$order = strtoupper($r['order']);
+	if ($order !== 'ASC') {
 		$order = 'DESC';
 	}
 
@@ -1421,12 +1421,12 @@ 
 
 	// options for weekly archive (only if you over-ride the general date format)
 	$archive_week_start_date_format = 'Y/m/d';
-	$archive_week_end_date_format	= 'Y/m/d';
+	$archive_week_end_date_format = 'Y/m/d';
 
-	if ( ! $archive_date_format_over_ride ) {
-		$archive_day_date_format = get_option( 'date_format' );
-		$archive_week_start_date_format = get_option( 'date_format' );
-		$archive_week_end_date_format = get_option( 'date_format' );
+	if ( ! $archive_date_format_over_ride) {
+		$archive_day_date_format = get_option('date_format');
+		$archive_week_start_date_format = get_option('date_format');
+		$archive_week_end_date_format = get_option('date_format');
 	}
 
 	/**
@@ -1437,7 +1437,7 @@ 
 	 * @param string $sql_where Portion of SQL query containing the WHERE clause.
 	 * @param array  $r         An array of default arguments.
 	 */
-	$where = apply_filters( 'getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
+	$where = apply_filters('getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r);
 
 	/**
 	 * Filter the SQL JOIN clause for retrieving archives.
@@ -1447,130 +1447,130 @@ 
 	 * @param string $sql_join Portion of SQL query containing JOIN clause.
 	 * @param array  $r        An array of default arguments.
 	 */
-	$join = apply_filters( 'getarchives_join', '', $r );
+	$join = apply_filters('getarchives_join', '', $r);
 
 	$output = '';
 
-	$last_changed = wp_cache_get( 'last_changed', 'posts' );
-	if ( ! $last_changed ) {
+	$last_changed = wp_cache_get('last_changed', 'posts');
+	if ( ! $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, 'posts' );
+		wp_cache_set('last_changed', $last_changed, 'posts');
 	}
 
 	$limit = $r['limit'];
 
-	if ( 'monthly' == $r['type'] ) {
+	if ('monthly' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				$url = get_month_link( $result->year, $result->month );
+			foreach ((array) $results as $result) {
+				$url = get_month_link($result->year, $result->month);
 				/* translators: 1: month name, 2: 4-digit year */
-				$text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'yearly' == $r['type'] ) {
+	} elseif ('yearly' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result) {
-				$url = get_year_link( $result->year );
-				$text = sprintf( '%d', $result->year );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+			foreach ((array) $results as $result) {
+				$url = get_year_link($result->year);
+				$text = sprintf('%d', $result->year);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'daily' == $r['type'] ) {
+	} elseif ('daily' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				$url  = get_day_link( $result->year, $result->month, $result->dayofmonth );
-				$date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
-				$text = mysql2date( $archive_day_date_format, $date );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+			foreach ((array) $results as $result) {
+				$url  = get_day_link($result->year, $result->month, $result->dayofmonth);
+				$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
+				$text = mysql2date($archive_day_date_format, $date);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'weekly' == $r['type'] ) {
-		$week = _wp_mysql_week( '`post_date`' );
+	} elseif ('weekly' == $r['type']) {
+		$week = _wp_mysql_week('`post_date`');
 		$query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
 		$arc_w_last = '';
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				if ( $result->week != $arc_w_last ) {
+			foreach ((array) $results as $result) {
+				if ($result->week != $arc_w_last) {
 					$arc_year       = $result->yr;
 					$arc_w_last     = $result->week;
-					$arc_week       = get_weekstartend( $result->yyyymmdd, get_option( 'start_of_week' ) );
-					$arc_week_start = date_i18n( $archive_week_start_date_format, $arc_week['start'] );
-					$arc_week_end   = date_i18n( $archive_week_end_date_format, $arc_week['end'] );
-					$url            = sprintf( '%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&amp;', '=', $result->week );
-					$text           = $arc_week_start . $archive_week_separator . $arc_week_end;
-					if ( $r['show_post_count'] ) {
-						$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+					$arc_week       = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
+					$arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
+					$arc_week_end   = date_i18n($archive_week_end_date_format, $arc_week['end']);
+					$url            = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&amp;', '=', $result->week);
+					$text           = $arc_week_start.$archive_week_separator.$arc_week_end;
+					if ($r['show_post_count']) {
+						$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 					}
-					$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+					$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 				}
 			}
 		}
-	} elseif ( ( 'postbypost' == $r['type'] ) || ('alpha' == $r['type'] ) ) {
-		$orderby = ( 'alpha' == $r['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
+	} elseif (('postbypost' == $r['type']) || ('alpha' == $r['type'])) {
+		$orderby = ('alpha' == $r['type']) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
 		$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
-			foreach ( (array) $results as $result ) {
-				if ( $result->post_date != '0000-00-00 00:00:00' ) {
-					$url = get_permalink( $result );
-					if ( $result->post_title ) {
+		if ($results) {
+			foreach ((array) $results as $result) {
+				if ($result->post_date != '0000-00-00 00:00:00') {
+					$url = get_permalink($result);
+					if ($result->post_title) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$text = strip_tags( apply_filters( 'the_title', $result->post_title, $result->ID ) );
+						$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
 					} else {
 						$text = $result->ID;
 					}
-					$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+					$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 				}
 			}
 		}
 	}
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -1587,7 +1587,7 @@ 
  */
 function calendar_week_mod($num) {
 	$base = 7;
-	return ($num - $base*floor($num/$base));
+	return ($num - $base * floor($num / $base));
 }
 
 /**
@@ -1612,51 +1612,51 @@ 
 function get_calendar($initial = true, $echo = true) {
 	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
-	$key = md5( $m . $monthnum . $year );
-	if ( $cache = wp_cache_get( 'get_calendar', 'calendar' ) ) {
-		if ( is_array($cache) && isset( $cache[ $key ] ) ) {
-			if ( $echo ) {
+	$key = md5($m.$monthnum.$year);
+	if ($cache = wp_cache_get('get_calendar', 'calendar')) {
+		if (is_array($cache) && isset($cache[$key])) {
+			if ($echo) {
 				/** This filter is documented in wp-includes/general-template.php */
-				echo apply_filters( 'get_calendar', $cache[$key] );
+				echo apply_filters('get_calendar', $cache[$key]);
 				return;
 			} else {
 				/** This filter is documented in wp-includes/general-template.php */
-				return apply_filters( 'get_calendar', $cache[$key] );
+				return apply_filters('get_calendar', $cache[$key]);
 			}
 		}
 	}
 
-	if ( !is_array($cache) )
+	if ( ! is_array($cache))
 		$cache = array();
 
 	// Quick check. If we have no posts at all, abort!
-	if ( !$posts ) {
+	if ( ! $posts) {
 		$gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
-		if ( !$gotsome ) {
-			$cache[ $key ] = '';
-			wp_cache_set( 'get_calendar', $cache, 'calendar' );
+		if ( ! $gotsome) {
+			$cache[$key] = '';
+			wp_cache_set('get_calendar', $cache, 'calendar');
 			return;
 		}
 	}
 
-	if ( isset($_GET['w']) )
+	if (isset($_GET['w']))
 		$w = ''.intval($_GET['w']);
 
 	// week_begins = 0 stands for Sunday
 	$week_begins = intval(get_option('start_of_week'));
 
 	// Let's figure out when we are
-	if ( !empty($monthnum) && !empty($year) ) {
+	if ( ! empty($monthnum) && ! empty($year)) {
 		$thismonth = ''.zeroise(intval($monthnum), 2);
 		$thisyear = ''.intval($year);
-	} elseif ( !empty($w) ) {
+	} elseif ( ! empty($w)) {
 		// We need to get the month from MySQL
 		$thisyear = ''.intval(substr($m, 0, 4));
 		$d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
 		$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
-	} elseif ( !empty($m) ) {
+	} elseif ( ! empty($m)) {
 		$thisyear = ''.intval(substr($m, 0, 4));
-		if ( strlen($m) < 6 )
+		if (strlen($m) < 6)
 				$thismonth = '01';
 		else
 				$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
@@ -1665,7 +1665,7 @@ 
 		$thismonth = gmdate('m', current_time('timestamp'));
 	}
 
-	$unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear);
+	$unixmonth = mktime(0, 0, 0, $thismonth, 1, $thisyear);
 	$last_day = date('t', $unixmonth);
 
 	// Get the next and previous month and year with at least one post
@@ -1685,17 +1685,17 @@ 
 	/* translators: Calendar caption: 1: month name, 2: 4-digit year */
 	$calendar_caption = _x('%1$s %2$s', 'calendar caption');
 	$calendar_output = '<table id="wp-calendar">
-	<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
+	<caption>' . sprintf($calendar_caption, $wp_locale->get_month($thismonth), date('Y', $unixmonth)).'</caption>
 	<thead>
 	<tr>';
 
 	$myweek = array();
 
-	for ( $wdcount=0; $wdcount<=6; $wdcount++ ) {
-		$myweek[] = $wp_locale->get_weekday(($wdcount+$week_begins)%7);
+	for ($wdcount = 0; $wdcount <= 6; $wdcount++) {
+		$myweek[] = $wp_locale->get_weekday(($wdcount + $week_begins) % 7);
 	}
 
-	foreach ( $myweek as $wd ) {
+	foreach ($myweek as $wd) {
 		$day_name = $initial ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
 		$wd = esc_attr($wd);
 		$calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";
@@ -1708,16 +1708,16 @@ 
 	<tfoot>
 	<tr>';
 
-	if ( $previous ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link($previous->year, $previous->month) . '">&laquo; ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
+	if ($previous) {
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="'.get_month_link($previous->year, $previous->month).'">&laquo; '.$wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)).'</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
 	}
 
 	$calendar_output .= "\n\t\t".'<td class="pad">&nbsp;</td>';
 
-	if ( $next ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link($next->year, $next->month) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' &raquo;</a></td>';
+	if ($next) {
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="'.get_month_link($next->year, $next->month).'">'.$wp_locale->get_month_abbrev($wp_locale->get_month($next->month)).' &raquo;</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
 	}
@@ -1736,8 +1736,8 @@ 
 		FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
 		AND post_type = 'post' AND post_status = 'publish'
 		AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
-	if ( $dayswithposts ) {
-		foreach ( (array) $dayswithposts as $daywith ) {
+	if ($dayswithposts) {
+		foreach ((array) $dayswithposts as $daywith) {
 			$daywithpost[] = $daywith[0];
 		}
 	}
@@ -1754,57 +1754,57 @@ 
 		."AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59' "
 		."AND post_type = 'post' AND post_status = 'publish'"
 	);
-	if ( $ak_post_titles ) {
-		foreach ( (array) $ak_post_titles as $ak_post_title ) {
+	if ($ak_post_titles) {
+		foreach ((array) $ak_post_titles as $ak_post_title) {
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title, $ak_post_title->ID ) );
+				$post_title = esc_attr(apply_filters('the_title', $ak_post_title->post_title, $ak_post_title->ID));
 
-				if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
+				if (empty($ak_titles_for_day['day_'.$ak_post_title->dom]))
 					$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
-				if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
+				if (empty($ak_titles_for_day["$ak_post_title->dom"])) // first one
 					$ak_titles_for_day["$ak_post_title->dom"] = $post_title;
 				else
-					$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title;
+					$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator.$post_title;
 		}
 	}
 
 	// See how much we should pad in the beginning
-	$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
-	if ( 0 != $pad )
-		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad">&nbsp;</td>';
+	$pad = calendar_week_mod(date('w', $unixmonth) - $week_begins);
+	if (0 != $pad)
+		$calendar_output .= "\n\t\t".'<td colspan="'.esc_attr($pad).'" class="pad">&nbsp;</td>';
 
 	$daysinmonth = intval(date('t', $unixmonth));
-	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
-		if ( isset($newrow) && $newrow )
+	for ($day = 1; $day <= $daysinmonth; ++$day) {
+		if (isset($newrow) && $newrow)
 			$calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
 		$newrow = false;
 
-		if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) )
+		if ($day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')))
 			$calendar_output .= '<td id="today">';
 		else
 			$calendar_output .= '<td>';
 
-		if ( in_array($day, $daywithpost) ) // any posts today?
-				$calendar_output .= '<a href="' . get_day_link( $thisyear, $thismonth, $day ) . '" title="' . esc_attr( $ak_titles_for_day[ $day ] ) . "\">$day</a>";
+		if (in_array($day, $daywithpost)) // any posts today?
+				$calendar_output .= '<a href="'.get_day_link($thisyear, $thismonth, $day).'" title="'.esc_attr($ak_titles_for_day[$day])."\">$day</a>";
 		else
 			$calendar_output .= $day;
 		$calendar_output .= '</td>';
 
-		if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) )
+		if (6 == calendar_week_mod(date('w', mktime(0, 0, 0, $thismonth, $day, $thisyear)) - $week_begins))
 			$newrow = true;
 	}
 
-	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
-	if ( $pad != 0 && $pad != 7 )
-		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'">&nbsp;</td>';
+	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0, 0, $thismonth, $day, $thisyear)) - $week_begins);
+	if ($pad != 0 && $pad != 7)
+		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'.esc_attr($pad).'">&nbsp;</td>';
 
 	$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
 
-	$cache[ $key ] = $calendar_output;
-	wp_cache_set( 'get_calendar', $cache, 'calendar' );
+	$cache[$key] = $calendar_output;
+	wp_cache_set('get_calendar', $cache, 'calendar');
 
-	if ( $echo ) {
+	if ($echo) {
 		/**
 		 * Filter the HTML calendar output.
 		 *
@@ -1812,10 +1812,10 @@ 
 		 *
 		 * @param string $calendar_output HTML output of the calendar.
 		 */
-		echo apply_filters( 'get_calendar', $calendar_output );
+		echo apply_filters('get_calendar', $calendar_output);
 	} else {
 		/** This filter is documented in wp-includes/general-template.php */
-		return apply_filters( 'get_calendar', $calendar_output );
+		return apply_filters('get_calendar', $calendar_output);
 	}
 
 }
@@ -1827,7 +1827,7 @@ 
  * @since 2.1.0
  */
 function delete_get_calendar_cache() {
-	wp_cache_delete( 'get_calendar', 'calendar' );
+	wp_cache_delete('get_calendar', 'calendar');
 }
 
 /**
@@ -1845,16 +1845,16 @@ 
 function allowed_tags() {
 	global $allowedtags;
 	$allowed = '';
-	foreach ( (array) $allowedtags as $tag => $attributes ) {
+	foreach ((array) $allowedtags as $tag => $attributes) {
 		$allowed .= '<'.$tag;
-		if ( 0 < count($attributes) ) {
-			foreach ( $attributes as $attribute => $limits ) {
+		if (0 < count($attributes)) {
+			foreach ($attributes as $attribute => $limits) {
 				$allowed .= ' '.$attribute.'=""';
 			}
 		}
 		$allowed .= '> ';
 	}
-	return htmlentities( $allowed );
+	return htmlentities($allowed);
 }
 
 /***** Date/Time tags *****/
@@ -1865,7 +1865,7 @@ 
  * @since 1.0.0
  */
 function the_date_xml() {
-	echo mysql2date( 'Y-m-d', get_post()->post_date, false );
+	echo mysql2date('Y-m-d', get_post()->post_date, false);
 }
 
 /**
@@ -1891,11 +1891,11 @@ 
  * @param bool   $echo   Optional, default is display. Whether to echo the date or return it.
  * @return string|void String if retrieving.
  */
-function the_date( $d = '', $before = '', $after = '', $echo = true ) {
+function the_date($d = '', $before = '', $after = '', $echo = true) {
 	global $currentday, $previousday;
 
-	if ( $currentday != $previousday ) {
-		$the_date = $before . get_the_date( $d ) . $after;
+	if ($currentday != $previousday) {
+		$the_date = $before.get_the_date($d).$after;
 		$previousday = $currentday;
 
 		/**
@@ -1909,9 +1909,9 @@ 
 		 * @param string $before   HTML output before the date.
 		 * @param string $after    HTML output after the date.
 		 */
-		$the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
+		$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
 
-		if ( $echo )
+		if ($echo)
 			echo $the_date;
 		else
 			return $the_date;
@@ -1930,17 +1930,17 @@ 
  * @param  int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Date the current post was written. False on failure.
  */
-function get_the_date( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_date($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( '' == $d ) {
-		$the_date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	if ('' == $d) {
+		$the_date = mysql2date(get_option('date_format'), $post->post_date);
 	} else {
-		$the_date = mysql2date( $d, $post->post_date );
+		$the_date = mysql2date($d, $post->post_date);
 	}
 
 	/**
@@ -1953,7 +1953,7 @@ 
 	 *                              if not specified.
 	 * @param int|WP_Post $post     The post object or ID.
 	 */
-	return apply_filters( 'get_the_date', $the_date, $d, $post );
+	return apply_filters('get_the_date', $the_date, $d, $post);
 }
 
 /**
@@ -1967,8 +1967,8 @@ 
  * @param bool   $echo   Optional, default is display. Whether to echo the date or return it.
  * @return string|void String if retrieving.
  */
-function the_modified_date( $d = '', $before = '', $after = '', $echo = true ) {
-	$the_modified_date = $before . get_the_modified_date($d) . $after;
+function the_modified_date($d = '', $before = '', $after = '', $echo = true) {
+	$the_modified_date = $before.get_the_modified_date($d).$after;
 
 	/**
 	 * Filter the date a post was last modified for display.
@@ -1981,9 +1981,9 @@ 
 	 * @param string $before            HTML output before the date.
 	 * @param string $after             HTML output after the date.
 	 */
-	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $d, $before, $after );
+	$the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after);
 
-	if ( $echo )
+	if ($echo)
 		echo $the_modified_date;
 	else
 		return $the_modified_date;
@@ -1999,7 +1999,7 @@ 
  * @return string
  */
 function get_the_modified_date($d = '') {
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_modified_time(get_option('date_format'), null, null, true);
 	else
 		$the_time = get_post_modified_time($d, null, null, true);
@@ -2013,7 +2013,7 @@ 
 	 * @param string $d        PHP date format. Defaults to value specified in
 	 *                         'date_format' option.
 	 */
-	return apply_filters( 'get_the_modified_date', $the_time, $d );
+	return apply_filters('get_the_modified_date', $the_time, $d);
 }
 
 /**
@@ -2023,7 +2023,7 @@ 
  *
  * @param string $d Either 'G', 'U', or php date format.
  */
-function the_time( $d = '' ) {
+function the_time($d = '') {
 	/**
 	 * Filter the time a post was written for display.
 	 *
@@ -2033,7 +2033,7 @@ 
 	 * @param string $d            The time format. Accepts 'G', 'U',
 	 *                             or php date format.
 	 */
-	echo apply_filters( 'the_time', get_the_time( $d ), $d );
+	echo apply_filters('the_time', get_the_time($d), $d);
 }
 
 /**
@@ -2047,14 +2047,14 @@ 
  * @param int|WP_Post $post WP_Post object or ID. Default is global $post object.
  * @return false|string Formatted date string or Unix timestamp. False on failure.
  */
-function get_the_time( $d = '', $post = null ) {
+function get_the_time($d = '', $post = null) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_time(get_option('time_format'), false, $post, true);
 	else
 		$the_time = get_post_time($d, false, $post, true);
@@ -2070,7 +2070,7 @@ 
 	 *                              in 'time_format' option. Default empty.
 	 * @param int|WP_Post $post     WP_Post object or ID.
 	 */
-	return apply_filters( 'get_the_time', $the_time, $d, $post );
+	return apply_filters('get_the_time', $the_time, $d, $post);
 }
 
 /**
@@ -2085,14 +2085,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return false|string|int Formatted date string or Unix timestamp. False on failure.
  */
-function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+function get_post_time($d = 'U', $gmt = false, $post = null, $translate = false) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ($gmt)
 		$time = $post->post_date_gmt;
 	else
 		$time = $post->post_date;
@@ -2109,7 +2109,7 @@ 
 	 *                     Accepts 'G', 'U', or php date format. Default 'U'.
 	 * @param bool   $gmt  Whether to retrieve the GMT time. Default false.
 	 */
-	return apply_filters( 'get_post_time', $time, $d, $gmt );
+	return apply_filters('get_post_time', $time, $d, $gmt);
 }
 
 /**
@@ -2130,7 +2130,7 @@ 
 	 *                                      or php date format. Defaults to value
 	 *                                      specified in 'time_format' option.
 	 */
-	echo apply_filters( 'the_modified_time', get_the_modified_time($d), $d );
+	echo apply_filters('the_modified_time', get_the_modified_time($d), $d);
 }
 
 /**
@@ -2142,7 +2142,7 @@ 
  * @return string
  */
 function get_the_modified_time($d = '') {
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_modified_time(get_option('time_format'), null, null, true);
 	else
 		$the_time = get_post_modified_time($d, null, null, true);
@@ -2157,7 +2157,7 @@ 
 	 *                         written. Accepts 'G', 'U', or php date format. Defaults
 	 *                         to value specified in 'time_format' option.
 	 */
-	return apply_filters( 'get_the_modified_time', $the_time, $d );
+	return apply_filters('get_the_modified_time', $the_time, $d);
 }
 
 /**
@@ -2172,14 +2172,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return false|string Formatted date string or Unix timestamp. False on failure.
  */
-function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+function get_post_modified_time($d = 'U', $gmt = false, $post = null, $translate = false) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ($gmt)
 		$time = $post->post_modified_gmt;
 	else
 		$time = $post->post_modified;
@@ -2194,7 +2194,7 @@ 
 	 * @param string $d    The date format. Accepts 'G', 'U', or php date format. Default 'U'.
 	 * @param bool   $gmt  Whether to return the GMT time. Default false.
 	 */
-	return apply_filters( 'get_post_modified_time', $time, $d, $gmt );
+	return apply_filters('get_post_modified_time', $time, $d, $gmt);
 }
 
 /**
@@ -2206,7 +2206,7 @@ 
  */
 function the_weekday() {
 	global $wp_locale;
-	$the_weekday = $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+	$the_weekday = $wp_locale->get_weekday(mysql2date('w', get_post()->post_date, false));
 
 	/**
 	 * Filter the weekday on which the post was written, for display.
@@ -2215,7 +2215,7 @@ 
 	 *
 	 * @param string $the_weekday
 	 */
-	echo apply_filters( 'the_weekday', $the_weekday );
+	echo apply_filters('the_weekday', $the_weekday);
 }
 
 /**
@@ -2233,12 +2233,12 @@ 
  * @param string $before Optional Output before the date.
  * @param string $after Optional Output after the date.
  */
-function the_weekday_date($before='',$after='') {
+function the_weekday_date($before = '', $after = '') {
 	global $wp_locale, $currentday, $previousweekday;
 	$the_weekday_date = '';
-	if ( $currentday != $previousweekday ) {
+	if ($currentday != $previousweekday) {
 		$the_weekday_date .= $before;
-		$the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+		$the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', get_post()->post_date, false));
 		$the_weekday_date .= $after;
 		$previousweekday = $currentday;
 	}
@@ -2252,7 +2252,7 @@ 
 	 * @param string $before           The HTML to output before the date.
 	 * @param string $after            The HTML to output after the date.
 	 */
-	$the_weekday_date = apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
+	$the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);
 	echo $the_weekday_date;
 }
 
@@ -2267,7 +2267,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_head' );
+	do_action('wp_head');
 }
 
 /**
@@ -2281,7 +2281,7 @@ 
 	 *
 	 * @since 1.5.1
 	 */
-	do_action( 'wp_footer' );
+	do_action('wp_footer');
 }
 
 /**
@@ -2291,8 +2291,8 @@ 
  *
  * @param array $args Optional arguments.
  */
-function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
+function feed_links($args = array()) {
+	if ( ! current_theme_supports('automatic-feed-links'))
 		return;
 
 	$defaults = array(
@@ -2304,10 +2304,10 @@ 
 		'comstitle'	=> __('%1$s %2$s Comments Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['feedtitle'], get_bloginfo('name'), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link() ) . "\" />\n";
-	echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['comstitle'], get_bloginfo('name'), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link( 'comments_' . get_default_feed() ) ) . "\" />\n";
+	echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr(sprintf($args['feedtitle'], get_bloginfo('name'), $args['separator'])).'" href="'.esc_url(get_feed_link())."\" />\n";
+	echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr(sprintf($args['comstitle'], get_bloginfo('name'), $args['separator'])).'" href="'.esc_url(get_feed_link('comments_'.get_default_feed()))."\" />\n";
 }
 
 /**
@@ -2317,7 +2317,7 @@ 
  *
  * @param array $args Optional arguments.
  */
-function feed_links_extra( $args = array() ) {
+function feed_links_extra($args = array()) {
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
 		'separator'   => _x('&raquo;', 'feed link'),
@@ -2335,55 +2335,55 @@ 
 		'posttypetitle' => __('%1$s %2$s %3$s Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 		$id = 0;
-		$post = get_post( $id );
+		$post = get_post($id);
 
-		if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
-			$title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute( array( 'echo' => false ) ) );
-			$href = get_post_comments_feed_link( $post->ID );
+		if (comments_open() || pings_open() || $post->comment_count > 0) {
+			$title = sprintf($args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute(array('echo' => false)));
+			$href = get_post_comments_feed_link($post->ID);
 		}
-	} elseif ( is_post_type_archive() ) {
-		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
-
-		$post_type_obj = get_post_type_object( $post_type );
-		$title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
-		$href = get_post_type_archive_feed_link( $post_type_obj->name );
-	} elseif ( is_category() ) {
+	} elseif (is_post_type_archive()) {
+		$post_type = get_query_var('post_type');
+		if (is_array($post_type))
+			$post_type = reset($post_type);
+
+		$post_type_obj = get_post_type_object($post_type);
+		$title = sprintf($args['posttypetitle'], get_bloginfo('name'), $args['separator'], $post_type_obj->labels->name);
+		$href = get_post_type_archive_feed_link($post_type_obj->name);
+	} elseif (is_category()) {
 		$term = get_queried_object();
 
-		if ( $term ) {
-			$title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_category_feed_link( $term->term_id );
+		if ($term) {
+			$title = sprintf($args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name);
+			$href = get_category_feed_link($term->term_id);
 		}
-	} elseif ( is_tag() ) {
+	} elseif (is_tag()) {
 		$term = get_queried_object();
 
-		if ( $term ) {
-			$title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_tag_feed_link( $term->term_id );
+		if ($term) {
+			$title = sprintf($args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name);
+			$href = get_tag_feed_link($term->term_id);
 		}
-	} elseif ( is_author() ) {
-		$author_id = intval( get_query_var('author') );
+	} elseif (is_author()) {
+		$author_id = intval(get_query_var('author'));
 
-		$title = sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
-		$href = get_author_feed_link( $author_id );
-	} elseif ( is_search() ) {
-		$title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
+		$title = sprintf($args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta('display_name', $author_id));
+		$href = get_author_feed_link($author_id);
+	} elseif (is_search()) {
+		$title = sprintf($args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query(false));
 		$href = get_search_feed_link();
-	} elseif ( is_post_type_archive() ) {
-		$title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+	} elseif (is_post_type_archive()) {
+		$title = sprintf($args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title('', false));
 		$post_type_obj = get_queried_object();
-		if ( $post_type_obj )
-			$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		if ($post_type_obj)
+			$href = get_post_type_archive_feed_link($post_type_obj->name);
 	}
 
-	if ( isset($title) && isset($href) )
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
+	if (isset($title) && isset($href))
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr($title).'" href="'.esc_url($href).'" />'."\n";
 }
 
 /**
@@ -2393,7 +2393,7 @@ 
  * @since 2.0.0
  */
 function rsd_link() {
-	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_bloginfo('wpurl') . "/xmlrpc.php?rsd\" />\n";
+	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.get_bloginfo('wpurl')."/xmlrpc.php?rsd\" />\n";
 }
 
 /**
@@ -2404,7 +2404,7 @@ 
  */
 function wlwmanifest_link() {
 	echo '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="',
-		includes_url( 'wlwmanifest.xml' ), '" /> ', "\n";
+		includes_url('wlwmanifest.xml'), '" /> ', "\n";
 }
 
 /**
@@ -2420,7 +2420,7 @@ 
  */
 function noindex() {
 	// If the blog is not public, tell robots to go away.
-	if ( '0' == get_option('blog_public') )
+	if ('0' == get_option('blog_public'))
 		wp_no_robots();
 }
 
@@ -2444,15 +2444,15 @@ 
  * @link http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#rel-icon HTML5 specification link icon.
  */
 function wp_site_icon() {
-	if ( ! has_site_icon() && ! is_customize_preview() ) {
+	if ( ! has_site_icon() && ! is_customize_preview()) {
 		return;
 	}
 
 	$meta_tags = array(
-		sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
-		sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
-		sprintf( '<link rel="apple-touch-icon-precomposed" href="%s">', esc_url( get_site_icon_url( 180 ) ) ),
-		sprintf( '<meta name="msapplication-TileImage" content="%s">', esc_url( get_site_icon_url( 270 ) ) ),
+		sprintf('<link rel="icon" href="%s" sizes="32x32" />', esc_url(get_site_icon_url(32))),
+		sprintf('<link rel="icon" href="%s" sizes="192x192" />', esc_url(get_site_icon_url(192))),
+		sprintf('<link rel="apple-touch-icon-precomposed" href="%s">', esc_url(get_site_icon_url(180))),
+		sprintf('<meta name="msapplication-TileImage" content="%s">', esc_url(get_site_icon_url(270))),
 	);
 
 	/**
@@ -2462,10 +2462,10 @@ 
 	 *
 	 * @param array $meta_tags Site Icon meta elements.
 	 */
-	$meta_tags = apply_filters( 'site_icon_meta_tags', $meta_tags );
-	$meta_tags = array_filter( $meta_tags );
+	$meta_tags = apply_filters('site_icon_meta_tags', $meta_tags);
+	$meta_tags = array_filter($meta_tags);
 
-	foreach ( $meta_tags as $meta_tag ) {
+	foreach ($meta_tags as $meta_tag) {
 		echo "$meta_tag\n";
 	}
 }
@@ -2490,13 +2490,13 @@ 
 function user_can_richedit() {
 	global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE;
 
-	if ( !isset($wp_rich_edit) ) {
+	if ( ! isset($wp_rich_edit)) {
 		$wp_rich_edit = false;
 
-		if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
-			if ( $is_safari ) {
-				$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
-			} elseif ( $is_gecko || $is_chrome || $is_IE || ( $is_opera && !wp_is_mobile() ) ) {
+		if (get_user_option('rich_editing') == 'true' || ! is_user_logged_in()) { // default to 'true' for logged out users
+			if ($is_safari) {
+				$wp_rich_edit = ! wp_is_mobile() || (preg_match('!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match) && intval($match[1]) >= 534);
+			} elseif ($is_gecko || $is_chrome || $is_IE || ($is_opera && ! wp_is_mobile())) {
 				$wp_rich_edit = true;
 			}
 		}
@@ -2509,7 +2509,7 @@ 
 	 *
 	 * @param bool $wp_rich_edit Whether the user can access to the rich (Visual) editor.
 	 */
-	return apply_filters( 'user_can_richedit', $wp_rich_edit );
+	return apply_filters('user_can_richedit', $wp_rich_edit);
 }
 
 /**
@@ -2524,9 +2524,9 @@ 
  */
 function wp_default_editor() {
 	$r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
-	if ( wp_get_current_user() ) { // look for cookie
+	if (wp_get_current_user()) { // look for cookie
 		$ed = get_user_setting('editor', 'tinymce');
-		$r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
+		$r = (in_array($ed, array('tinymce', 'html', 'test'))) ? $ed : $r;
 	}
 
 	/**
@@ -2536,7 +2536,7 @@ 
 	 *
 	 * @param array $r An array of editors. Accepts 'tinymce', 'html', 'test'.
 	 */
-	return apply_filters( 'wp_default_editor', $r );
+	return apply_filters('wp_default_editor', $r);
 }
 
 /**
@@ -2558,9 +2558,9 @@ 
  * @param string $editor_id HTML ID attribute value for the textarea and TinyMCE. Can only be /[a-z]+/.
  * @param array  $settings  See _WP_Editors::editor().
  */
-function wp_editor( $content, $editor_id, $settings = array() ) {
-	if ( ! class_exists( '_WP_Editors' ) )
-		require( ABSPATH . WPINC . '/class-wp-editor.php' );
+function wp_editor($content, $editor_id, $settings = array()) {
+	if ( ! class_exists('_WP_Editors'))
+		require(ABSPATH.WPINC.'/class-wp-editor.php');
 
 	_WP_Editors::editor($content, $editor_id, $settings);
 }
@@ -2577,7 +2577,7 @@ 
  * 	                    Only use when you are later escaping it. Do not use unescaped.
  * @return string
  */
-function get_search_query( $escaped = true ) {
+function get_search_query($escaped = true) {
 	/**
 	 * Filter the contents of the search query variable.
 	 *
@@ -2585,10 +2585,10 @@ 
 	 *
 	 * @param mixed $search Contents of the search query variable.
 	 */
-	$query = apply_filters( 'get_search_query', get_query_var( 's' ) );
+	$query = apply_filters('get_search_query', get_query_var('s'));
 
-	if ( $escaped )
-		$query = esc_attr( $query );
+	if ($escaped)
+		$query = esc_attr($query);
 	return $query;
 }
 
@@ -2608,7 +2608,7 @@ 
 	 *
 	 * @param mixed $search Contents of the search query variable.
 	 */
-	echo esc_attr( apply_filters( 'the_search_query', get_search_query( false ) ) );
+	echo esc_attr(apply_filters('the_search_query', get_search_query(false)));
 }
 
 /**
@@ -2621,17 +2621,17 @@ 
  *
  * @param string $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
  */
-function get_language_attributes( $doctype = 'html' ) {
+function get_language_attributes($doctype = 'html') {
 	$attributes = array();
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() )
+	if (function_exists('is_rtl') && is_rtl())
 		$attributes[] = 'dir="rtl"';
 
-	if ( $lang = get_bloginfo('language') ) {
-		if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
+	if ($lang = get_bloginfo('language')) {
+		if (get_option('html_type') == 'text/html' || $doctype == 'html')
 			$attributes[] = "lang=\"$lang\"";
 
-		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
+		if (get_option('html_type') != 'text/html' || $doctype == 'xhtml')
 			$attributes[] = "xml:lang=\"$lang\"";
 	}
 
@@ -2646,7 +2646,7 @@ 
 	 * @param string $output A space-separated list of language attributes.
 	 * @param string $doctype The type of html document (xhtml|html).
 	 */
-	return apply_filters( 'language_attributes', $output, $doctype );
+	return apply_filters('language_attributes', $output, $doctype);
 }
 
 /**
@@ -2660,8 +2660,8 @@ 
  *
  * @param string $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
  */
-function language_attributes( $doctype = 'html' ) {
-	echo get_language_attributes( $doctype );
+function language_attributes($doctype = 'html') {
+	echo get_language_attributes($doctype);
 }
 
 /**
@@ -2739,23 +2739,23 @@ 
  * }
  * @return array|string|void String of page links or array of page links.
  */
-function paginate_links( $args = '' ) {
+function paginate_links($args = '') {
 	global $wp_query, $wp_rewrite;
 
 	// Setting up default values based on the current URL.
-	$pagenum_link = html_entity_decode( get_pagenum_link() );
-	$url_parts    = explode( '?', $pagenum_link );
+	$pagenum_link = html_entity_decode(get_pagenum_link());
+	$url_parts    = explode('?', $pagenum_link);
 
 	// Get max pages and current page out of the current query, if available.
-	$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-	$current = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+	$total   = isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1;
+	$current = get_query_var('paged') ? intval(get_query_var('paged')) : 1;
 
 	// Append the format placeholder to the base URL.
-	$pagenum_link = trailingslashit( $url_parts[0] ) . '%_%';
+	$pagenum_link = trailingslashit($url_parts[0]).'%_%';
 
 	// URL base depends on permalink settings.
-	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
-	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+	$format  = $wp_rewrite->using_index_permalinks() && ! strpos($pagenum_link, 'index.php') ? 'index.php/' : '';
+	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit($wp_rewrite->pagination_base.'/%#%', 'paged') : '?paged=%#%';
 
 	$defaults = array(
 		'base' => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
@@ -2775,42 +2775,42 @@ 
 		'after_page_number' => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! is_array( $args['add_args'] ) ) {
+	if ( ! is_array($args['add_args'])) {
 		$args['add_args'] = array();
 	}
 
 	// Merge additional query vars found in the original URL into 'add_args' array.
-	if ( isset( $url_parts[1] ) ) {
+	if (isset($url_parts[1])) {
 		// Find the format argument.
-		$format = explode( '?', str_replace( '%_%', $args['format'], $args['base'] ) );
-		$format_query = isset( $format[1] ) ? $format[1] : '';
-		wp_parse_str( $format_query, $format_args );
+		$format = explode('?', str_replace('%_%', $args['format'], $args['base']));
+		$format_query = isset($format[1]) ? $format[1] : '';
+		wp_parse_str($format_query, $format_args);
 
 		// Find the query args of the requested URL.
-		wp_parse_str( $url_parts[1], $url_query_args );
+		wp_parse_str($url_parts[1], $url_query_args);
 
 		// Remove the format argument from the array of query arguments, to avoid overwriting custom format.
-		foreach ( $format_args as $format_arg => $format_arg_value ) {
-			unset( $url_query_args[ $format_arg ] );
+		foreach ($format_args as $format_arg => $format_arg_value) {
+			unset($url_query_args[$format_arg]);
 		}
 
-		$args['add_args'] = array_merge( $args['add_args'], urlencode_deep( $url_query_args ) );
+		$args['add_args'] = array_merge($args['add_args'], urlencode_deep($url_query_args));
 	}
 
 	// Who knows what else people pass in $args
 	$total = (int) $args['total'];
-	if ( $total < 2 ) {
+	if ($total < 2) {
 		return;
 	}
 	$current  = (int) $args['current'];
 	$end_size = (int) $args['end_size']; // Out of bounds?  Make it the default.
-	if ( $end_size < 1 ) {
+	if ($end_size < 1) {
 		$end_size = 1;
 	}
 	$mid_size = (int) $args['mid_size'];
-	if ( $mid_size < 0 ) {
+	if ($mid_size < 0) {
 		$mid_size = 2;
 	}
 	$add_args = $args['add_args'];
@@ -2818,11 +2818,11 @@ 
 	$page_links = array();
 	$dots = false;
 
-	if ( $args['prev_next'] && $current && 1 < $current ) :
-		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
-		$link = str_replace( '%#%', $current - 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+	if ($args['prev_next'] && $current && 1 < $current) :
+		$link = str_replace('%_%', 2 == $current ? '' : $args['format'], $args['base']);
+		$link = str_replace('%#%', $current - 1, $link);
+		if ($add_args)
+			$link = add_query_arg($add_args, $link);
 		$link .= $args['add_fragment'];
 
 		/**
@@ -2832,40 +2832,40 @@ 
 		 *
 		 * @param string $link The paginated link URL.
 		 */
-		$page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
+		$page_links[] = '<a class="prev page-numbers" href="'.esc_url(apply_filters('paginate_links', $link)).'">'.$args['prev_text'].'</a>';
 	endif;
-	for ( $n = 1; $n <= $total; $n++ ) :
-		if ( $n == $current ) :
-			$page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
+	for ($n = 1; $n <= $total; $n++) :
+		if ($n == $current) :
+			$page_links[] = "<span class='page-numbers current'>".$args['before_page_number'].number_format_i18n($n).$args['after_page_number']."</span>";
 			$dots = true;
 		else :
-			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-				$link = str_replace( '%#%', $n, $link );
-				if ( $add_args )
-					$link = add_query_arg( $add_args, $link );
+			if ($args['show_all'] || ($n <= $end_size || ($current && $n >= $current - $mid_size && $n <= $current + $mid_size) || $n > $total - $end_size)) :
+				$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
+				$link = str_replace('%#%', $n, $link);
+				if ($add_args)
+					$link = add_query_arg($add_args, $link);
 				$link .= $args['add_fragment'];
 
 				/** This filter is documented in wp-includes/general-template.php */
-				$page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
+				$page_links[] = "<a class='page-numbers' href='".esc_url(apply_filters('paginate_links', $link))."'>".$args['before_page_number'].number_format_i18n($n).$args['after_page_number']."</a>";
 				$dots = true;
-			elseif ( $dots && ! $args['show_all'] ) :
-				$page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
+			elseif ($dots && ! $args['show_all']) :
+				$page_links[] = '<span class="page-numbers dots">'.__('&hellip;').'</span>';
 				$dots = false;
 			endif;
 		endif;
 	endfor;
-	if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
-		$link = str_replace( '%_%', $args['format'], $args['base'] );
-		$link = str_replace( '%#%', $current + 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+	if ($args['prev_next'] && $current && ($current < $total || -1 == $total)) :
+		$link = str_replace('%_%', $args['format'], $args['base']);
+		$link = str_replace('%#%', $current + 1, $link);
+		if ($add_args)
+			$link = add_query_arg($add_args, $link);
 		$link .= $args['add_fragment'];
 
 		/** This filter is documented in wp-includes/general-template.php */
-		$page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
+		$page_links[] = '<a class="next page-numbers" href="'.esc_url(apply_filters('paginate_links', $link)).'">'.$args['next_text'].'</a>';
 	endif;
-	switch ( $args['type'] ) {
+	switch ($args['type']) {
 		case 'array' :
 			return $page_links;
 
@@ -2903,10 +2903,10 @@ 
  * @param array  $colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
  * @param array  $icons  Optional An array of CSS color definitions used to color any SVG icons
  */
-function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
+function wp_admin_css_color($key, $name, $url, $colors = array(), $icons = array()) {
 	global $_wp_admin_css_colors;
 
-	if ( !isset($_wp_admin_css_colors) )
+	if ( ! isset($_wp_admin_css_colors))
 		$_wp_admin_css_colors = array();
 
 	$_wp_admin_css_colors[$key] = (object) array(
@@ -2928,56 +2928,56 @@ 
 	$suffix = is_rtl() ? '-rtl' : '';
 	$suffix .= SCRIPT_DEBUG ? '' : '.min';
 
-	wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
+	wp_admin_css_color('fresh', _x('Default', 'admin color scheme'),
 		false,
-		array( '#222', '#333', '#0073aa', '#00a0d2' ),
-		array( 'base' => '#999', 'focus' => '#00a0d2', 'current' => '#fff' )
+		array('#222', '#333', '#0073aa', '#00a0d2'),
+		array('base' => '#999', 'focus' => '#00a0d2', 'current' => '#fff')
 	);
 
 	// Other color schemes are not available when running out of src
-	if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) )
+	if (false !== strpos($GLOBALS['wp_version'], '-src'))
 		return;
 
-	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
-		admin_url( "css/colors/light/colors$suffix.css" ),
-		array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
-		array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
+	wp_admin_css_color('light', _x('Light', 'admin color scheme'),
+		admin_url("css/colors/light/colors$suffix.css"),
+		array('#e5e5e5', '#999', '#d64e07', '#04a4cc'),
+		array('base' => '#999', 'focus' => '#ccc', 'current' => '#ccc')
 	);
 
-	wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
-		admin_url( "css/colors/blue/colors$suffix.css" ),
-		array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
-		array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('blue', _x('Blue', 'admin color scheme'),
+		admin_url("css/colors/blue/colors$suffix.css"),
+		array('#096484', '#4796b3', '#52accc', '#74B6CE'),
+		array('base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
-		admin_url( "css/colors/midnight/colors$suffix.css" ),
-		array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
-		array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('midnight', _x('Midnight', 'admin color scheme'),
+		admin_url("css/colors/midnight/colors$suffix.css"),
+		array('#25282b', '#363b3f', '#69a8bb', '#e14d43'),
+		array('base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
-		admin_url( "css/colors/sunrise/colors$suffix.css" ),
-		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
-		array( 'base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('sunrise', _x('Sunrise', 'admin color scheme'),
+		admin_url("css/colors/sunrise/colors$suffix.css"),
+		array('#b43c38', '#cf4944', '#dd823b', '#ccaf0b'),
+		array('base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
-		admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
-		array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
-		array( 'base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('ectoplasm', _x('Ectoplasm', 'admin color scheme'),
+		admin_url("css/colors/ectoplasm/colors$suffix.css"),
+		array('#413256', '#523f6d', '#a3b745', '#d46f15'),
+		array('base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'ocean', _x( 'Ocean', 'admin color scheme' ),
-		admin_url( "css/colors/ocean/colors$suffix.css" ),
-		array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
-		array( 'base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('ocean', _x('Ocean', 'admin color scheme'),
+		admin_url("css/colors/ocean/colors$suffix.css"),
+		array('#627c83', '#738e96', '#9ebaa0', '#aa9d88'),
+		array('base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'coffee', _x( 'Coffee', 'admin color scheme' ),
-		admin_url( "css/colors/coffee/colors$suffix.css" ),
-		array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
-		array( 'base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('coffee', _x('Coffee', 'admin color scheme'),
+		admin_url("css/colors/coffee/colors$suffix.css"),
+		array('#46403c', '#59524c', '#c7a589', '#9ea476'),
+		array('base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff')
 	);
 
 }
@@ -2992,13 +2992,13 @@ 
  * @param string $file file relative to wp-admin/ without its ".css" extension.
  * @return string
  */
-function wp_admin_css_uri( $file = 'wp-admin' ) {
-	if ( defined('WP_INSTALLING') ) {
+function wp_admin_css_uri($file = 'wp-admin') {
+	if (defined('WP_INSTALLING')) {
 		$_file = "./$file.css";
 	} else {
 		$_file = admin_url("$file.css");
 	}
-	$_file = add_query_arg( 'version', get_bloginfo( 'version' ),  $_file );
+	$_file = add_query_arg('version', get_bloginfo('version'), $_file);
 
 	/**
 	 * Filter the URI of a WordPress admin CSS file.
@@ -3008,7 +3008,7 @@ 
 	 * @param string $_file Relative path to the file with query arguments attached.
 	 * @param string $file  Relative path to the file, minus its ".css" extension.
 	 */
-	return apply_filters( 'wp_admin_css_uri', $_file, $file );
+	return apply_filters('wp_admin_css_uri', $_file, $file);
 }
 
 /**
@@ -3031,15 +3031,15 @@ 
  * 	                         to wp-admin/. Defaults to 'wp-admin'.
  * @param bool   $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
  */
-function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
+function wp_admin_css($file = 'wp-admin', $force_echo = false) {
 	// For backward compatibility
-	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
+	$handle = 0 === strpos($file, 'css/') ? substr($file, 4) : $file;
 
-	if ( wp_styles()->query( $handle ) ) {
-		if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
-			wp_print_styles( $handle );
+	if (wp_styles()->query($handle)) {
+		if ($force_echo || did_action('wp_print_styles')) // we already printed the style queue. Print this one immediately
+			wp_print_styles($handle);
 		else // Add to style queue
-			wp_enqueue_style( $handle );
+			wp_enqueue_style($handle);
 		return;
 	}
 
@@ -3054,11 +3054,11 @@ 
 	 * @param string $file Style handle name or filename (without ".css" extension)
 	 *                     relative to wp-admin/. Defaults to 'wp-admin'.
 	 */
-	echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
+	echo apply_filters('wp_admin_css', "<link rel='stylesheet' href='".esc_url(wp_admin_css_uri($file))."' type='text/css' />\n", $file);
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+	if (function_exists('is_rtl') && is_rtl()) {
 		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
+		echo apply_filters('wp_admin_css', "<link rel='stylesheet' href='".esc_url(wp_admin_css_uri("$file-rtl"))."' type='text/css' />\n", "$file-rtl");
 	}
 }
 
@@ -3072,11 +3072,11 @@ 
  * @since 2.5.0
  */
 function add_thickbox() {
-	wp_enqueue_script( 'thickbox' );
-	wp_enqueue_style( 'thickbox' );
+	wp_enqueue_script('thickbox');
+	wp_enqueue_style('thickbox');
 
-	if ( is_network_admin() )
-		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
+	if (is_network_admin())
+		add_action('admin_head', '_thickbox_path_admin_subfolder');
 }
 
 /**
@@ -3092,7 +3092,7 @@ 
 	 *
 	 * @param string $generator_type The XHTML generator.
 	 */
-	the_generator( apply_filters( 'wp_generator_type', 'xhtml' ) );
+	the_generator(apply_filters('wp_generator_type', 'xhtml'));
 }
 
 /**
@@ -3105,7 +3105,7 @@ 
  *
  * @param string $type The type of generator to output - (html|xhtml|atom|rss2|rdf|comment|export).
  */
-function the_generator( $type ) {
+function the_generator($type) {
 	/**
 	 * Filter the output of the XHTML generator tag for display.
 	 *
@@ -3115,7 +3115,7 @@ 
 	 * @param string $type           The type of generator to output. Accepts 'html',
 	 *                               'xhtml', 'atom', 'rss2', 'rdf', 'comment', 'export'.
 	 */
-	echo apply_filters( 'the_generator', get_the_generator($type), $type ) . "\n";
+	echo apply_filters('the_generator', get_the_generator($type), $type)."\n";
 }
 
 /**
@@ -3130,14 +3130,14 @@ 
  * @param string $type The type of generator to return - (html|xhtml|atom|rss2|rdf|comment|export).
  * @return string|void The HTML content for the generator.
  */
-function get_the_generator( $type = '' ) {
-	if ( empty( $type ) ) {
+function get_the_generator($type = '') {
+	if (empty($type)) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
+		if (empty($current_filter))
 			return;
 
-		switch ( $current_filter ) {
+		switch ($current_filter) {
 			case 'rss2_head' :
 			case 'commentsrss2_head' :
 				$type = 'rss2';
@@ -3157,27 +3157,27 @@ 
 		}
 	}
 
-	switch ( $type ) {
+	switch ($type) {
 		case 'html':
-			$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
+			$gen = '<meta name="generator" content="WordPress '.get_bloginfo('version').'">';
 			break;
 		case 'xhtml':
-			$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />';
+			$gen = '<meta name="generator" content="WordPress '.get_bloginfo('version').'" />';
 			break;
 		case 'atom':
-			$gen = '<generator uri="http://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
+			$gen = '<generator uri="http://wordpress.org/" version="'.get_bloginfo_rss('version').'">WordPress</generator>';
 			break;
 		case 'rss2':
-			$gen = '<generator>http://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '</generator>';
+			$gen = '<generator>http://wordpress.org/?v='.get_bloginfo_rss('version').'</generator>';
 			break;
 		case 'rdf':
-			$gen = '<admin:generatorAgent rdf:resource="http://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '" />';
+			$gen = '<admin:generatorAgent rdf:resource="http://wordpress.org/?v='.get_bloginfo_rss('version').'" />';
 			break;
 		case 'comment':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
+			$gen = '<!-- generator="WordPress/'.get_bloginfo('version').'" -->';
 			break;
 		case 'export':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
+			$gen = '<!-- generator="WordPress/'.get_bloginfo_rss('version').'" created="'.date('Y-m-d H:i').'" -->';
 			break;
 	}
 
@@ -3192,7 +3192,7 @@ 
 	 * @param string $type The type of generator. Accepts 'html', 'xhtml', 'atom',
 	 *                     'rss2', 'rdf', 'comment', 'export'.
 	 */
-	return apply_filters( "get_the_generator_{$type}", $gen, $type );
+	return apply_filters("get_the_generator_{$type}", $gen, $type);
 }
 
 /**
@@ -3207,8 +3207,8 @@ 
  * @param bool  $echo    Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function checked( $checked, $current = true, $echo = true ) {
-	return __checked_selected_helper( $checked, $current, $echo, 'checked' );
+function checked($checked, $current = true, $echo = true) {
+	return __checked_selected_helper($checked, $current, $echo, 'checked');
 }
 
 /**
@@ -3223,8 +3223,8 @@ 
  * @param bool  $echo     Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function selected( $selected, $current = true, $echo = true ) {
-	return __checked_selected_helper( $selected, $current, $echo, 'selected' );
+function selected($selected, $current = true, $echo = true) {
+	return __checked_selected_helper($selected, $current, $echo, 'selected');
 }
 
 /**
@@ -3239,8 +3239,8 @@ 
  * @param bool  $echo     Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function disabled( $disabled, $current = true, $echo = true ) {
-	return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
+function disabled($disabled, $current = true, $echo = true) {
+	return __checked_selected_helper($disabled, $current, $echo, 'disabled');
 }
 
 /**
@@ -3257,13 +3257,13 @@ 
  * @param string $type    The type of checked|selected|disabled we are doing
  * @return string html attribute or empty string
  */
-function __checked_selected_helper( $helper, $current, $echo, $type ) {
-	if ( (string) $helper === (string) $current )
+function __checked_selected_helper($helper, $current, $echo, $type) {
+	if ((string) $helper === (string) $current)
 		$result = " $type='$type'";
 	else
 		$result = '';
 
-	if ( $echo )
+	if ($echo)
 		echo $result;
 
 	return $result;
@@ -3279,12 +3279,12 @@ 
  * @param array $settings
  * @return array $settings
  */
-function wp_heartbeat_settings( $settings ) {
-	if ( ! is_admin() )
-		$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+function wp_heartbeat_settings($settings) {
+	if ( ! is_admin())
+		$settings['ajaxurl'] = admin_url('admin-ajax.php', 'relative');
 
-	if ( is_user_logged_in() )
-		$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	if (is_user_logged_in())
+		$settings['nonce'] = wp_create_nonce('heartbeat-nonce');
 
 	return $settings;
 }

Braces +292 added lines, -208 removed lines

@@ -36,15 +36,17 @@ 
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
-		$templates[] = "header-{$name}.php";
+	if ( '' !== $name ) {
+			$templates[] = "header-{$name}.php";
+	}
 
 	$templates[] = 'header.php';
 
 	// Backward compat code will be removed in a future release
-	if ('' == locate_template($templates, true))
-		load_template( ABSPATH . WPINC . '/theme-compat/header.php');
-}
+	if ('' == locate_template($templates, true)) {
+			load_template( ABSPATH . WPINC . '/theme-compat/header.php');
+	}
+	}
 
 /**
  * Load footer template.
@@ -76,15 +78,17 @@ 
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
-		$templates[] = "footer-{$name}.php";
+	if ( '' !== $name ) {
+			$templates[] = "footer-{$name}.php";
+	}
 
 	$templates[] = 'footer.php';
 
 	// Backward compat code will be removed in a future release
-	if ('' == locate_template($templates, true))
-		load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
-}
+	if ('' == locate_template($templates, true)) {
+			load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
+	}
+	}
 
 /**
  * Load sidebar template.
@@ -116,15 +120,17 @@ 
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
-		$templates[] = "sidebar-{$name}.php";
+	if ( '' !== $name ) {
+			$templates[] = "sidebar-{$name}.php";
+	}
 
 	$templates[] = 'sidebar.php';
 
 	// Backward compat code will be removed in a future release
-	if ('' == locate_template($templates, true))
-		load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
-}
+	if ('' == locate_template($templates, true)) {
+			load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
+	}
+	}
 
 /**
  * Load a template part into a template
@@ -163,8 +169,9 @@ 
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
-		$templates[] = "{$slug}-{$name}.php";
+	if ( '' !== $name ) {
+			$templates[] = "{$slug}-{$name}.php";
+	}
 
 	$templates[] = "{$slug}.php";
 
@@ -250,14 +257,16 @@ 
 	 */
 	$result = apply_filters( 'get_search_form', $form );
 
-	if ( null === $result )
-		$result = $form;
+	if ( null === $result ) {
+			$result = $form;
+	}
 
-	if ( $echo )
-		echo $result;
-	else
-		return $result;
-}
+	if ( $echo ) {
+			echo $result;
+	} else {
+			return $result;
+	}
+	}
 
 /**
  * Display the Log In/Out link.
@@ -272,10 +281,11 @@ 
  * @return string|void String when retrieving.
  */
 function wp_loginout($redirect = '', $echo = true) {
-	if ( ! is_user_logged_in() )
-		$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
-	else
-		$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+	if ( ! is_user_logged_in() ) {
+			$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
+	} else {
+			$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+	}
 
 	if ( $echo ) {
 		/**
@@ -334,11 +344,13 @@ 
 function wp_login_url($redirect = '', $force_reauth = false) {
 	$login_url = site_url('wp-login.php', 'login');
 
-	if ( !empty($redirect) )
-		$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
+	if ( !empty($redirect) ) {
+			$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
+	}
 
-	if ( $force_reauth )
-		$login_url = add_query_arg('reauth', '1', $login_url);
+	if ( $force_reauth ) {
+			$login_url = add_query_arg('reauth', '1', $login_url);
+	}
 
 	/**
 	 * Filter the login URL.
@@ -466,11 +478,12 @@ 
 			' . $login_form_bottom . '
 		</form>';
 
-	if ( $args['echo'] )
-		echo $form;
-	else
-		return $form;
-}
+	if ( $args['echo'] ) {
+			echo $form;
+	} else {
+			return $form;
+	}
+	}
 
 /**
  * Returns the URL that allows the user to retrieve the lost password
@@ -514,10 +527,11 @@ 
  */
 function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
 	if ( ! is_user_logged_in() ) {
-		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
-		else
-			$link = '';
+		if ( get_option('users_can_register') ) {
+					$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
+		} else {
+					$link = '';
+		}
 	} else {
 		$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
 	}
@@ -655,7 +669,9 @@ 
 			break;
 		case 'charset':
 			$output = get_option('blog_charset');
-			if ('' == $output) $output = 'UTF-8';
+			if ('' == $output) {
+				$output = 'UTF-8';
+			}
 			break;
 		case 'html_type' :
 			$output = get_option('html_type');
@@ -691,8 +707,9 @@ 
 	$url = true;
 	if (strpos($show, 'url') === false &&
 		strpos($show, 'directory') === false &&
-		strpos($show, 'home') === false)
-		$url = false;
+		strpos($show, 'home') === false) {
+			$url = false;
+	}
 
 	if ( 'display' == $filter ) {
 		if ( $url ) {
@@ -840,11 +857,13 @@ 
 	// If there's a post type archive
 	if ( is_post_type_archive() ) {
 		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
+		if ( is_array( $post_type ) ) {
+					$post_type = reset( $post_type );
+		}
 		$post_type_object = get_post_type_object( $post_type );
-		if ( ! $post_type_object->has_archive )
-			$title = post_type_archive_title( '', false );
+		if ( ! $post_type_object->has_archive ) {
+					$title = post_type_archive_title( '', false );
+		}
 	}
 
 	// If there's a category or tag
@@ -864,13 +883,15 @@ 
 	// If there's an author
 	if ( is_author() && ! is_post_type_archive() ) {
 		$author = get_queried_object();
-		if ( $author )
-			$title = $author->display_name;
+		if ( $author ) {
+					$title = $author->display_name;
+		}
 	}
 
 	// Post type archives with has_archive should override terms.
-	if ( is_post_type_archive() && $post_type_object->has_archive )
-		$title = post_type_archive_title( '', false );
+	if ( is_post_type_archive() && $post_type_object->has_archive ) {
+			$title = post_type_archive_title( '', false );
+	}
 
 	// If there's a month
 	if ( is_archive() && !empty($m) ) {
@@ -883,10 +904,12 @@ 
 	// If there's a year
 	if ( is_archive() && !empty($year) ) {
 		$title = $year;
-		if ( !empty($monthnum) )
-			$title .= $t_sep . $wp_locale->get_month($monthnum);
-		if ( !empty($day) )
-			$title .= $t_sep . zeroise($day, 2);
+		if ( !empty($monthnum) ) {
+					$title .= $t_sep . $wp_locale->get_month($monthnum);
+		}
+		if ( !empty($day) ) {
+					$title .= $t_sep . zeroise($day, 2);
+		}
 	}
 
 	// If it's a search
@@ -901,8 +924,9 @@ 
 	}
 
 	$prefix = '';
-	if ( !empty($title) )
-		$prefix = " $sep ";
+	if ( !empty($title) ) {
+			$prefix = " $sep ";
+	}
 
 	/**
 	 * Filter the parts of the page title.
@@ -946,10 +970,11 @@ 
 	$title = apply_filters( 'wp_title', $title, $sep, $seplocation );
 
 	// Send it out
-	if ( $display )
-		echo $title;
-	else
-		return $title;
+	if ( $display ) {
+			echo $title;
+	} else {
+			return $title;
+	}
 
 }
 
@@ -972,8 +997,9 @@ 
 function single_post_title( $prefix = '', $display = true ) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
-		return;
+	if ( !isset($_post->post_title) ) {
+			return;
+	}
 
 	/**
 	 * Filter the page title for a single post.
@@ -984,11 +1010,12 @@ 
 	 * @param object $_post       The current queried object as returned by get_queried_object().
 	 */
 	$title = apply_filters( 'single_post_title', $_post->post_title, $_post );
-	if ( $display )
-		echo $prefix . $title;
-	else
-		return $prefix . $title;
-}
+	if ( $display ) {
+			echo $prefix . $title;
+	} else {
+			return $prefix . $title;
+	}
+	}
 
 /**
  * Display or retrieve title for a post type archive.
@@ -1003,12 +1030,14 @@ 
  * @return string|void Title when retrieving, null when displaying or failure.
  */
 function post_type_archive_title( $prefix = '', $display = true ) {
-	if ( ! is_post_type_archive() )
-		return;
+	if ( ! is_post_type_archive() ) {
+			return;
+	}
 
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	if ( is_array( $post_type ) ) {
+			$post_type = reset( $post_type );
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 
@@ -1022,11 +1051,12 @@ 
 	 */
 	$title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type );
 
-	if ( $display )
-		echo $prefix . $title;
-	else
-		return $prefix . $title;
-}
+	if ( $display ) {
+			echo $prefix . $title;
+	} else {
+			return $prefix . $title;
+	}
+	}
 
 /**
  * Display or retrieve page title for category archive.
@@ -1090,8 +1120,9 @@ 
 function single_term_title( $prefix = '', $display = true ) {
 	$term = get_queried_object();
 
-	if ( !$term )
-		return;
+	if ( !$term ) {
+			return;
+	}
 
 	if ( is_category() ) {
 		/**
@@ -1124,14 +1155,16 @@ 
 		return;
 	}
 
-	if ( empty( $term_name ) )
-		return;
+	if ( empty( $term_name ) ) {
+			return;
+	}
 
-	if ( $display )
-		echo $prefix . $term_name;
-	else
-		return $prefix . $term_name;
-}
+	if ( $display ) {
+			echo $prefix . $term_name;
+	} else {
+			return $prefix . $term_name;
+	}
+	}
 
 /**
  * Display or retrieve page title for post archive based on date.
@@ -1168,13 +1201,15 @@ 
 		$my_month = $wp_locale->get_month(substr($m, 4, 2));
 	}
 
-	if ( empty($my_month) )
-		return false;
+	if ( empty($my_month) ) {
+			return false;
+	}
 
 	$result = $prefix . $my_month . $prefix . $my_year;
 
-	if ( !$display )
-		return $result;
+	if ( !$display ) {
+			return $result;
+	}
 	echo $result;
 }
 
@@ -1332,14 +1367,16 @@ 
 	$text = wptexturize($text);
 	$url = esc_url($url);
 
-	if ('link' == $format)
-		$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
-	elseif ('option' == $format)
-		$link_html = "\t<option value='$url'>$before $text $after</option>\n";
-	elseif ('html' == $format)
-		$link_html = "\t<li>$before<a href='$url'>$text</a>$after</li>\n";
-	else // custom
+	if ('link' == $format) {
+			$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
+	} elseif ('option' == $format) {
+			$link_html = "\t<option value='$url'>$before $text $after</option>\n";
+	} elseif ('html' == $format) {
+			$link_html = "\t<li>$before<a href='$url'>$text</a>$after</li>\n";
+	} else {
+		// custom
 		$link_html = "\t$before<a href='$url'>$text</a>$after\n";
+	}
 
 	/**
 	 * Filter the archive link content.
@@ -1626,8 +1663,9 @@ 
 		}
 	}
 
-	if ( !is_array($cache) )
-		$cache = array();
+	if ( !is_array($cache) ) {
+			$cache = array();
+	}
 
 	// Quick check. If we have no posts at all, abort!
 	if ( !$posts ) {
@@ -1639,8 +1677,9 @@ 
 		}
 	}
 
-	if ( isset($_GET['w']) )
-		$w = ''.intval($_GET['w']);
+	if ( isset($_GET['w']) ) {
+			$w = ''.intval($_GET['w']);
+	}
 
 	// week_begins = 0 stands for Sunday
 	$week_begins = intval(get_option('start_of_week'));
@@ -1656,10 +1695,11 @@ 
 		$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
 	} elseif ( !empty($m) ) {
 		$thisyear = ''.intval(substr($m, 0, 4));
-		if ( strlen($m) < 6 )
-				$thismonth = '01';
-		else
-				$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
+		if ( strlen($m) < 6 ) {
+						$thismonth = '01';
+		} else {
+						$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
+		}
 	} else {
 		$thisyear = gmdate('Y', current_time('timestamp'));
 		$thismonth = gmdate('m', current_time('timestamp'));
@@ -1742,10 +1782,11 @@ 
 		}
 	}
 
-	if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'camino') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false)
-		$ak_title_separator = "\n";
-	else
-		$ak_title_separator = ', ';
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'camino') !== false || stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false) {
+			$ak_title_separator = "\n";
+	} else {
+			$ak_title_separator = ', ';
+	}
 
 	$ak_titles_for_day = array();
 	$ak_post_titles = $wpdb->get_results("SELECT ID, post_title, DAYOFMONTH(post_date) as dom "
@@ -1760,44 +1801,54 @@ 
 				/** This filter is documented in wp-includes/post-template.php */
 				$post_title = esc_attr( apply_filters( 'the_title', $ak_post_title->post_title, $ak_post_title->ID ) );
 
-				if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
-					$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
-				if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
+				if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) ) {
+									$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
+				}
+				if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) {
+					// first one
 					$ak_titles_for_day["$ak_post_title->dom"] = $post_title;
-				else
-					$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title;
+				} else {
+									$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title;
+				}
 		}
 	}
 
 	// See how much we should pad in the beginning
 	$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
-	if ( 0 != $pad )
-		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad">&nbsp;</td>';
+	if ( 0 != $pad ) {
+			$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr($pad) .'" class="pad">&nbsp;</td>';
+	}
 
 	$daysinmonth = intval(date('t', $unixmonth));
 	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
-		if ( isset($newrow) && $newrow )
-			$calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
+		if ( isset($newrow) && $newrow ) {
+					$calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
+		}
 		$newrow = false;
 
-		if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) )
-			$calendar_output .= '<td id="today">';
-		else
-			$calendar_output .= '<td>';
+		if ( $day == gmdate('j', current_time('timestamp')) && $thismonth == gmdate('m', current_time('timestamp')) && $thisyear == gmdate('Y', current_time('timestamp')) ) {
+					$calendar_output .= '<td id="today">';
+		} else {
+					$calendar_output .= '<td>';
+		}
 
-		if ( in_array($day, $daywithpost) ) // any posts today?
+		if ( in_array($day, $daywithpost) ) {
+			// any posts today?
 				$calendar_output .= '<a href="' . get_day_link( $thisyear, $thismonth, $day ) . '" title="' . esc_attr( $ak_titles_for_day[ $day ] ) . "\">$day</a>";
-		else
-			$calendar_output .= $day;
+		} else {
+					$calendar_output .= $day;
+		}
 		$calendar_output .= '</td>';
 
-		if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) )
-			$newrow = true;
+		if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) ) {
+					$newrow = true;
+		}
 	}
 
 	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
-	if ( $pad != 0 && $pad != 7 )
-		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'">&nbsp;</td>';
+	if ( $pad != 0 && $pad != 7 ) {
+			$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr($pad) .'">&nbsp;</td>';
+	}
 
 	$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
 
@@ -1911,10 +1962,11 @@ 
 		 */
 		$the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
 
-		if ( $echo )
-			echo $the_date;
-		else
-			return $the_date;
+		if ( $echo ) {
+					echo $the_date;
+		} else {
+					return $the_date;
+		}
 	}
 }
 
@@ -1983,10 +2035,11 @@ 
 	 */
 	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $d, $before, $after );
 
-	if ( $echo )
-		echo $the_modified_date;
-	else
-		return $the_modified_date;
+	if ( $echo ) {
+			echo $the_modified_date;
+	} else {
+			return $the_modified_date;
+	}
 
 }
 
@@ -1999,10 +2052,11 @@ 
  * @return string
  */
 function get_the_modified_date($d = '') {
-	if ( '' == $d )
-		$the_time = get_post_modified_time(get_option('date_format'), null, null, true);
-	else
-		$the_time = get_post_modified_time($d, null, null, true);
+	if ( '' == $d ) {
+			$the_time = get_post_modified_time(get_option('date_format'), null, null, true);
+	} else {
+			$the_time = get_post_modified_time($d, null, null, true);
+	}
 
 	/**
 	 * Filter the date a post was last modified.
@@ -2054,10 +2108,11 @@ 
 		return false;
 	}
 
-	if ( '' == $d )
-		$the_time = get_post_time(get_option('time_format'), false, $post, true);
-	else
-		$the_time = get_post_time($d, false, $post, true);
+	if ( '' == $d ) {
+			$the_time = get_post_time(get_option('time_format'), false, $post, true);
+	} else {
+			$the_time = get_post_time($d, false, $post, true);
+	}
 
 	/**
 	 * Filter the time a post was written.
@@ -2092,10 +2147,11 @@ 
 		return false;
 	}
 
-	if ( $gmt )
-		$time = $post->post_date_gmt;
-	else
-		$time = $post->post_date;
+	if ( $gmt ) {
+			$time = $post->post_date_gmt;
+	} else {
+			$time = $post->post_date;
+	}
 
 	$time = mysql2date($d, $time, $translate);
 
@@ -2142,10 +2198,11 @@ 
  * @return string
  */
 function get_the_modified_time($d = '') {
-	if ( '' == $d )
-		$the_time = get_post_modified_time(get_option('time_format'), null, null, true);
-	else
-		$the_time = get_post_modified_time($d, null, null, true);
+	if ( '' == $d ) {
+			$the_time = get_post_modified_time(get_option('time_format'), null, null, true);
+	} else {
+			$the_time = get_post_modified_time($d, null, null, true);
+	}
 
 	/**
 	 * Filter the localized time a post was last modified.
@@ -2179,10 +2236,11 @@ 
 		return false;
 	}
 
-	if ( $gmt )
-		$time = $post->post_modified_gmt;
-	else
-		$time = $post->post_modified;
+	if ( $gmt ) {
+			$time = $post->post_modified_gmt;
+	} else {
+			$time = $post->post_modified;
+	}
 	$time = mysql2date($d, $time, $translate);
 
 	/**
@@ -2292,8 +2350,9 @@ 
  * @param array $args Optional arguments.
  */
 function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
-		return;
+	if ( !current_theme_supports('automatic-feed-links') ) {
+			return;
+	}
 
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
@@ -2347,8 +2406,9 @@ 
 		}
 	} elseif ( is_post_type_archive() ) {
 		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
+		if ( is_array( $post_type ) ) {
+					$post_type = reset( $post_type );
+		}
 
 		$post_type_obj = get_post_type_object( $post_type );
 		$title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
@@ -2378,13 +2438,15 @@ 
 	} elseif ( is_post_type_archive() ) {
 		$title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
 		$post_type_obj = get_queried_object();
-		if ( $post_type_obj )
-			$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		if ( $post_type_obj ) {
+					$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		}
 	}
 
-	if ( isset($title) && isset($href) )
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
-}
+	if ( isset($title) && isset($href) ) {
+			echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
+	}
+	}
 
 /**
  * Display the link to the Really Simple Discovery service endpoint.
@@ -2420,9 +2482,10 @@ 
  */
 function noindex() {
 	// If the blog is not public, tell robots to go away.
-	if ( '0' == get_option('blog_public') )
-		wp_no_robots();
-}
+	if ( '0' == get_option('blog_public') ) {
+			wp_no_robots();
+	}
+	}
 
 /**
  * Display a noindex meta tag.
@@ -2559,8 +2622,9 @@ 
  * @param array  $settings  See _WP_Editors::editor().
  */
 function wp_editor( $content, $editor_id, $settings = array() ) {
-	if ( ! class_exists( '_WP_Editors' ) )
-		require( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists( '_WP_Editors' ) ) {
+			require( ABSPATH . WPINC . '/class-wp-editor.php' );
+	}
 
 	_WP_Editors::editor($content, $editor_id, $settings);
 }
@@ -2587,8 +2651,9 @@ 
 	 */
 	$query = apply_filters( 'get_search_query', get_query_var( 's' ) );
 
-	if ( $escaped )
-		$query = esc_attr( $query );
+	if ( $escaped ) {
+			$query = esc_attr( $query );
+	}
 	return $query;
 }
 
@@ -2624,15 +2689,18 @@ 
 function get_language_attributes( $doctype = 'html' ) {
 	$attributes = array();
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() )
-		$attributes[] = 'dir="rtl"';
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+			$attributes[] = 'dir="rtl"';
+	}
 
 	if ( $lang = get_bloginfo('language') ) {
-		if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
-			$attributes[] = "lang=\"$lang\"";
+		if ( get_option('html_type') == 'text/html' || $doctype == 'html' ) {
+					$attributes[] = "lang=\"$lang\"";
+		}
 
-		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
-			$attributes[] = "xml:lang=\"$lang\"";
+		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' ) {
+					$attributes[] = "xml:lang=\"$lang\"";
+		}
 	}
 
 	$output = implode(' ', $attributes);
@@ -2821,8 +2889,9 @@ 
 	if ( $args['prev_next'] && $current && 1 < $current ) :
 		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current - 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+		if ( $add_args ) {
+					$link = add_query_arg( $add_args, $link );
+		}
 		$link .= $args['add_fragment'];
 
 		/**
@@ -2838,12 +2907,15 @@ 
 		if ( $n == $current ) :
 			$page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
 			$dots = true;
-		else :
+		else {
+			:
 			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
 				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+		}
 				$link = str_replace( '%#%', $n, $link );
-				if ( $add_args )
-					$link = add_query_arg( $add_args, $link );
+				if ( $add_args ) {
+									$link = add_query_arg( $add_args, $link );
+				}
 				$link .= $args['add_fragment'];
 
 				/** This filter is documented in wp-includes/general-template.php */
@@ -2858,8 +2930,9 @@ 
 	if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
 		$link = str_replace( '%_%', $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current + 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+		if ( $add_args ) {
+					$link = add_query_arg( $add_args, $link );
+		}
 		$link .= $args['add_fragment'];
 
 		/** This filter is documented in wp-includes/general-template.php */
@@ -2906,8 +2979,9 @@ 
 function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
 	global $_wp_admin_css_colors;
 
-	if ( !isset($_wp_admin_css_colors) )
-		$_wp_admin_css_colors = array();
+	if ( !isset($_wp_admin_css_colors) ) {
+			$_wp_admin_css_colors = array();
+	}
 
 	$_wp_admin_css_colors[$key] = (object) array(
 		'name' => $name,
@@ -2935,8 +3009,9 @@ 
 	);
 
 	// Other color schemes are not available when running out of src
-	if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) )
-		return;
+	if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) ) {
+			return;
+	}
 
 	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
 		admin_url( "css/colors/light/colors$suffix.css" ),
@@ -3036,10 +3111,13 @@ 
 	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
 
 	if ( wp_styles()->query( $handle ) ) {
-		if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
+		if ( $force_echo || did_action( 'wp_print_styles' ) ) {
+			// we already printed the style queue. Print this one immediately
 			wp_print_styles( $handle );
-		else // Add to style queue
+		} else {
+			// Add to style queue
 			wp_enqueue_style( $handle );
+		}
 		return;
 	}
 
@@ -3075,9 +3153,10 @@ 
 	wp_enqueue_script( 'thickbox' );
 	wp_enqueue_style( 'thickbox' );
 
-	if ( is_network_admin() )
-		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
-}
+	if ( is_network_admin() ) {
+			add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
+	}
+	}
 
 /**
  * Display the XHTML generator that is generated on the wp_head hook.
@@ -3134,8 +3213,9 @@ 
 	if ( empty( $type ) ) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
-			return;
+		if ( empty( $current_filter ) ) {
+					return;
+		}
 
 		switch ( $current_filter ) {
 			case 'rss2_head' :
@@ -3258,13 +3338,15 @@ 
  * @return string html attribute or empty string
  */
 function __checked_selected_helper( $helper, $current, $echo, $type ) {
-	if ( (string) $helper === (string) $current )
-		$result = " $type='$type'";
-	else
-		$result = '';
+	if ( (string) $helper === (string) $current ) {
+			$result = " $type='$type'";
+	} else {
+			$result = '';
+	}
 
-	if ( $echo )
-		echo $result;
+	if ( $echo ) {
+			echo $result;
+	}
 
 	return $result;
 }
@@ -3280,11 +3362,13 @@ 
  * @return array $settings
  */
 function wp_heartbeat_settings( $settings ) {
-	if ( ! is_admin() )
-		$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+	if ( ! is_admin() ) {
+			$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+	}
 
-	if ( is_user_logged_in() )
-		$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	if ( is_user_logged_in() ) {
+			$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	}
 
 	return $settings;
 }

src/wp-includes/ID3/getid3.lib.php

Doc Comments +59 added lines

@@ -99,6 +99,9 @@ 
 	}
 
 
+	/**
+	 * @param string $binarynumerator
+	 */
 	public static function DecimalBinary2Float($binarynumerator) {
 		$numerator   = self::Bin2Dec($binarynumerator);
 		$denominator = self::Bin2Dec('1'.str_repeat('0', strlen($binarynumerator)));
@@ -106,6 +109,9 @@ 
 	}
 
 
+	/**
+	 * @param string $binarypointnumber
+	 */
 	public static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
 		if (strpos($binarypointnumber, '.') === false) {
@@ -177,6 +183,9 @@ 
 	}
 
 
+	/**
+	 * @param string $byteword
+	 */
 	public static function LittleEndian2Float($byteword) {
 		return self::BigEndian2Float(strrev($byteword));
 	}
@@ -366,6 +375,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $number
+	 */
 	public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
 		$intstring = '';
 		while ($number > 0) {
@@ -458,16 +470,25 @@ 
 	}
 
 
+	/**
+	 * @param string $rawdata
+	 */
 	public static function FixedPoint8_8($rawdata) {
 		return self::BigEndian2Int(substr($rawdata, 0, 1)) + (float) (self::BigEndian2Int(substr($rawdata, 1, 1)) / pow(2, 8));
 	}
 
 
+	/**
+	 * @param string $rawdata
+	 */
 	public static function FixedPoint16_16($rawdata) {
 		return self::BigEndian2Int(substr($rawdata, 0, 2)) + (float) (self::BigEndian2Int(substr($rawdata, 2, 2)) / pow(2, 16));
 	}
 
 
+	/**
+	 * @param string $rawdata
+	 */
 	public static function FixedPoint2_30($rawdata) {
 		$binarystring = self::BigEndian2Bin($rawdata);
 		return self::Bin2Dec(substr($binarystring, 0, 2)) + (float) (self::Bin2Dec(substr($binarystring, 2, 30)) / pow(2, 30));
@@ -531,6 +552,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param SimpleXMLElement $XMLobject
+	 */
 	public static function SimpleXMLelement2array($XMLobject) {
 		if (!is_object($XMLobject) && !is_array($XMLobject)) {
 			return $XMLobject;
@@ -631,6 +655,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $filename_dest
+	 */
 	public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
 		if (!self::intValueSupported($offset + $length)) {
 			throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
@@ -863,6 +890,10 @@ 
 	}
 
 	// UTF-16BE => UTF-8
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16be_utf8($string) {
 		if (substr($string, 0, 2) == "\xFE\xFF") {
 			// strip BOM
@@ -877,6 +908,10 @@ 
 	}
 
 	// UTF-16LE => UTF-8
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16le_utf8($string) {
 		if (substr($string, 0, 2) == "\xFF\xFE") {
 			// strip BOM
@@ -891,6 +926,10 @@ 
 	}
 
 	// UTF-16BE => ISO-8859-1
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16be_iso88591($string) {
 		if (substr($string, 0, 2) == "\xFE\xFF") {
 			// strip BOM
@@ -905,6 +944,10 @@ 
 	}
 
 	// UTF-16LE => ISO-8859-1
+
+	/**
+	 * @param string $string
+	 */
 	public static function iconv_fallback_utf16le_iso88591($string) {
 		if (substr($string, 0, 2) == "\xFF\xFE") {
 			// strip BOM
@@ -940,6 +983,9 @@ 
 		return $string;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function iconv_fallback($in_charset, $out_charset, $string) {
 
 		if ($in_charset == $out_charset) {
@@ -1271,6 +1317,12 @@ 
 	}
 
 
+	/**
+	 * @param integer $begin
+	 * @param integer $end
+	 * @param string $file
+	 * @param string $name
+	 */
 	public static function EmbeddedLookup($key, $begin, $end, $file, $name) {
 
 		// Cached
@@ -1317,6 +1369,10 @@ 
 		return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
 	}
 
+	/**
+	 * @param string $filename
+	 * @param string $sourcefile
+	 */
 	public static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
 		global $GETID3_ERRORARRAY;
 
@@ -1341,6 +1397,9 @@ 
 		return trim($string, "\x00");
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public static function getFileSizeSyscall($path) {
 		$filesize = false;
 

Indentation +5 added lines, -5 removed lines

@@ -1367,11 +1367,11 @@
 
 
 	/**
-	* Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
-	* @param string $path A path.
-	* @param string $suffix If the name component ends in suffix this will also be cut off.
-	* @return string
-	*/
+	 * Workaround for Bug #37268 (https://bugs.php.net/bug.php?id=37268)
+	 * @param string $path A path.
+	 * @param string $suffix If the name component ends in suffix this will also be cut off.
+	 * @return string
+	 */
 	public static function mb_basename($path, $suffix = null) {
 		$splited = preg_split('#/#', rtrim($path, '/ '));
 		return substr(basename('X'.$splited[count($splited) - 1], $suffix), 1);

Spacing +62 added lines, -62 removed lines

@@ -15,7 +15,7 @@ 
 class getid3_lib
 {
 
-	public static function PrintHexBytes($string, $hex=true, $spaces=true, $htmlencoding='UTF-8') {
+	public static function PrintHexBytes($string, $hex = true, $spaces = true, $htmlencoding = 'UTF-8') {
 		$returnstring = '';
 		for ($i = 0; $i < strlen($string); $i++) {
 			if ($hex) {
@@ -27,7 +27,7 @@ 
 				$returnstring .= ' ';
 			}
 		}
-		if (!empty($htmlencoding)) {
+		if ( ! empty($htmlencoding)) {
 			if ($htmlencoding === true) {
 				$htmlencoding = 'UTF-8'; // prior to getID3 v1.9.0 the function's 4th parameter was boolean
 			}
@@ -53,7 +53,7 @@ 
 	}
 
 
-	public static function safe_inc(&$variable, $increment=1) {
+	public static function safe_inc(&$variable, $increment = 1) {
 		if (isset($variable)) {
 			$variable += $increment;
 		} else {
@@ -82,7 +82,7 @@ 
 		static $hasINT64 = null;
 		if ($hasINT64 === null) { // 10x faster than is_null()
 			$hasINT64 = is_int(pow(2, 31)); // 32-bit int are limited to (2^31)-1
-			if (!$hasINT64 && !defined('PHP_INT_MIN')) {
+			if ( ! $hasINT64 && ! defined('PHP_INT_MIN')) {
 				define('PHP_INT_MIN', ~PHP_INT_MAX);
 			}
 		}
@@ -106,7 +106,7 @@ 
 	}
 
 
-	public static function NormalizeBinaryPoint($binarypointnumber, $maxbits=52) {
+	public static function NormalizeBinaryPoint($binarypointnumber, $maxbits = 52) {
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/binary.html
 		if (strpos($binarypointnumber, '.') === false) {
 			$binarypointnumber = '0.'.$binarypointnumber;
@@ -188,7 +188,7 @@ 
 		// http://www.scri.fsu.edu/~jac/MAD3401/Backgrnd/ieee.html
 
 		$bitword = self::BigEndian2Bin($byteword);
-		if (!$bitword) {
+		if ( ! $bitword) {
 			return 0;
 		}
 		$signbit = $bitword{0};
@@ -260,7 +260,7 @@ 
 	}
 
 
-	public static function BigEndian2Int($byteword, $synchsafe=false, $signed=false) {
+	public static function BigEndian2Int($byteword, $synchsafe = false, $signed = false) {
 		$intvalue = 0;
 		$bytewordlen = strlen($byteword);
 		if ($bytewordlen == 0) {
@@ -274,7 +274,7 @@ 
 				$intvalue += ord($byteword{$i}) * pow(256, ($bytewordlen - 1 - $i));
 			}
 		}
-		if ($signed && !$synchsafe) {
+		if ($signed && ! $synchsafe) {
 			// synchsafe ints are not allowed to be signed
 			if ($bytewordlen <= PHP_INT_SIZE) {
 				$signMaskBit = 0x80 << (8 * ($bytewordlen - 1));
@@ -289,7 +289,7 @@ 
 	}
 
 
-	public static function LittleEndian2Int($byteword, $signed=false) {
+	public static function LittleEndian2Int($byteword, $signed = false) {
 		return self::BigEndian2Int(strrev($byteword), false, $signed);
 	}
 
@@ -304,7 +304,7 @@ 
 	}
 
 
-	public static function BigEndian2String($number, $minbytes=1, $synchsafe=false, $signed=false) {
+	public static function BigEndian2String($number, $minbytes = 1, $synchsafe = false, $signed = false) {
 		if ($number < 0) {
 			throw new Exception('ERROR: self::BigEndian2String() does not support negative numbers');
 		}
@@ -339,7 +339,7 @@ 
 	}
 
 
-	public static function Bin2Dec($binstring, $signed=false) {
+	public static function Bin2Dec($binstring, $signed = false) {
 		$signmult = 1;
 		if ($signed) {
 			if ($binstring{0} == '1') {
@@ -366,7 +366,7 @@ 
 	}
 
 
-	public static function LittleEndian2String($number, $minbytes=1, $synchsafe=false) {
+	public static function LittleEndian2String($number, $minbytes = 1, $synchsafe = false) {
 		$intstring = '';
 		while ($number > 0) {
 			if ($synchsafe) {
@@ -384,7 +384,7 @@ 
 	public static function array_merge_clobber($array1, $array2) {
 		// written by kcØhireability*com
 		// taken from http://www.php.net/manual/en/function.array-merge-recursive.php
-		if (!is_array($array1) || !is_array($array2)) {
+		if ( ! is_array($array1) || ! is_array($array2)) {
 			return false;
 		}
 		$newarray = $array1;
@@ -400,14 +400,14 @@ 
 
 
 	public static function array_merge_noclobber($array1, $array2) {
-		if (!is_array($array1) || !is_array($array2)) {
+		if ( ! is_array($array1) || ! is_array($array2)) {
 			return false;
 		}
 		$newarray = $array1;
 		foreach ($array2 as $key => $val) {
 			if (is_array($val) && isset($newarray[$key]) && is_array($newarray[$key])) {
 				$newarray[$key] = self::array_merge_noclobber($newarray[$key], $val);
-			} elseif (!isset($newarray[$key])) {
+			} elseif ( ! isset($newarray[$key])) {
 				$newarray[$key] = $val;
 			}
 		}
@@ -425,7 +425,7 @@ 
 		return true;
 	}
 
-	public static function fileextension($filename, $numextensions=1) {
+	public static function fileextension($filename, $numextensions = 1) {
 		if (strstr($filename, '.')) {
 			$reversedfilename = strrev($filename);
 			$offset = 0;
@@ -444,9 +444,9 @@ 
 	public static function PlaytimeString($seconds) {
 		$sign = (($seconds < 0) ? '-' : '');
 		$seconds = round(abs($seconds));
-		$H = (int) floor( $seconds                            / 3600);
-		$M = (int) floor(($seconds - (3600 * $H)            ) /   60);
-		$S = (int) round( $seconds - (3600 * $H) - (60 * $M)        );
+		$H = (int) floor($seconds / 3600);
+		$M = (int) floor(($seconds - (3600 * $H)) / 60);
+		$S = (int) round($seconds - (3600 * $H) - (60 * $M));
 		return $sign.($H ? $H.':' : '').($H ? str_pad($M, 2, '0', STR_PAD_LEFT) : intval($M)).':'.str_pad($S, 2, 0, STR_PAD_LEFT);
 	}
 
@@ -490,11 +490,11 @@ 
 		return $ReturnedArray;
 	}
 
-	public static function array_max($arraydata, $returnkey=false) {
+	public static function array_max($arraydata, $returnkey = false) {
 		$maxvalue = false;
 		$maxkey = false;
 		foreach ($arraydata as $key => $value) {
-			if (!is_array($value)) {
+			if ( ! is_array($value)) {
 				if ($value > $maxvalue) {
 					$maxvalue = $value;
 					$maxkey = $key;
@@ -504,11 +504,11 @@ 
 		return ($returnkey ? $maxkey : $maxvalue);
 	}
 
-	public static function array_min($arraydata, $returnkey=false) {
+	public static function array_min($arraydata, $returnkey = false) {
 		$minvalue = false;
 		$minkey = false;
 		foreach ($arraydata as $key => $value) {
-			if (!is_array($value)) {
+			if ( ! is_array($value)) {
 				if ($value > $minvalue) {
 					$minvalue = $value;
 					$minkey = $key;
@@ -532,7 +532,7 @@ 
 	}
 
 	public static function SimpleXMLelement2array($XMLobject) {
-		if (!is_object($XMLobject) && !is_array($XMLobject)) {
+		if ( ! is_object($XMLobject) && ! is_array($XMLobject)) {
 			return $XMLobject;
 		}
 		$XMLarray = (is_object($XMLobject) ? get_object_vars($XMLobject) : $XMLobject);
@@ -547,7 +547,7 @@ 
 	// self::md5_data() - returns md5sum for a file from startuing position to absolute end position
 	public static function hash_data($file, $offset, $end, $algorithm) {
 		static $tempdir = '';
-		if (!self::intValueSupported($end)) {
+		if ( ! self::intValueSupported($end)) {
 			return false;
 		}
 		switch ($algorithm) {
@@ -581,7 +581,7 @@ 
 
 				$RequiredFiles = array('cygwin1.dll', 'head.exe', 'tail.exe', $windows_call);
 				foreach ($RequiredFiles as $required_file) {
-					if (!is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
+					if ( ! is_readable(GETID3_HELPERAPPSDIR.$required_file)) {
 						// helper apps not available - fall back to old method
 						break 2;
 					}
@@ -632,7 +632,7 @@ 
 	}
 
 	public static function CopyFileParts($filename_source, $filename_dest, $offset, $length) {
-		if (!self::intValueSupported($offset + $length)) {
+		if ( ! self::intValueSupported($offset + $length)) {
 			throw new Exception('cannot copy file portion, it extends beyond the '.round(PHP_INT_MAX / 1073741824).'GB limit');
 		}
 		if (is_readable($filename_source) && is_file($filename_source) && ($fp_src = fopen($filename_source, 'rb'))) {
@@ -664,25 +664,25 @@ 
 			$newcharstring = chr($charval);
 		} elseif ($charval < 2048) {
 			// 110bbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>   6) | 0xC0);
+			$newcharstring  = chr(($charval >> 6) | 0xC0);
 			$newcharstring .= chr(($charval & 0x3F) | 0x80);
 		} elseif ($charval < 65536) {
 			// 1110bbbb 10bbbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>  12) | 0xE0);
-			$newcharstring .= chr(($charval >>   6) | 0xC0);
+			$newcharstring  = chr(($charval >> 12) | 0xE0);
+			$newcharstring .= chr(($charval >> 6) | 0xC0);
 			$newcharstring .= chr(($charval & 0x3F) | 0x80);
 		} else {
 			// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
-			$newcharstring  = chr(($charval >>  18) | 0xF0);
-			$newcharstring .= chr(($charval >>  12) | 0xC0);
-			$newcharstring .= chr(($charval >>   6) | 0xC0);
+			$newcharstring  = chr(($charval >> 18) | 0xF0);
+			$newcharstring .= chr(($charval >> 12) | 0xC0);
+			$newcharstring .= chr(($charval >> 6) | 0xC0);
 			$newcharstring .= chr(($charval & 0x3F) | 0x80);
 		}
 		return $newcharstring;
 	}
 
 	// ISO-8859-1 => UTF-8
-	public static function iconv_fallback_iso88591_utf8($string, $bom=false) {
+	public static function iconv_fallback_iso88591_utf8($string, $bom = false) {
 		if (function_exists('utf8_encode')) {
 			return utf8_encode($string);
 		}
@@ -699,7 +699,7 @@ 
 	}
 
 	// ISO-8859-1 => UTF-16BE
-	public static function iconv_fallback_iso88591_utf16be($string, $bom=false) {
+	public static function iconv_fallback_iso88591_utf16be($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFE\xFF";
@@ -711,7 +711,7 @@ 
 	}
 
 	// ISO-8859-1 => UTF-16LE
-	public static function iconv_fallback_iso88591_utf16le($string, $bom=false) {
+	public static function iconv_fallback_iso88591_utf16le($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFF\xFE";
@@ -741,18 +741,18 @@ 
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
 						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 2)}) & 0x3F) << 6) &
 							(ord($string{($offset + 3)}) & 0x3F);
 				$offset += 4;
 			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 1)}) & 0x3F) << 6) &
 							(ord($string{($offset + 2)}) & 0x3F);
 				$offset += 3;
 			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
+				$charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
 							(ord($string{($offset + 1)}) & 0x3F);
 				$offset += 2;
 			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
@@ -772,7 +772,7 @@ 
 	}
 
 	// UTF-8 => UTF-16BE
-	public static function iconv_fallback_utf8_utf16be($string, $bom=false) {
+	public static function iconv_fallback_utf8_utf16be($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFE\xFF";
@@ -784,18 +784,18 @@ 
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
 						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 2)}) & 0x3F) << 6) &
 							(ord($string{($offset + 3)}) & 0x3F);
 				$offset += 4;
 			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 1)}) & 0x3F) << 6) &
 							(ord($string{($offset + 2)}) & 0x3F);
 				$offset += 3;
 			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
+				$charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
 							(ord($string{($offset + 1)}) & 0x3F);
 				$offset += 2;
 			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
@@ -815,7 +815,7 @@ 
 	}
 
 	// UTF-8 => UTF-16LE
-	public static function iconv_fallback_utf8_utf16le($string, $bom=false) {
+	public static function iconv_fallback_utf8_utf16le($string, $bom = false) {
 		$newcharstring = '';
 		if ($bom) {
 			$newcharstring .= "\xFF\xFE";
@@ -827,18 +827,18 @@ 
 				// 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x07) << 18) &
 						   ((ord($string{($offset + 1)}) & 0x3F) << 12) &
-						   ((ord($string{($offset + 2)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 2)}) & 0x3F) << 6) &
 							(ord($string{($offset + 3)}) & 0x3F);
 				$offset += 4;
 			} elseif ((ord($string{$offset}) | 0x0F) == 0xEF) {
 				// 1110bbbb 10bbbbbb 10bbbbbb
 				$charval = ((ord($string{($offset + 0)}) & 0x0F) << 12) &
-						   ((ord($string{($offset + 1)}) & 0x3F) <<  6) &
+						   ((ord($string{($offset + 1)}) & 0x3F) << 6) &
 							(ord($string{($offset + 2)}) & 0x3F);
 				$offset += 3;
 			} elseif ((ord($string{$offset}) | 0x1F) == 0xDF) {
 				// 110bbbbb 10bbbbbb
-				$charval = ((ord($string{($offset + 0)}) & 0x1F) <<  6) &
+				$charval = ((ord($string{($offset + 0)}) & 0x1F) << 6) &
 							(ord($string{($offset + 1)}) & 0x3F);
 				$offset += 2;
 			} elseif ((ord($string{$offset}) | 0x7F) == 0x7F) {
@@ -988,7 +988,7 @@ 
 		throw new Exception('PHP does not have iconv() support - cannot convert from '.$in_charset.' to '.$out_charset);
 	}
 
-	public static function recursiveMultiByteCharString2HTML($data, $charset='ISO-8859-1') {
+	public static function recursiveMultiByteCharString2HTML($data, $charset = 'ISO-8859-1') {
 		if (is_string($data)) {
 			return self::MultiByteCharString2HTML($data, $charset);
 		} elseif (is_array($data)) {
@@ -1002,7 +1002,7 @@ 
 		return $data;
 	}
 
-	public static function MultiByteCharString2HTML($string, $charset='ISO-8859-1') {
+	public static function MultiByteCharString2HTML($string, $charset = 'ISO-8859-1') {
 		$string = (string) $string; // in case trying to pass a numeric (float, int) string, would otherwise return an empty string
 		$HTMLstring = '';
 
@@ -1044,16 +1044,16 @@ 
 					$charval = 0;
 					if ($char_ord_val < 0x80) {
 						$charval = $char_ord_val;
-					} elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F  &&  $i+3 < $strlen) {
+					} elseif ((($char_ord_val & 0xF0) >> 4) == 0x0F && $i + 3 < $strlen) {
 						$charval  = (($char_ord_val & 0x07) << 18);
 						$charval += ((ord($string{++$i}) & 0x3F) << 12);
 						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
-					} elseif ((($char_ord_val & 0xE0) >> 5) == 0x07  &&  $i+2 < $strlen) {
+						$charval += (ord($string{++$i}) & 0x3F);
+					} elseif ((($char_ord_val & 0xE0) >> 5) == 0x07 && $i + 2 < $strlen) {
 						$charval  = (($char_ord_val & 0x0F) << 12);
 						$charval += ((ord($string{++$i}) & 0x3F) << 6);
-						$charval +=  (ord($string{++$i}) & 0x3F);
-					} elseif ((($char_ord_val & 0xC0) >> 6) == 0x03  &&  $i+1 < $strlen) {
+						$charval += (ord($string{++$i}) & 0x3F);
+					} elseif ((($char_ord_val & 0xC0) >> 6) == 0x03 && $i + 1 < $strlen) {
 						$charval  = (($char_ord_val & 0x1F) << 6);
 						$charval += (ord($string{++$i}) & 0x3F);
 					}
@@ -1150,7 +1150,7 @@ 
 	}
 
 
-	public static function GetDataImageSize($imgData, &$imageinfo=array()) {
+	public static function GetDataImageSize($imgData, &$imageinfo = array()) {
 		static $tempdir = '';
 		if (empty($tempdir)) {
 			// yes this is ugly, feel free to suggest a better way
@@ -1202,11 +1202,11 @@ 
 	public static function CopyTagsToComments(&$ThisFileInfo) {
 
 		// Copy all entries from ['tags'] into common ['comments']
-		if (!empty($ThisFileInfo['tags'])) {
+		if ( ! empty($ThisFileInfo['tags'])) {
 			foreach ($ThisFileInfo['tags'] as $tagtype => $tagarray) {
 				foreach ($tagarray as $tagname => $tagdata) {
 					foreach ($tagdata as $key => $value) {
-						if (!empty($value)) {
+						if ( ! empty($value)) {
 							if (empty($ThisFileInfo['comments'][$tagname])) {
 
 								// fall through and append value
@@ -1222,7 +1222,7 @@ 
 									}
 								}
 
-							} elseif (!is_array($value)) {
+							} elseif ( ! is_array($value)) {
 
 								$newvaluelength = strlen(trim($value));
 								foreach ($ThisFileInfo['comments'][$tagname] as $existingkey => $existingvalue) {
@@ -1235,9 +1235,9 @@ 
 								}
 
 							}
-							if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || !in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
+							if (is_array($value) || empty($ThisFileInfo['comments'][$tagname]) || ! in_array(trim($value), $ThisFileInfo['comments'][$tagname])) {
 								$value = (is_string($value) ? trim($value) : $value);
-								if (!is_numeric($key)) {
+								if ( ! is_numeric($key)) {
 									$ThisFileInfo['comments'][$tagname][$key] = $value;
 								} else {
 									$ThisFileInfo['comments'][$tagname][]     = $value;
@@ -1249,7 +1249,7 @@ 
 			}
 
 			// Copy to ['comments_html']
-			if (!empty($ThisFileInfo['comments'])) {
+			if ( ! empty($ThisFileInfo['comments'])) {
 				foreach ($ThisFileInfo['comments'] as $field => $values) {
 					if ($field == 'picture') {
 						// pictures can take up a lot of space, and we don't need multiple copies of them
@@ -1317,7 +1317,7 @@ 
 		return (isset($cache[$file][$name][$key]) ? $cache[$file][$name][$key] : '');
 	}
 
-	public static function IncludeDependency($filename, $sourcefile, $DieOnFailure=false) {
+	public static function IncludeDependency($filename, $sourcefile, $DieOnFailure = false) {
 		global $GETID3_ERRORARRAY;
 
 		if (file_exists($filename)) {

src/wp-includes/ID3/getid3.php

Doc Comments +39 added lines

@@ -335,6 +335,10 @@ 
 	}
 
 	// public: analyze file
+
+	/**
+	 * @param string $filename
+	 */
 	public function analyze($filename) {
 		try {
 			if (!$this->openfile($filename)) {
@@ -486,6 +490,10 @@ 
 
 
 	// private: error handling
+
+	/**
+	 * @param string $message
+	 */
 	public function error($message) {
 		$this->CleanUp();
 		if (!isset($this->info['error'])) {
@@ -1097,6 +1105,9 @@ 
 
 
 
+	/**
+	 * @param string $filedata
+	 */
 	public function GetFileFormat(&$filedata, $filename='') {
 		// this function will determine the format of a file based on usually
 		// the first 2-4 bytes of the file (8 bytes for PNG, 16 bytes for JPG,
@@ -1136,6 +1147,10 @@ 
 
 
 	// converts array to $encoding charset from $this->encoding
+
+	/**
+	 * @param string $encoding
+	 */
 	public function CharConvert(&$array, $encoding) {
 
 		// identical encoding - end here
@@ -1280,6 +1295,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $algorithm
+	 */
 	public function getHashdata($algorithm) {
 		switch ($algorithm) {
 			case 'md5':
@@ -1573,6 +1591,9 @@ 
 		return tempnam($this->tempdir, 'gI3');
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function include_module($name) {
 		//if (!file_exists($this->include_path.'module.'.$name.'.php')) {
 		if (!file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
@@ -1600,6 +1621,9 @@ 
 	private $dependency_to = null;
 
 
+	/**
+	 * @param string $call_module
+	 */
 	public function __construct(getID3 $getid3, $call_module=null) {
 		$this->getid3 = $getid3;
 
@@ -1664,6 +1688,9 @@ 
 		return fread($this->getid3->fp, $bytes);
 	}
 
+	/**
+	 * @param integer $whence
+	 */
 	protected function fseek($bytes, $whence=SEEK_SET) {
 		if ($this->data_string_flag) {
 			switch ($whence) {
@@ -1701,20 +1728,32 @@ 
 		return feof($this->getid3->fp);
 	}
 
+	/**
+	 * @param string $module
+	 */
 	final protected function isDependencyFor($module) {
 		return $this->dependency_to == $module;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function error($text) {
 		$this->getid3->info['error'][] = $text;
 
 		return false;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function warning($text) {
 		return $this->getid3->warning($text);
 	}
 
+	/**
+	 * @param string $text
+	 */
 	protected function notice($text) {
 		// does nothing for now
 	}

Indentation +2 added lines, -2 removed lines

@@ -1588,8 +1588,8 @@
 abstract class getid3_handler {
 
 	/**
-	* @var getID3
-	*/
+	 * @var getID3
+	 */
 	protected $getid3;                       // pointer
 
 	protected $data_string_flag     = false; // analyzing filepointer or string

Spacing +111 added lines, -111 removed lines

@@ -11,24 +11,24 @@ 
 /////////////////////////////////////////////////////////////////
 
 // define a constant rather than looking up every time it is needed
-if (!defined('GETID3_OS_ISWINDOWS')) {
+if ( ! defined('GETID3_OS_ISWINDOWS')) {
 	define('GETID3_OS_ISWINDOWS', (stripos(PHP_OS, 'WIN') === 0));
 }
 // Get base path of getID3() - ONCE
-if (!defined('GETID3_INCLUDEPATH')) {
+if ( ! defined('GETID3_INCLUDEPATH')) {
 	define('GETID3_INCLUDEPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
 }
 // Workaround Bug #39923 (https://bugs.php.net/bug.php?id=39923)
-if (!defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
+if ( ! defined('IMG_JPG') && defined('IMAGETYPE_JPEG')) {
 	define('IMG_JPG', IMAGETYPE_JPEG);
 }
 
 // attempt to define temp dir as something flexible but reliable
 $temp_dir = ini_get('upload_tmp_dir');
-if ($temp_dir && (!is_dir($temp_dir) || !is_readable($temp_dir))) {
+if ($temp_dir && ( ! is_dir($temp_dir) || ! is_readable($temp_dir))) {
 	$temp_dir = '';
 }
-if (!$temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1
+if ( ! $temp_dir && function_exists('sys_get_temp_dir')) { // sys_get_temp_dir added in PHP v5.2.1
 	// sys_get_temp_dir() may give inaccessible temp dir, e.g. with open_basedir on virtual hosts
 	$temp_dir = sys_get_temp_dir();
 }
@@ -52,16 +52,16 @@ 
 			break;
 		}
 	}
-	if (!$found_valid_tempdir) {
+	if ( ! $found_valid_tempdir) {
 		$temp_dir = '';
 	}
 	unset($open_basedirs, $found_valid_tempdir, $basedir);
 }
-if (!$temp_dir) {
+if ( ! $temp_dir) {
 	$temp_dir = '*'; // invalid directory name should force tempnam() to use system default temp dir
 }
 // $temp_dir = '/something/else/';  // feel free to override temp dir here if it works better for your system
-if (!defined('GETID3_TEMP_DIR')) {
+if ( ! defined('GETID3_TEMP_DIR')) {
 	define('GETID3_TEMP_DIR', $temp_dir);
 }
 unset($open_basedir, $temp_dir);
@@ -72,19 +72,19 @@ 
 class getID3
 {
 	// public: Settings
-	public $encoding        = 'UTF-8';        // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE
-	public $encoding_id3v1  = 'ISO-8859-1';   // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
+	public $encoding        = 'UTF-8'; // CASE SENSITIVE! - i.e. (must be supported by iconv()). Examples:  ISO-8859-1  UTF-8  UTF-16  UTF-16BE
+	public $encoding_id3v1  = 'ISO-8859-1'; // Should always be 'ISO-8859-1', but some tags may be written in other encodings such as 'EUC-CN' or 'CP1252'
 
 	// public: Optional tag checks - disable for speed.
-	public $option_tag_id3v1         = true;  // Read and process ID3v1 tags
-	public $option_tag_id3v2         = true;  // Read and process ID3v2 tags
-	public $option_tag_lyrics3       = true;  // Read and process Lyrics3 tags
-	public $option_tag_apetag        = true;  // Read and process APE tags
-	public $option_tags_process      = true;  // Copy tags to root key 'tags' and encode to $this->encoding
-	public $option_tags_html         = true;  // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
+	public $option_tag_id3v1         = true; // Read and process ID3v1 tags
+	public $option_tag_id3v2         = true; // Read and process ID3v2 tags
+	public $option_tag_lyrics3       = true; // Read and process Lyrics3 tags
+	public $option_tag_apetag        = true; // Read and process APE tags
+	public $option_tags_process      = true; // Copy tags to root key 'tags' and encode to $this->encoding
+	public $option_tags_html         = true; // Copy tags to root key 'tags_html' properly translated from various encodings to HTML entities
 
 	// public: Optional tag/comment calucations
-	public $option_extra_info        = true;  // Calculate additional info such as bitrate, channelmode etc
+	public $option_extra_info        = true; // Calculate additional info such as bitrate, channelmode etc
 
 	// public: Optional handling of embedded attachments (e.g. images)
 	public $option_save_attachments  = true; // defaults to true (ATTACHMENTS_INLINE) for backward compatibility
@@ -93,15 +93,15 @@ 
 	public $option_md5_data          = false; // Get MD5 sum of data part - slow
 	public $option_md5_data_source   = false; // Use MD5 of source file if availble - only FLAC and OptimFROG
 	public $option_sha1_data         = false; // Get SHA1 sum of data part - slow
-	public $option_max_2gb_check     = null;  // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
+	public $option_max_2gb_check     = null; // Check whether file is larger than 2GB and thus not supported by 32-bit PHP (null: auto-detect based on PHP_INT_MAX)
 
 	// public: Read buffer size in bytes
 	public $option_fread_buffer_size = 32768;
 
 	// Public variables
-	public $filename;                         // Filename of file being analysed.
-	public $fp;                               // Filepointer to file being analysed.
-	public $info;                             // Result array.
+	public $filename; // Filename of file being analysed.
+	public $fp; // Filepointer to file being analysed.
+	public $info; // Result array.
 	public $tempdir = GETID3_TEMP_DIR;
 	public $memory_limit = 0;
 
@@ -159,7 +159,7 @@ 
 		}
 
 		// Load support library
-		if (!include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
+		if ( ! include_once(GETID3_INCLUDEPATH.'getid3.lib.php')) {
 			$this->startup_error .= 'getid3.lib.php is missing or corrupt';
 		}
 
@@ -174,18 +174,18 @@ 
 		// This path cannot contain spaces, but the below code will attempt to get the
 		//   8.3-equivalent path automatically
 		// IMPORTANT: This path must include the trailing slash
-		if (GETID3_OS_ISWINDOWS && !defined('GETID3_HELPERAPPSDIR')) {
+		if (GETID3_OS_ISWINDOWS && ! defined('GETID3_HELPERAPPSDIR')) {
 
 			$helperappsdir = GETID3_INCLUDEPATH.'..'.DIRECTORY_SEPARATOR.'helperapps'; // must not have any space in this path
 
-			if (!is_dir($helperappsdir)) {
+			if ( ! is_dir($helperappsdir)) {
 				$this->startup_warning .= '"'.$helperappsdir.'" cannot be defined as GETID3_HELPERAPPSDIR because it does not exist';
 			} elseif (strpos(realpath($helperappsdir), ' ') !== false) {
 				$DirPieces = explode(DIRECTORY_SEPARATOR, realpath($helperappsdir));
 				$path_so_far = array();
 				foreach ($DirPieces as $key => $value) {
 					if (strpos($value, ' ') !== false) {
-						if (!empty($path_so_far)) {
+						if ( ! empty($path_so_far)) {
 							$commandline = 'dir /x '.escapeshellarg(implode(DIRECTORY_SEPARATOR, $path_so_far));
 							$dir_listing = `$commandline`;
 							$lines = explode("\n", $dir_listing);
@@ -223,7 +223,7 @@ 
 
 	// public: setOption
 	public function setOption($optArray) {
-		if (!is_array($optArray) || empty($optArray)) {
+		if ( ! is_array($optArray) || empty($optArray)) {
 			return false;
 		}
 		foreach ($optArray as $opt => $val) {
@@ -238,10 +238,10 @@ 
 
 	public function openfile($filename) {
 		try {
-			if (!empty($this->startup_error)) {
+			if ( ! empty($this->startup_error)) {
 				throw new getid3_exception($this->startup_error);
 			}
-			if (!empty($this->startup_warning)) {
+			if ( ! empty($this->startup_warning)) {
 				$this->warning($this->startup_warning);
 			}
 
@@ -265,13 +265,13 @@ 
 				// great
 			} else {
 				$errormessagelist = array();
-				if (!is_readable($filename)) {
+				if ( ! is_readable($filename)) {
 					$errormessagelist[] = '!is_readable';
 				}
-				if (!is_file($filename)) {
+				if ( ! is_file($filename)) {
 					$errormessagelist[] = '!is_file';
 				}
-				if (!file_exists($filename)) {
+				if ( ! file_exists($filename)) {
 					$errormessagelist[] = '!file_exists';
 				}
 				if (empty($errormessagelist)) {
@@ -317,14 +317,14 @@ 
 			// set more parameters
 			$this->info['avdataoffset']        = 0;
 			$this->info['avdataend']           = $this->info['filesize'];
-			$this->info['fileformat']          = '';                // filled in later
-			$this->info['audio']['dataformat'] = '';                // filled in later, unset if not used
-			$this->info['video']['dataformat'] = '';                // filled in later, unset if not used
-			$this->info['tags']                = array();           // filled in later, unset if not used
-			$this->info['error']               = array();           // filled in later, unset if not used
-			$this->info['warning']             = array();           // filled in later, unset if not used
-			$this->info['comments']            = array();           // filled in later, unset if not used
-			$this->info['encoding']            = $this->encoding;   // required by id3v2 and iso modules - can be unset at the end if desired
+			$this->info['fileformat']          = ''; // filled in later
+			$this->info['audio']['dataformat'] = ''; // filled in later, unset if not used
+			$this->info['video']['dataformat'] = ''; // filled in later, unset if not used
+			$this->info['tags']                = array(); // filled in later, unset if not used
+			$this->info['error']               = array(); // filled in later, unset if not used
+			$this->info['warning']             = array(); // filled in later, unset if not used
+			$this->info['comments']            = array(); // filled in later, unset if not used
+			$this->info['encoding']            = $this->encoding; // required by id3v2 and iso modules - can be unset at the end if desired
 
 			return true;
 
@@ -337,7 +337,7 @@ 
 	// public: analyze file
 	public function analyze($filename) {
 		try {
-			if (!$this->openfile($filename)) {
+			if ( ! $this->openfile($filename)) {
 				return $this->info;
 			}
 
@@ -366,7 +366,7 @@ 
 			}
 
 			// ID3v2 detection (NOT parsing), even if ($this->option_tag_id3v2 == false) done to make fileformat easier
-			if (!$this->option_tag_id3v2) {
+			if ( ! $this->option_tag_id3v2) {
 				fseek($this->fp, 0);
 				$header = fread($this->fp, 10);
 				if ((substr($header, 0, 3) == 'ID3') && (strlen($header) == 10)) {
@@ -385,7 +385,7 @@ 
 			$determined_format = $this->GetFileFormat($formattest, $filename);
 
 			// unable to determine file format
-			if (!$determined_format) {
+			if ( ! $determined_format) {
 				fclose($this->fp);
 				return $this->error('unable to determine file format');
 			}
@@ -414,14 +414,14 @@ 
 			$this->info['mime_type'] = $determined_format['mime_type'];
 
 			// supported format signature pattern detected, but module deleted
-			if (!file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
+			if ( ! file_exists(GETID3_INCLUDEPATH.$determined_format['include'])) {
 				fclose($this->fp);
 				return $this->error('Format not supported, module "'.$determined_format['include'].'" was removed.');
 			}
 
 			// module requires iconv support
 			// Check encoding/iconv support
-			if (!empty($determined_format['iconv_req']) && !function_exists('iconv') && !in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
+			if ( ! empty($determined_format['iconv_req']) && ! function_exists('iconv') && ! in_array($this->encoding, array('ISO-8859-1', 'UTF-8', 'UTF-16LE', 'UTF-16BE', 'UTF-16'))) {
 				$errormessage = 'iconv() support is required for this module ('.$determined_format['include'].') for encodings other than ISO-8859-1, UTF-8, UTF-16LE, UTF16-BE, UTF-16. ';
 				if (GETID3_OS_ISWINDOWS) {
 					$errormessage .= 'PHP does not have iconv() support. Please enable php_iconv.dll in php.ini, and copy iconv.dll from c:/php/dlls to c:/windows/system32';
@@ -436,7 +436,7 @@ 
 
 			// instantiate module class
 			$class_name = 'getid3_'.$determined_format['module'];
-			if (!class_exists($class_name)) {
+			if ( ! class_exists($class_name)) {
 				return $this->error('Format not supported, module "'.$determined_format['include'].'" is corrupt.');
 			}
 			$class = new $class_name($this);
@@ -463,7 +463,7 @@ 
 			// get the MD5 sum of the audio/video portion of the file - without ID3/APE/Lyrics3/etc header/footer tags
 			if ($this->option_md5_data) {
 				// do not calc md5_data if md5_data_source is present - set by flac only - future MPC/SV8 too
-				if (!$this->option_md5_data_source || empty($this->info['md5_data_source'])) {
+				if ( ! $this->option_md5_data_source || empty($this->info['md5_data_source'])) {
 					$this->getHashdata('md5');
 				}
 			}
@@ -488,7 +488,7 @@ 
 	// private: error handling
 	public function error($message) {
 		$this->CleanUp();
-		if (!isset($this->info['error'])) {
+		if ( ! isset($this->info['error'])) {
 			$this->info['error'] = array();
 		}
 		$this->info['error'][] = $message;
@@ -518,7 +518,7 @@ 
 		}
 
 		// remove empty root keys
-		if (!empty($this->info)) {
+		if ( ! empty($this->info)) {
 			foreach ($this->info as $key => $value) {
 				if (empty($this->info[$key]) && ($this->info[$key] !== 0) && ($this->info[$key] !== '0')) {
 					unset($this->info[$key]);
@@ -537,10 +537,10 @@ 
 		}
 
 		// remove possible duplicated identical entries
-		if (!empty($this->info['error'])) {
+		if ( ! empty($this->info['error'])) {
 			$this->info['error'] = array_values(array_unique($this->info['error']));
 		}
-		if (!empty($this->info['warning'])) {
+		if ( ! empty($this->info['warning'])) {
 			$this->info['warning'] = array_values(array_unique($this->info['warning']));
 		}
 
@@ -764,7 +764,7 @@ 
 
 				// TTA  - audio       - TTA Lossless Audio Compressor (http://tta.corecodec.org)
 				'tta'  => array(
-							'pattern'   => '^TTA',  // could also be '^TTA(\x01|\x02|\x03|2|1)'
+							'pattern'   => '^TTA', // could also be '^TTA(\x01|\x02|\x03|2|1)'
 							'group'     => 'audio',
 							'module'    => 'tta',
 							'mime_type' => 'application/octet-stream',
@@ -1052,7 +1052,7 @@ 
 				// Misc other formats
 
 				// PAR2 - data        - Parity Volume Set Specification 2.0
-				'par2' => array (
+				'par2' => array(
 							'pattern'   => '^PAR2\x00PKT',
 							'group'     => 'misc',
 							'module'    => 'par2',
@@ -1097,7 +1097,7 @@ 
 
 
 
-	public function GetFileFormat(&$filedata, $filename='') {
+	public function GetFileFormat(&$filedata, $filename = '') {
 		// this function will determine the format of a file based on usually
 		// the first 2-4 bytes of the file (8 bytes for PNG, 16 bytes for JPG,
 		// and in the case of ISO CD image, 6 bytes offset 32kb from the start
@@ -1107,7 +1107,7 @@ 
 		foreach ($this->GetFileFormatArray() as $format_name => $info) {
 			// The /s switch on preg_match() forces preg_match() NOT to treat
 			// newline (0x0A) characters as special chars but do a binary match
-			if (!empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
+			if ( ! empty($info['pattern']) && preg_match('#'.$info['pattern'].'#s', $filedata)) {
 				$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
 				return $info;
 			}
@@ -1127,7 +1127,7 @@ 
 			// and verify there's at least one instance of "TRACK xx AUDIO" in the file
 			$GetFileFormatArray = $this->GetFileFormatArray();
 			$info = $GetFileFormatArray['cue'];
-			$info['include']   = 'module.'.$info['group'].'.'.$info['module'].'.php';
+			$info['include'] = 'module.'.$info['group'].'.'.$info['module'].'.php';
 			return $info;
 		}
 
@@ -1165,26 +1165,26 @@ 
 		static $tags;
 		if (empty($tags)) {
 			$tags = array(
-				'asf'       => array('asf'           , 'UTF-16LE'),
-				'midi'      => array('midi'          , 'ISO-8859-1'),
-				'nsv'       => array('nsv'           , 'ISO-8859-1'),
-				'ogg'       => array('vorbiscomment' , 'UTF-8'),
-				'png'       => array('png'           , 'UTF-8'),
-				'tiff'      => array('tiff'          , 'ISO-8859-1'),
-				'quicktime' => array('quicktime'     , 'UTF-8'),
-				'real'      => array('real'          , 'ISO-8859-1'),
-				'vqf'       => array('vqf'           , 'ISO-8859-1'),
-				'zip'       => array('zip'           , 'ISO-8859-1'),
-				'riff'      => array('riff'          , 'ISO-8859-1'),
-				'lyrics3'   => array('lyrics3'       , 'ISO-8859-1'),
-				'id3v1'     => array('id3v1'         , $this->encoding_id3v1),
-				'id3v2'     => array('id3v2'         , 'UTF-8'), // not according to the specs (every frame can have a different encoding), but getID3() force-converts all encodings to UTF-8
-				'ape'       => array('ape'           , 'UTF-8'),
-				'cue'       => array('cue'           , 'ISO-8859-1'),
-				'matroska'  => array('matroska'      , 'UTF-8'),
-				'flac'      => array('vorbiscomment' , 'UTF-8'),
-				'divxtag'   => array('divx'          , 'ISO-8859-1'),
-				'iptc'      => array('iptc'          , 'ISO-8859-1'),
+				'asf'       => array('asf', 'UTF-16LE'),
+				'midi'      => array('midi', 'ISO-8859-1'),
+				'nsv'       => array('nsv', 'ISO-8859-1'),
+				'ogg'       => array('vorbiscomment', 'UTF-8'),
+				'png'       => array('png', 'UTF-8'),
+				'tiff'      => array('tiff', 'ISO-8859-1'),
+				'quicktime' => array('quicktime', 'UTF-8'),
+				'real'      => array('real', 'ISO-8859-1'),
+				'vqf'       => array('vqf', 'ISO-8859-1'),
+				'zip'       => array('zip', 'ISO-8859-1'),
+				'riff'      => array('riff', 'ISO-8859-1'),
+				'lyrics3'   => array('lyrics3', 'ISO-8859-1'),
+				'id3v1'     => array('id3v1', $this->encoding_id3v1),
+				'id3v2'     => array('id3v2', 'UTF-8'), // not according to the specs (every frame can have a different encoding), but getID3() force-converts all encodings to UTF-8
+				'ape'       => array('ape', 'UTF-8'),
+				'cue'       => array('cue', 'ISO-8859-1'),
+				'matroska'  => array('matroska', 'UTF-8'),
+				'flac'      => array('vorbiscomment', 'UTF-8'),
+				'divxtag'   => array('divx', 'ISO-8859-1'),
+				'iptc'      => array('iptc', 'ISO-8859-1'),
 			);
 		}
 
@@ -1193,19 +1193,19 @@ 
 			list($tag_name, $encoding) = $tagname_encoding_array;
 
 			// fill in default encoding type if not already present
-			if (isset($this->info[$comment_name]) && !isset($this->info[$comment_name]['encoding'])) {
+			if (isset($this->info[$comment_name]) && ! isset($this->info[$comment_name]['encoding'])) {
 				$this->info[$comment_name]['encoding'] = $encoding;
 			}
 
 			// copy comments if key name set
-			if (!empty($this->info[$comment_name]['comments'])) {
+			if ( ! empty($this->info[$comment_name]['comments'])) {
 				foreach ($this->info[$comment_name]['comments'] as $tag_key => $valuearray) {
 					foreach ($valuearray as $key => $value) {
 						if (is_string($value)) {
 							$value = trim($value, " \r\n\t"); // do not trim nulls from $value!! Unicode characters will get mangled if trailing nulls are removed!
 						}
 						if ($value) {
-							if (!is_numeric($key)) {
+							if ( ! is_numeric($key)) {
 								$this->info['tags'][trim($tag_name)][trim($tag_key)][$key] = $value;
 							} else {
 								$this->info['tags'][trim($tag_name)][trim($tag_key)][]     = $value;
@@ -1217,7 +1217,7 @@ 
 					}
 				}
 
-				if (!isset($this->info['tags'][$tag_name])) {
+				if ( ! isset($this->info['tags'][$tag_name])) {
 					// comments are set but contain nothing but empty strings, so skip
 					continue;
 				}
@@ -1228,14 +1228,14 @@ 
 					}
 				}
 
-				$this->CharConvert($this->info['tags'][$tag_name], $encoding);           // only copy gets converted!
+				$this->CharConvert($this->info['tags'][$tag_name], $encoding); // only copy gets converted!
 			}
 
 		}
 
 		// pictures can take up a lot of space, and we don't need multiple copies of them
 		// let there be a single copy in [comments][picture], and not elsewhere
-		if (!empty($this->info['tags'])) {
+		if ( ! empty($this->info['tags'])) {
 			$unset_keys = array('tags', 'tags_html');
 			foreach ($this->info['tags'] as $tagtype => $tagarray) {
 				foreach ($tagarray as $tagname => $tagdata) {
@@ -1291,7 +1291,7 @@ 
 				break;
 		}
 
-		if (!empty($this->info['fileformat']) && !empty($this->info['dataformat']) && ($this->info['fileformat'] == 'ogg') && ($this->info['audio']['dataformat'] == 'vorbis')) {
+		if ( ! empty($this->info['fileformat']) && ! empty($this->info['dataformat']) && ($this->info['fileformat'] == 'ogg') && ($this->info['audio']['dataformat'] == 'vorbis')) {
 
 			// We cannot get an identical md5_data value for Ogg files where the comments
 			// span more than 1 Ogg page (compared to the same audio data with smaller
@@ -1350,7 +1350,7 @@ 
 
 				}
 
-				if (!empty($VorbisCommentError)) {
+				if ( ! empty($VorbisCommentError)) {
 
 					$this->info['warning'][]         = 'Failed making system call to vorbiscomment(.exe) - '.$algorithm.'_data will be incorrect. If vorbiscomment is unavailable, please download from http://www.vorbis.com/download.psp and put in the getID3() directory. Error returned: '.$VorbisCommentError;
 					$this->info[$algorithm.'_data']  = false;
@@ -1380,7 +1380,7 @@ 
 
 		} else {
 
-			if (!empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
+			if ( ! empty($this->info['avdataoffset']) || (isset($this->info['avdataend']) && ($this->info['avdataend'] < $this->info['filesize']))) {
 
 				// get hash from part of file
 				$this->info[$algorithm.'_data'] = getid3_lib::hash_data($this->info['filenamepath'], $this->info['avdataoffset'], $this->info['avdataend'], $algorithm);
@@ -1407,7 +1407,7 @@ 
 	public function ChannelsBitratePlaytimeCalculations() {
 
 		// set channelmode on audio
-		if (!empty($this->info['audio']['channelmode']) || !isset($this->info['audio']['channels'])) {
+		if ( ! empty($this->info['audio']['channelmode']) || ! isset($this->info['audio']['channels'])) {
 			// ignore
 		} elseif ($this->info['audio']['channels'] == 1) {
 			$this->info['audio']['channelmode'] = 'mono';
@@ -1429,7 +1429,7 @@ 
 		//}
 
 		// video bitrate undetermined, but calculable
-		if (isset($this->info['video']['dataformat']) && $this->info['video']['dataformat'] && (!isset($this->info['video']['bitrate']) || ($this->info['video']['bitrate'] == 0))) {
+		if (isset($this->info['video']['dataformat']) && $this->info['video']['dataformat'] && ( ! isset($this->info['video']['bitrate']) || ($this->info['video']['bitrate'] == 0))) {
 			// if video bitrate not set
 			if (isset($this->info['audio']['bitrate']) && ($this->info['audio']['bitrate'] > 0) && ($this->info['audio']['bitrate'] == $this->info['bitrate'])) {
 				// AND if audio bitrate is set to same as overall bitrate
@@ -1445,11 +1445,11 @@ 
 			}
 		}
 
-		if ((!isset($this->info['playtime_seconds']) || ($this->info['playtime_seconds'] <= 0)) && !empty($this->info['bitrate'])) {
+		if (( ! isset($this->info['playtime_seconds']) || ($this->info['playtime_seconds'] <= 0)) && ! empty($this->info['bitrate'])) {
 			$this->info['playtime_seconds'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['bitrate'];
 		}
 
-		if (!isset($this->info['bitrate']) && !empty($this->info['playtime_seconds'])) {
+		if ( ! isset($this->info['bitrate']) && ! empty($this->info['playtime_seconds'])) {
 			$this->info['bitrate'] = (($this->info['avdataend'] - $this->info['avdataoffset']) * 8) / $this->info['playtime_seconds'];
 		}
 		if (isset($this->info['bitrate']) && empty($this->info['audio']['bitrate']) && empty($this->info['video']['bitrate'])) {
@@ -1463,7 +1463,7 @@ 
 		}
 
 		// Set playtime string
-		if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
+		if ( ! empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
 			$this->info['playtime_string'] = getid3_lib::PlaytimeString($this->info['playtime_seconds']);
 		}
 	}
@@ -1493,17 +1493,17 @@ 
 				break;
 
 			default:
-				if (!empty($this->info['video']['frame_rate'])) {
+				if ( ! empty($this->info['video']['frame_rate'])) {
 					$FrameRate = $this->info['video']['frame_rate'];
 				} else {
 					return false;
 				}
-				if (!empty($this->info['playtime_seconds'])) {
+				if ( ! empty($this->info['playtime_seconds'])) {
 					$PlaytimeSeconds = $this->info['playtime_seconds'];
 				} else {
 					return false;
 				}
-				if (!empty($this->info['video']['bitrate'])) {
+				if ( ! empty($this->info['video']['bitrate'])) {
 					$BitrateCompressed = $this->info['video']['bitrate'];
 				} else {
 					return false;
@@ -1518,15 +1518,15 @@ 
 
 
 	public function CalculateCompressionRatioAudio() {
-		if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate']) || !is_numeric($this->info['audio']['sample_rate'])) {
+		if (empty($this->info['audio']['bitrate']) || empty($this->info['audio']['channels']) || empty($this->info['audio']['sample_rate']) || ! is_numeric($this->info['audio']['sample_rate'])) {
 			return false;
 		}
-		$this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * (!empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
+		$this->info['audio']['compression_ratio'] = $this->info['audio']['bitrate'] / ($this->info['audio']['channels'] * $this->info['audio']['sample_rate'] * ( ! empty($this->info['audio']['bits_per_sample']) ? $this->info['audio']['bits_per_sample'] : 16));
 
-		if (!empty($this->info['audio']['streams'])) {
+		if ( ! empty($this->info['audio']['streams'])) {
 			foreach ($this->info['audio']['streams'] as $streamnumber => $streamdata) {
-				if (!empty($streamdata['bitrate']) && !empty($streamdata['channels']) && !empty($streamdata['sample_rate'])) {
-					$this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * (!empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
+				if ( ! empty($streamdata['bitrate']) && ! empty($streamdata['channels']) && ! empty($streamdata['sample_rate'])) {
+					$this->info['audio']['streams'][$streamnumber]['compression_ratio'] = $streamdata['bitrate'] / ($streamdata['channels'] * $streamdata['sample_rate'] * ( ! empty($streamdata['bits_per_sample']) ? $streamdata['bits_per_sample'] : 16));
 				}
 			}
 		}
@@ -1536,7 +1536,7 @@ 
 
 	public function CalculateReplayGain() {
 		if (isset($this->info['replay_gain'])) {
-			if (!isset($this->info['replay_gain']['reference_volume'])) {
+			if ( ! isset($this->info['replay_gain']['reference_volume'])) {
 				$this->info['replay_gain']['reference_volume'] = (double) 89.0;
 			}
 			if (isset($this->info['replay_gain']['track']['adjustment'])) {
@@ -1557,8 +1557,8 @@ 
 	}
 
 	public function ProcessAudioStreams() {
-		if (!empty($this->info['audio']['bitrate']) || !empty($this->info['audio']['channels']) || !empty($this->info['audio']['sample_rate'])) {
-			if (!isset($this->info['audio']['streams'])) {
+		if ( ! empty($this->info['audio']['bitrate']) || ! empty($this->info['audio']['channels']) || ! empty($this->info['audio']['sample_rate'])) {
+			if ( ! isset($this->info['audio']['streams'])) {
 				foreach ($this->info['audio'] as $key => $value) {
 					if ($key != 'streams') {
 						$this->info['audio']['streams'][0][$key] = $value;
@@ -1575,7 +1575,7 @@ 
 
 	public function include_module($name) {
 		//if (!file_exists($this->include_path.'module.'.$name.'.php')) {
-		if (!file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
+		if ( ! file_exists(GETID3_INCLUDEPATH.'module.'.$name.'.php')) {
 			throw new getid3_exception('Required module.'.$name.'.php is missing.');
 		}
 		include_once(GETID3_INCLUDEPATH.'module.'.$name.'.php');
@@ -1590,17 +1590,17 @@ 
 	/**
 	* @var getID3
 	*/
-	protected $getid3;                       // pointer
+	protected $getid3; // pointer
 
 	protected $data_string_flag     = false; // analyzing filepointer or string
-	protected $data_string          = '';    // string to analyze
-	protected $data_string_position = 0;     // seek position in string
-	protected $data_string_length   = 0;     // string length
+	protected $data_string          = ''; // string to analyze
+	protected $data_string_position = 0; // seek position in string
+	protected $data_string_length   = 0; // string length
 
 	private $dependency_to = null;
 
 
-	public function __construct(getID3 $getid3, $call_module=null) {
+	public function __construct(getID3 $getid3, $call_module = null) {
 		$this->getid3 = $getid3;
 
 		if ($call_module) {
@@ -1658,13 +1658,13 @@ 
 			return substr($this->data_string, $this->data_string_position - $bytes, $bytes);
 		}
 		$pos = $this->ftell() + $bytes;
-		if (!getid3_lib::intValueSupported($pos)) {
+		if ( ! getid3_lib::intValueSupported($pos)) {
 			throw new getid3_exception('cannot fread('.$bytes.' from '.$this->ftell().') because beyond PHP filesystem limit', 10);
 		}
 		return fread($this->getid3->fp, $bytes);
 	}
 
-	protected function fseek($bytes, $whence=SEEK_SET) {
+	protected function fseek($bytes, $whence = SEEK_SET) {
 		if ($this->data_string_flag) {
 			switch ($whence) {
 				case SEEK_SET:
@@ -1687,7 +1687,7 @@ 
 			} elseif ($whence == SEEK_END) {
 				$pos = $this->getid3->info['filesize'] + $bytes;
 			}
-			if (!getid3_lib::intValueSupported($pos)) {
+			if ( ! getid3_lib::intValueSupported($pos)) {
 				throw new getid3_exception('cannot fseek('.$pos.') because beyond PHP filesystem limit', 10);
 			}
 		}
@@ -1719,7 +1719,7 @@ 
 		// does nothing for now
 	}
 
-	public function saveAttachment($name, $offset, $length, $image_mime=null) {
+	public function saveAttachment($name, $offset, $length, $image_mime = null) {
 		try {
 
 			// do not extract at all
@@ -1741,7 +1741,7 @@ 
 
 				// set up destination path
 				$dir = rtrim(str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $this->getid3->option_save_attachments), DIRECTORY_SEPARATOR);
-				if (!is_dir($dir) || !is_writable($dir)) { // check supplied directory
+				if ( ! is_dir($dir) || ! is_writable($dir)) { // check supplied directory
 					throw new Exception('supplied path ('.$dir.') does not exist, or is not writable');
 				}
 				$dest = $dir.DIRECTORY_SEPARATOR.$name.($image_mime ? '.'.getid3_lib::ImageExtFromMime($image_mime) : '');

Braces +1 added lines, -2 removed lines

@@ -350,8 +350,7 @@
 						$tag_class = 'getid3_'.$tag_name;
 						$tag = new $tag_class($this);
 						$tag->Analyze();
-					}
-					catch (getid3_exception $e) {
+					} catch (getid3_exception $e) {
 						throw $e;
 					}
 				}

src/wp-includes/ID3/module.audio-video.asf.php

Doc Comments +4 added lines

@@ -1684,6 +1684,10 @@
 		return (isset($lookup[$WMpictureType]) ? $lookup[$WMpictureType] : '');
 	}
 
+	/**
+	 * @param string $asf_header_extension_object_data
+	 * @param integer $unhandled_sections
+	 */
 	public function HeaderExtensionObjectDataParse(&$asf_header_extension_object_data, &$unhandled_sections) {
 		// http://msdn.microsoft.com/en-us/library/bb643323.aspx
 

Spacing +98 added lines, -99 removed lines

@@ -19,12 +19,12 @@ 
 class getid3_asf extends getid3_handler {
 
 	public function __construct(getID3 $getid3) {
-		parent::__construct($getid3);  // extends getid3_handler::__construct()
+		parent::__construct($getid3); // extends getid3_handler::__construct()
 
 		// initialize all GUID constants
 		$GUIDarray = $this->KnownGUIDs();
 		foreach ($GUIDarray as $GUIDname => $hexstringvalue) {
-			if (!defined($GUIDname)) {
+			if ( ! defined($GUIDname)) {
 				define($GUIDname, $this->GUIDtoBytestring($hexstringvalue));
 			}
 		}
@@ -220,8 +220,8 @@ 
 					switch ($StreamPropertiesObjectData['stream_type']) {
 
 						case GETID3_ASF_Audio_Media:
-							$thisfile_audio['dataformat']   = (!empty($thisfile_audio['dataformat'])   ? $thisfile_audio['dataformat']   : 'asf');
-							$thisfile_audio['bitrate_mode'] = (!empty($thisfile_audio['bitrate_mode']) ? $thisfile_audio['bitrate_mode'] : 'cbr');
+							$thisfile_audio['dataformat']   = ( ! empty($thisfile_audio['dataformat']) ? $thisfile_audio['dataformat'] : 'asf');
+							$thisfile_audio['bitrate_mode'] = ( ! empty($thisfile_audio['bitrate_mode']) ? $thisfile_audio['bitrate_mode'] : 'cbr');
 
 							$audiodata = getid3_riff::parseWAVEFORMATex(substr($StreamPropertiesObjectData['type_specific_data'], 0, 16));
 							unset($audiodata['raw']);
@@ -229,8 +229,8 @@ 
 							break;
 
 						case GETID3_ASF_Video_Media:
-							$thisfile_video['dataformat']   = (!empty($thisfile_video['dataformat'])   ? $thisfile_video['dataformat']   : 'asf');
-							$thisfile_video['bitrate_mode'] = (!empty($thisfile_video['bitrate_mode']) ? $thisfile_video['bitrate_mode'] : 'cbr');
+							$thisfile_video['dataformat']   = ( ! empty($thisfile_video['dataformat']) ? $thisfile_video['dataformat'] : 'asf');
+							$thisfile_video['bitrate_mode'] = ( ! empty($thisfile_video['bitrate_mode']) ? $thisfile_video['bitrate_mode'] : 'cbr');
 							break;
 
 						case GETID3_ASF_Command_Media:
@@ -270,7 +270,7 @@ 
 						//return false;
 						break;
 					}
-					$thisfile_asf_headerextensionobject['reserved_2']          = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
+					$thisfile_asf_headerextensionobject['reserved_2'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 2));
 					$offset += 2;
 					if ($thisfile_asf_headerextensionobject['reserved_2'] != 6) {
 						$info['warning'][] = 'header_extension_object.reserved_2 ('.getid3_lib::PrintHexBytes($thisfile_asf_headerextensionobject['reserved_2']).') does not match expected value of "6"';
@@ -279,7 +279,7 @@ 
 					}
 					$thisfile_asf_headerextensionobject['extension_data_size'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 4));
 					$offset += 4;
-					$thisfile_asf_headerextensionobject['extension_data']      =                              substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']);
+					$thisfile_asf_headerextensionobject['extension_data']      = substr($ASFHeaderData, $offset, $thisfile_asf_headerextensionobject['extension_data_size']);
 					$unhandled_sections = 0;
 					$thisfile_asf_headerextensionobject['extension_data_parsed'] = $this->HeaderExtensionObjectDataParse($thisfile_asf_headerextensionobject['extension_data'], $unhandled_sections);
 					if ($unhandled_sections === 0) {
@@ -355,11 +355,11 @@ 
 								list($AudioCodecBitrate, $AudioCodecFrequency, $AudioCodecChannels) = explode(',', $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['description']));
 								$thisfile_audio['codec'] = $this->TrimConvert($thisfile_asf_codeclistobject_codecentries_current['name']);
 
-								if (!isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
+								if ( ! isset($thisfile_audio['bitrate']) && strstr($AudioCodecBitrate, 'kbps')) {
 									$thisfile_audio['bitrate'] = (int) (trim(str_replace('kbps', '', $AudioCodecBitrate)) * 1000);
 								}
 								//if (!isset($thisfile_video['bitrate']) && isset($thisfile_audio['bitrate']) && isset($thisfile_asf['file_properties_object']['max_bitrate']) && ($thisfile_asf_codeclistobject['codec_entries_count'] > 1)) {
-								if (empty($thisfile_video['bitrate']) && !empty($thisfile_audio['bitrate']) && !empty($info['bitrate'])) {
+								if (empty($thisfile_video['bitrate']) && ! empty($thisfile_audio['bitrate']) && ! empty($info['bitrate'])) {
 									//$thisfile_video['bitrate'] = $thisfile_asf['file_properties_object']['max_bitrate'] - $thisfile_audio['bitrate'];
 									$thisfile_video['bitrate'] = $info['bitrate'] - $thisfile_audio['bitrate'];
 								}
@@ -416,7 +416,7 @@ 
 										break;
 								}
 
-								if (!isset($thisfile_audio['channels'])) {
+								if ( ! isset($thisfile_audio['channels'])) {
 									if (strstr($AudioCodecChannels, 'stereo')) {
 										$thisfile_audio['channels'] = 2;
 									} elseif (strstr($AudioCodecChannels, 'mono')) {
@@ -533,7 +533,7 @@ 
 					$thisfile_asf_markerobject['name'] = substr($ASFHeaderData, $offset, $thisfile_asf_markerobject['name_length']);
 					$offset += $thisfile_asf_markerobject['name_length'];
 					for ($MarkersCounter = 0; $MarkersCounter < $thisfile_asf_markerobject['markers_count']; $MarkersCounter++) {
-						$thisfile_asf_markerobject['markers'][$MarkersCounter]['offset']  = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
+						$thisfile_asf_markerobject['markers'][$MarkersCounter]['offset'] = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
 						$offset += 8;
 						$thisfile_asf_markerobject['markers'][$MarkersCounter]['presentation_time']         = getid3_lib::LittleEndian2Int(substr($ASFHeaderData, $offset, 8));
 						$offset += 8;
@@ -547,9 +547,9 @@ 
 						$offset += 4;
 						$thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description']        = substr($ASFHeaderData, $offset, $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length']);
 						$offset += $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
-						$PaddingLength = $thisfile_asf_markerobject['markers'][$MarkersCounter]['entry_length'] - 4 -  4 - 4 - $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
+						$PaddingLength = $thisfile_asf_markerobject['markers'][$MarkersCounter]['entry_length'] - 4 - 4 - 4 - $thisfile_asf_markerobject['markers'][$MarkersCounter]['marker_description_length'];
 						if ($PaddingLength > 0) {
-							$thisfile_asf_markerobject['markers'][$MarkersCounter]['padding']               = substr($ASFHeaderData, $offset, $PaddingLength);
+							$thisfile_asf_markerobject['markers'][$MarkersCounter]['padding'] = substr($ASFHeaderData, $offset, $PaddingLength);
 							$offset += $PaddingLength;
 						}
 					}
@@ -691,7 +691,7 @@ 
 
 					$ASFcommentKeysToCopy = array('title'=>'title', 'author'=>'artist', 'copyright'=>'copyright', 'description'=>'comment', 'rating'=>'rating');
 					foreach ($ASFcommentKeysToCopy as $keytocopyfrom => $keytocopyto) {
-						if (!empty($thisfile_asf_contentdescriptionobject[$keytocopyfrom])) {
+						if ( ! empty($thisfile_asf_contentdescriptionobject[$keytocopyfrom])) {
 							$thisfile_asf_comments[$keytocopyto][] = $this->TrimTerm($thisfile_asf_contentdescriptionobject[$keytocopyfrom]);
 						}
 					}
@@ -775,7 +775,7 @@ 
 
 							case 'wm/albumtitle':
 							case 'album':
-								$thisfile_asf_comments['album']  = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+								$thisfile_asf_comments['album'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
 								break;
 
 							case 'wm/genre':
@@ -807,7 +807,7 @@ 
 							case 'wm/year':
 							case 'year':
 							case 'date':
-								$thisfile_asf_comments['year'] = array( $this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
+								$thisfile_asf_comments['year'] = array($this->TrimTerm($thisfile_asf_extendedcontentdescriptionobject_contentdescriptor_current['value']));
 								break;
 
 							case 'wm/lyrics':
@@ -1033,7 +1033,7 @@ 
 								break;
 						}
 
-						if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
+						if ( ! empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
 							foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
 								if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
 									$thisfile_asf_audiomedia_currentstream['bitrate'] = $dataarray['bitrate'];
@@ -1042,9 +1042,9 @@ 
 								}
 							}
 						} else {
-							if (!empty($thisfile_asf_audiomedia_currentstream['bytes_sec'])) {
+							if ( ! empty($thisfile_asf_audiomedia_currentstream['bytes_sec'])) {
 								$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bytes_sec'] * 8;
-							} elseif (!empty($thisfile_asf_audiomedia_currentstream['bitrate'])) {
+							} elseif ( ! empty($thisfile_asf_audiomedia_currentstream['bitrate'])) {
 								$thisfile_audio['bitrate'] += $thisfile_asf_audiomedia_currentstream['bitrate'];
 							}
 						}
@@ -1119,7 +1119,7 @@ 
 						$videomediaoffset += 4;
 						$thisfile_asf_videomedia_currentstream['format_data']['codec_data']       = substr($streamdata['type_specific_data'], $videomediaoffset);
 
-						if (!empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
+						if ( ! empty($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'])) {
 							foreach ($thisfile_asf['stream_bitrate_properties_object']['bitrate_records'] as $dummy => $dataarray) {
 								if (isset($dataarray['flags']['stream_number']) && ($dataarray['flags']['stream_number'] == $streamnumber)) {
 									$thisfile_asf_videomedia_currentstream['bitrate'] = $dataarray['bitrate'];
@@ -1225,7 +1225,7 @@ 
 					$thisfile_asf_simpleindexobject['objectid_guid']             = $NextObjectGUIDtext;
 					$thisfile_asf_simpleindexobject['objectsize']                = $NextObjectSize;
 
-					$thisfile_asf_simpleindexobject['fileid']                    =                  substr($SimpleIndexObjectData, $offset, 16);
+					$thisfile_asf_simpleindexobject['fileid']                    = substr($SimpleIndexObjectData, $offset, 16);
 					$offset += 16;
 					$thisfile_asf_simpleindexobject['fileid_guid']               = $this->BytestringToGUID($thisfile_asf_simpleindexobject['fileid']);
 					$thisfile_asf_simpleindexobject['index_entry_time_interval'] = getid3_lib::LittleEndian2Int(substr($SimpleIndexObjectData, $offset, 8));
@@ -1379,8 +1379,7 @@ 
 		}
 
 		switch (isset($thisfile_audio['codec']) ? $thisfile_audio['codec'] : '') {
-			case 'MPEG Layer-3':
-				$thisfile_audio['dataformat'] = 'mp3';
+			case 'MPEG Layer-3' : $thisfile_audio['dataformat'] = 'mp3';
 				break;
 
 			default:
@@ -1401,7 +1400,7 @@ 
 						// AH 2003-10-01
 						$thisfile_audio['encoder_options'] = $this->TrimConvert($thisfile_asf_codeclistobject['codec_entries'][0]['description']);
 
-						$thisfile_audio['codec']   = $thisfile_audio['encoder'];
+						$thisfile_audio['codec'] = $thisfile_audio['encoder'];
 						break;
 
 					default:
@@ -1413,15 +1412,15 @@ 
 		}
 
 		if (isset($info['audio'])) {
-			$thisfile_audio['lossless']           = (isset($thisfile_audio['lossless'])           ? $thisfile_audio['lossless']           : false);
-			$thisfile_audio['dataformat']         = (!empty($thisfile_audio['dataformat'])        ? $thisfile_audio['dataformat']         : 'asf');
+			$thisfile_audio['lossless']           = (isset($thisfile_audio['lossless']) ? $thisfile_audio['lossless'] : false);
+			$thisfile_audio['dataformat']         = ( ! empty($thisfile_audio['dataformat']) ? $thisfile_audio['dataformat'] : 'asf');
 		}
-		if (!empty($thisfile_video['dataformat'])) {
-			$thisfile_video['lossless']           = (isset($thisfile_audio['lossless'])           ? $thisfile_audio['lossless']           : false);
+		if ( ! empty($thisfile_video['dataformat'])) {
+			$thisfile_video['lossless']           = (isset($thisfile_audio['lossless']) ? $thisfile_audio['lossless'] : false);
 			$thisfile_video['pixel_aspect_ratio'] = (isset($thisfile_audio['pixel_aspect_ratio']) ? $thisfile_audio['pixel_aspect_ratio'] : (float) 1);
-			$thisfile_video['dataformat']         = (!empty($thisfile_video['dataformat'])        ? $thisfile_video['dataformat']         : 'asf');
+			$thisfile_video['dataformat']         = ( ! empty($thisfile_video['dataformat']) ? $thisfile_video['dataformat'] : 'asf');
 		}
-		if (!empty($thisfile_video['streams'])) {
+		if ( ! empty($thisfile_video['streams'])) {
 			$thisfile_video['resolution_x'] = 0;
 			$thisfile_video['resolution_y'] = 0;
 			foreach ($thisfile_video['streams'] as $key => $valuearray) {
@@ -1433,7 +1432,7 @@ 
 		}
 		$info['bitrate'] = (isset($thisfile_audio['bitrate']) ? $thisfile_audio['bitrate'] : 0) + (isset($thisfile_video['bitrate']) ? $thisfile_video['bitrate'] : 0);
 
-		if ((!isset($info['playtime_seconds']) || ($info['playtime_seconds'] <= 0)) && ($info['bitrate'] > 0)) {
+		if (( ! isset($info['playtime_seconds']) || ($info['playtime_seconds'] <= 0)) && ($info['bitrate'] > 0)) {
 			$info['playtime_seconds'] = ($info['filesize'] - $info['avdataoffset']) / ($info['bitrate'] / 8);
 		}
 
@@ -1593,13 +1592,13 @@ 
 		// AaBbCcDd-EeFf-GgHh-IiJj-KkLlMmNnOoPp is stored as this 16-byte string:
 		// $Dd $Cc $Bb $Aa $Ff $Ee $Hh $Gg $Ii $Jj $Kk $Ll $Mm $Nn $Oo $Pp
 
-		$hexbytecharstring  = chr(hexdec(substr($GUIDstring,  6, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  4, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  2, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  0, 2)));
+		$hexbytecharstring  = chr(hexdec(substr($GUIDstring, 6, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 4, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 2, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 0, 2)));
 
 		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 11, 2)));
-		$hexbytecharstring .= chr(hexdec(substr($GUIDstring,  9, 2)));
+		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 9, 2)));
 
 		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 16, 2)));
 		$hexbytecharstring .= chr(hexdec(substr($GUIDstring, 14, 2)));
@@ -1618,19 +1617,19 @@ 
 	}
 
 	public static function BytestringToGUID($Bytestring) {
-		$GUIDstring  = str_pad(dechex(ord($Bytestring{3})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{2})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{1})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{0})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring  = str_pad(dechex(ord($Bytestring{3})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{2})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{1})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{0})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{5})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{4})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{5})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{4})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{7})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{6})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{7})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{6})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{8})),  2, '0', STR_PAD_LEFT);
-		$GUIDstring .= str_pad(dechex(ord($Bytestring{9})),  2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{8})), 2, '0', STR_PAD_LEFT);
+		$GUIDstring .= str_pad(dechex(ord($Bytestring{9})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= '-';
 		$GUIDstring .= str_pad(dechex(ord($Bytestring{10})), 2, '0', STR_PAD_LEFT);
 		$GUIDstring .= str_pad(dechex(ord($Bytestring{11})), 2, '0', STR_PAD_LEFT);
@@ -1642,7 +1641,7 @@ 
 		return strtoupper($GUIDstring);
 	}
 
-	public static function FILETIMEtoUNIXtime($FILETIME, $round=true) {
+	public static function FILETIMEtoUNIXtime($FILETIME, $round = true) {
 		// FILETIME is a 64-bit unsigned integer representing
 		// the number of 100-nanosecond intervals since January 1, 1601
 		// UNIX timestamp is number of seconds since January 1, 1970
@@ -1694,12 +1693,12 @@ 
 			$offset = $objectOffset;
 			$thisObject = array();
 
-			$thisObject['guid']                              =                              substr($asf_header_extension_object_data, $offset, 16);
+			$thisObject['guid'] = substr($asf_header_extension_object_data, $offset, 16);
 			$offset += 16;
 			$thisObject['guid_text'] = $this->BytestringToGUID($thisObject['guid']);
 			$thisObject['guid_name'] = $this->GUIDname($thisObject['guid_text']);
 
-			$thisObject['size']                              = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
+			$thisObject['size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
 			$offset += 8;
 			if ($thisObject['size'] <= 0) {
 				break;
@@ -1707,67 +1706,67 @@ 
 
 			switch ($thisObject['guid']) {
 				case GETID3_ASF_Extended_Stream_Properties_Object:
-					$thisObject['start_time']                        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
+					$thisObject['start_time']                        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
 					$offset += 8;
 					$thisObject['start_time_unix']                   = $this->FILETIMEtoUNIXtime($thisObject['start_time']);
 
-					$thisObject['end_time']                          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  8));
+					$thisObject['end_time']                          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 8));
 					$offset += 8;
 					$thisObject['end_time_unix']                     = $this->FILETIMEtoUNIXtime($thisObject['end_time']);
 
-					$thisObject['data_bitrate']                      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['data_bitrate']                      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['buffer_size']                       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['buffer_size']                       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['initial_buffer_fullness']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['initial_buffer_fullness']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['alternate_data_bitrate']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['alternate_data_bitrate']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['alternate_buffer_size']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['alternate_buffer_size']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['alternate_initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['alternate_initial_buffer_fullness'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['maximum_object_size']               = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['maximum_object_size']               = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['flags_raw']                         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['flags_raw']                         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 					$thisObject['flags']['reliable']                = (bool) $thisObject['flags_raw'] & 0x00000001;
 					$thisObject['flags']['seekable']                = (bool) $thisObject['flags_raw'] & 0x00000002;
 					$thisObject['flags']['no_cleanpoints']          = (bool) $thisObject['flags_raw'] & 0x00000004;
 					$thisObject['flags']['resend_live_cleanpoints'] = (bool) $thisObject['flags_raw'] & 0x00000008;
 
-					$thisObject['stream_number']                     = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['stream_number']                     = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
-					$thisObject['stream_language_id_index']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['stream_language_id_index']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
-					$thisObject['average_time_per_frame']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+					$thisObject['average_time_per_frame']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 					$offset += 4;
 
-					$thisObject['stream_name_count']                 = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['stream_name_count']                 = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
-					$thisObject['payload_extension_system_count']    = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['payload_extension_system_count']    = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['stream_name_count']; $i++) {
 						$streamName = array();
 
-						$streamName['language_id_index']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$streamName['language_id_index']             = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$streamName['stream_name_length']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$streamName['stream_name_length']            = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$streamName['stream_name']                   = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  $streamName['stream_name_length']));
+						$streamName['stream_name']                   = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, $streamName['stream_name_length']));
 						$offset += $streamName['stream_name_length'];
 
 						$thisObject['stream_names'][$i] = $streamName;
@@ -1776,20 +1775,20 @@ 
 					for ($i = 0; $i < $thisObject['payload_extension_system_count']; $i++) {
 						$payloadExtensionSystem = array();
 
-						$payloadExtensionSystem['extension_system_id']   =                              substr($asf_header_extension_object_data, $offset, 16);
+						$payloadExtensionSystem['extension_system_id'] = substr($asf_header_extension_object_data, $offset, 16);
 						$offset += 16;
 						$payloadExtensionSystem['extension_system_id_text'] = $this->BytestringToGUID($payloadExtensionSystem['extension_system_id']);
 
-						$payloadExtensionSystem['extension_system_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$payloadExtensionSystem['extension_system_size'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 						if ($payloadExtensionSystem['extension_system_size'] <= 0) {
 							break 2;
 						}
 
-						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 						$offset += 4;
 
-						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  $payloadExtensionSystem['extension_system_info_length']));
+						$payloadExtensionSystem['extension_system_info_length'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, $payloadExtensionSystem['extension_system_info_length']));
 						$offset += $payloadExtensionSystem['extension_system_info_length'];
 
 						$thisObject['payload_extension_systems'][$i] = $payloadExtensionSystem;
@@ -1802,32 +1801,32 @@ 
 					break;
 
 				case GETID3_ASF_Metadata_Object:
-					$thisObject['description_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['description_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['description_record_counts']; $i++) {
 						$descriptionRecord = array();
 
-						$descriptionRecord['reserved_1']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2)); // must be zero
+						$descriptionRecord['reserved_1']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2)); // must be zero
 						$offset += 2;
 
-						$descriptionRecord['stream_number']      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['stream_number']      = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['name_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['name_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['data_type']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['data_type']          = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 						$descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
 
-						$descriptionRecord['data_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+						$descriptionRecord['data_length']        = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 						$offset += 4;
 
-						$descriptionRecord['name']               =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['name_length']);
+						$descriptionRecord['name']               = substr($asf_header_extension_object_data, $offset, $descriptionRecord['name_length']);
 						$offset += $descriptionRecord['name_length'];
 
-						$descriptionRecord['data']               =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['data_length']);
+						$descriptionRecord['data']               = substr($asf_header_extension_object_data, $offset, $descriptionRecord['data_length']);
 						$offset += $descriptionRecord['data_length'];
 						switch ($descriptionRecord['data_type']) {
 							case 0x0000: // Unicode string
@@ -1857,16 +1856,16 @@ 
 					break;
 
 				case GETID3_ASF_Language_List_Object:
-					$thisObject['language_id_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['language_id_record_counts'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['language_id_record_counts']; $i++) {
 						$languageIDrecord = array();
 
-						$languageIDrecord['language_id_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  1));
+						$languageIDrecord['language_id_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 1));
 						$offset += 1;
 
-						$languageIDrecord['language_id']                =                              substr($asf_header_extension_object_data, $offset,  $languageIDrecord['language_id_length']);
+						$languageIDrecord['language_id']                = substr($asf_header_extension_object_data, $offset, $languageIDrecord['language_id_length']);
 						$offset += $languageIDrecord['language_id_length'];
 
 						$thisObject['language_id_record'][$i] = $languageIDrecord;
@@ -1874,32 +1873,32 @@ 
 					break;
 
 				case GETID3_ASF_Metadata_Library_Object:
-					$thisObject['description_records_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+					$thisObject['description_records_count'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 					$offset += 2;
 
 					for ($i = 0; $i < $thisObject['description_records_count']; $i++) {
 						$descriptionRecord = array();
 
-						$descriptionRecord['language_list_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['language_list_index'] = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['stream_number']       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['stream_number']       = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['name_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['name_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 
-						$descriptionRecord['data_type']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  2));
+						$descriptionRecord['data_type']           = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 2));
 						$offset += 2;
 						$descriptionRecord['data_type_text'] = self::metadataLibraryObjectDataTypeLookup($descriptionRecord['data_type']);
 
-						$descriptionRecord['data_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset,  4));
+						$descriptionRecord['data_length']         = getid3_lib::LittleEndian2Int(substr($asf_header_extension_object_data, $offset, 4));
 						$offset += 4;
 
-						$descriptionRecord['name']                =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['name_length']);
+						$descriptionRecord['name']                = substr($asf_header_extension_object_data, $offset, $descriptionRecord['name_length']);
 						$offset += $descriptionRecord['name_length'];
 
-						$descriptionRecord['data']                =                              substr($asf_header_extension_object_data, $offset,  $descriptionRecord['data_length']);
+						$descriptionRecord['data']                = substr($asf_header_extension_object_data, $offset, $descriptionRecord['data_length']);
 						$offset += $descriptionRecord['data_length'];
 
 						if (preg_match('#^WM/Picture$#', str_replace("\x00", '', trim($descriptionRecord['name'])))) {
@@ -1934,12 +1933,12 @@ 
 	public static function metadataLibraryObjectDataTypeLookup($id) {
 		static $lookup = array(
 			0x0000 => 'Unicode string', // The data consists of a sequence of Unicode characters
-			0x0001 => 'BYTE array',     // The type of the data is implementation-specific
-			0x0002 => 'BOOL',           // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values
-			0x0003 => 'DWORD',          // The data is 4 bytes long and should be interpreted as a 32-bit unsigned integer
-			0x0004 => 'QWORD',          // The data is 8 bytes long and should be interpreted as a 64-bit unsigned integer
-			0x0005 => 'WORD',           // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer
-			0x0006 => 'GUID',           // The data is 16 bytes long and should be interpreted as a 128-bit GUID
+			0x0001 => 'BYTE array', // The type of the data is implementation-specific
+			0x0002 => 'BOOL', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer. Only 0x0000 or 0x0001 are permitted values
+			0x0003 => 'DWORD', // The data is 4 bytes long and should be interpreted as a 32-bit unsigned integer
+			0x0004 => 'QWORD', // The data is 8 bytes long and should be interpreted as a 64-bit unsigned integer
+			0x0005 => 'WORD', // The data is 2 bytes long and should be interpreted as a 16-bit unsigned integer
+			0x0006 => 'GUID', // The data is 16 bytes long and should be interpreted as a 128-bit GUID
 		);
 		return (isset($lookup[$id]) ? $lookup[$id] : 'invalid');
 	}
@@ -1983,10 +1982,10 @@ 
 		$WMpicture['image_mime'] = '';
 		$imagechunkcheck = getid3_lib::GetDataImageSize($WMpicture['data'], $imageinfo);
 		unset($imageinfo);
-		if (!empty($imagechunkcheck)) {
+		if ( ! empty($imagechunkcheck)) {
 			$WMpicture['image_mime'] = image_type_to_mime_type($imagechunkcheck[2]);
 		}
-		if (!isset($this->getid3->info['asf']['comments']['picture'])) {
+		if ( ! isset($this->getid3->info['asf']['comments']['picture'])) {
 			$this->getid3->info['asf']['comments']['picture'] = array();
 		}
 		$this->getid3->info['asf']['comments']['picture'][] = array('data'=>$WMpicture['data'], 'image_mime'=>$WMpicture['image_mime']);

src/wp-includes/ID3/module.audio-video.flv.php

Doc Comments +15 added lines

@@ -390,6 +390,9 @@ 
 	public $bytes;
 	public $pos;
 
+	/**
+	 * @param string $bytes
+	 */
 	public function __construct(&$bytes) {
 		$this->bytes =& $bytes;
 		$this->pos = 0;
@@ -473,6 +476,9 @@ 
 class AMFReader {
 	public $stream;
 
+	/**
+	 * @param AMFStream $stream
+	 */
 	public function __construct(&$stream) {
 		$this->stream =& $stream;
 	}
@@ -635,6 +641,9 @@ 
 	public $width;
 	public $height;
 
+	/**
+	 * @param string $sps
+	 */
 	public function __construct($sps) {
 		$this->sps = $sps;
 	}
@@ -691,6 +700,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $bits
+	 */
 	public function skipBits($bits) {
 		$newBits = $this->currentBits + $bits;
 		$this->currentBytes += (int)floor($newBits / 8);
@@ -703,6 +715,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param integer $bits
+	 */
 	public function getBits($bits) {
 		$result = 0;
 		for ($i = 0; $i < $bits; $i++) {

Spacing +66 added lines, -66 removed lines

@@ -52,25 +52,25 @@ 
 //                                                            ///
 /////////////////////////////////////////////////////////////////
 
-define('GETID3_FLV_TAG_AUDIO',          8);
-define('GETID3_FLV_TAG_VIDEO',          9);
-define('GETID3_FLV_TAG_META',          18);
+define('GETID3_FLV_TAG_AUDIO', 8);
+define('GETID3_FLV_TAG_VIDEO', 9);
+define('GETID3_FLV_TAG_META', 18);
 
-define('GETID3_FLV_VIDEO_H263',         2);
-define('GETID3_FLV_VIDEO_SCREEN',       3);
-define('GETID3_FLV_VIDEO_VP6FLV',       4);
+define('GETID3_FLV_VIDEO_H263', 2);
+define('GETID3_FLV_VIDEO_SCREEN', 3);
+define('GETID3_FLV_VIDEO_VP6FLV', 4);
 define('GETID3_FLV_VIDEO_VP6FLV_ALPHA', 5);
-define('GETID3_FLV_VIDEO_SCREENV2',     6);
-define('GETID3_FLV_VIDEO_H264',         7);
-
-define('H264_AVC_SEQUENCE_HEADER',          0);
-define('H264_PROFILE_BASELINE',            66);
-define('H264_PROFILE_MAIN',                77);
-define('H264_PROFILE_EXTENDED',            88);
-define('H264_PROFILE_HIGH',               100);
-define('H264_PROFILE_HIGH10',             110);
-define('H264_PROFILE_HIGH422',            122);
-define('H264_PROFILE_HIGH444',            144);
+define('GETID3_FLV_VIDEO_SCREENV2', 6);
+define('GETID3_FLV_VIDEO_H264', 7);
+
+define('H264_AVC_SEQUENCE_HEADER', 0);
+define('H264_PROFILE_BASELINE', 66);
+define('H264_PROFILE_MAIN', 77);
+define('H264_PROFILE_EXTENDED', 88);
+define('H264_PROFILE_HIGH', 100);
+define('H264_PROFILE_HIGH10', 110);
+define('H264_PROFILE_HIGH422', 122);
+define('H264_PROFILE_HIGH444', 144);
 define('H264_PROFILE_HIGH444_PREDICTIVE', 244);
 
 class getid3_flv extends getid3_handler {
@@ -88,7 +88,7 @@ 
 		$FLVheader = $this->fread(5);
 
 		$info['fileformat'] = 'flv';
-		$info['flv']['header']['signature'] =                           substr($FLVheader, 0, 3);
+		$info['flv']['header']['signature'] = substr($FLVheader, 0, 3);
 		$info['flv']['header']['version']   = getid3_lib::BigEndian2Int(substr($FLVheader, 3, 1));
 		$TypeFlags                          = getid3_lib::BigEndian2Int(substr($FLVheader, 4, 1));
 
@@ -114,13 +114,13 @@ 
 		$tagParseCount = 0;
 		$info['flv']['framecount'] = array('total'=>0, 'audio'=>0, 'video'=>0);
 		$flv_framecount = &$info['flv']['framecount'];
-		while ((($this->ftell() + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || !$found_valid_meta_playtime))  {
+		while ((($this->ftell() + 16) < $info['avdataend']) && (($tagParseCount++ <= $this->max_frames) || ! $found_valid_meta_playtime)) {
 			$ThisTagHeader = $this->fread(16);
 
-			$PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  0, 4));
-			$TagType           = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  4, 1));
-			$DataLength        = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  5, 3));
-			$Timestamp         = getid3_lib::BigEndian2Int(substr($ThisTagHeader,  8, 3));
+			$PreviousTagLength = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 0, 4));
+			$TagType           = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 4, 1));
+			$DataLength        = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 5, 3));
+			$Timestamp         = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 8, 3));
 			$LastHeaderByte    = getid3_lib::BigEndian2Int(substr($ThisTagHeader, 15, 1));
 			$NextOffset = $this->ftell() - 1 + $DataLength;
 			if ($Timestamp > $Duration) {
@@ -131,18 +131,18 @@ 
 			switch ($TagType) {
 				case GETID3_FLV_TAG_AUDIO:
 					$flv_framecount['audio']++;
-					if (!$found_audio) {
+					if ( ! $found_audio) {
 						$found_audio = true;
 						$info['flv']['audio']['audioFormat']     = ($LastHeaderByte >> 4) & 0x0F;
 						$info['flv']['audio']['audioRate']       = ($LastHeaderByte >> 2) & 0x03;
 						$info['flv']['audio']['audioSampleSize'] = ($LastHeaderByte >> 1) & 0x01;
-						$info['flv']['audio']['audioType']       =  $LastHeaderByte       & 0x01;
+						$info['flv']['audio']['audioType']       = $LastHeaderByte & 0x01;
 					}
 					break;
 
 				case GETID3_FLV_TAG_VIDEO:
 					$flv_framecount['video']++;
-					if (!$found_video) {
+					if ( ! $found_video) {
 						$found_video = true;
 						$info['flv']['video']['videoCodec'] = $LastHeaderByte & 0x07;
 
@@ -154,11 +154,11 @@ 
 							$AVCPacketType = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 0, 1));
 							if ($AVCPacketType == H264_AVC_SEQUENCE_HEADER) {
 								//	read AVCDecoderConfigurationRecord
-								$configurationVersion       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  4, 1));
-								$AVCProfileIndication       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  5, 1));
-								$profile_compatibility      = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  6, 1));
-								$lengthSizeMinusOne         = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  7, 1));
-								$numOfSequenceParameterSets = getid3_lib::BigEndian2Int(substr($FLVvideoHeader,  8, 1));
+								$configurationVersion       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 4, 1));
+								$AVCProfileIndication       = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 5, 1));
+								$profile_compatibility      = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 1));
+								$lengthSizeMinusOne         = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 1));
+								$numOfSequenceParameterSets = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 8, 1));
 
 								if (($numOfSequenceParameterSets & 0x1F) != 0) {
 									//	there is at least one SequenceParameterSet
@@ -236,10 +236,10 @@ 
 
 							}
 
-						} elseif ($info['flv']['video']['videoCodec'] ==  GETID3_FLV_VIDEO_VP6FLV_ALPHA) {
+						} elseif ($info['flv']['video']['videoCodec'] == GETID3_FLV_VIDEO_VP6FLV_ALPHA) {
 
 							/* contributed by schouwerwouØgmail*com */
-							if (!isset($info['video']['resolution_x'])) { // only when meta data isn't set
+							if ( ! isset($info['video']['resolution_x'])) { // only when meta data isn't set
 								$PictureSizeEnc['x'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 6, 2));
 								$PictureSizeEnc['y'] = getid3_lib::BigEndian2Int(substr($FLVvideoHeader, 7, 2));
 								$info['video']['resolution_x'] = ($PictureSizeEnc['x'] & 0xFF) << 3;
@@ -248,7 +248,7 @@ 
 							/* end schouwerwouØgmail*com */
 
 						}
-						if (!empty($info['video']['resolution_x']) && !empty($info['video']['resolution_y'])) {
+						if ( ! empty($info['video']['resolution_x']) && ! empty($info['video']['resolution_y'])) {
 							$info['video']['pixel_aspect_ratio'] = $info['video']['resolution_x'] / $info['video']['resolution_y'];
 						}
 					}
@@ -256,7 +256,7 @@ 
 
 				// Meta tag
 				case GETID3_FLV_TAG_META:
-					if (!$found_meta) {
+					if ( ! $found_meta) {
 						$found_meta = true;
 						$this->fseek(-1, SEEK_CUR);
 						$datachunk = $this->fread($DataLength);
@@ -285,7 +285,7 @@ 
 								}
 							}
 						}
-						if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
+						if ( ! empty($info['flv']['meta']['onMetaData']['duration'])) {
 							$found_valid_meta_playtime = true;
 						}
 					}
@@ -304,22 +304,22 @@ 
 		}
 
 		if ($info['flv']['header']['hasAudio']) {
-			$info['audio']['codec']           =   self::audioFormatLookup($info['flv']['audio']['audioFormat']);
-			$info['audio']['sample_rate']     =     self::audioRateLookup($info['flv']['audio']['audioRate']);
+			$info['audio']['codec']           = self::audioFormatLookup($info['flv']['audio']['audioFormat']);
+			$info['audio']['sample_rate']     = self::audioRateLookup($info['flv']['audio']['audioRate']);
 			$info['audio']['bits_per_sample'] = self::audioBitDepthLookup($info['flv']['audio']['audioSampleSize']);
 
-			$info['audio']['channels']   =  $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
+			$info['audio']['channels']   = $info['flv']['audio']['audioType'] + 1; // 0=mono,1=stereo
 			$info['audio']['lossless']   = ($info['flv']['audio']['audioFormat'] ? false : true); // 0=uncompressed
 			$info['audio']['dataformat'] = 'flv';
 		}
-		if (!empty($info['flv']['header']['hasVideo'])) {
+		if ( ! empty($info['flv']['header']['hasVideo'])) {
 			$info['video']['codec']      = self::videoCodecLookup($info['flv']['video']['videoCodec']);
 			$info['video']['dataformat'] = 'flv';
 			$info['video']['lossless']   = false;
 		}
 
 		// Set information from meta
-		if (!empty($info['flv']['meta']['onMetaData']['duration'])) {
+		if ( ! empty($info['flv']['meta']['onMetaData']['duration'])) {
 			$info['playtime_seconds'] = $info['flv']['meta']['onMetaData']['duration'];
 			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 		}
@@ -391,7 +391,7 @@ 
 	public $pos;
 
 	public function __construct(&$bytes) {
-		$this->bytes =& $bytes;
+		$this->bytes = & $bytes;
 		$this->pos = 0;
 	}
 
@@ -474,7 +474,7 @@ 
 	public $stream;
 
 	public function __construct(&$stream) {
-		$this->stream =& $stream;
+		$this->stream = & $stream;
 	}
 
 	public function readData() {
@@ -642,35 +642,35 @@ 
 	public function readData() {
 		$this->skipBits(8);
 		$this->skipBits(8);
-		$profile = $this->getBits(8);                               // read profile
+		$profile = $this->getBits(8); // read profile
 		if ($profile > 0) {
 			$this->skipBits(8);
-			$level_idc = $this->getBits(8);                         // level_idc
-			$this->expGolombUe();                                   // seq_parameter_set_id // sps
-			$this->expGolombUe();                                   // log2_max_frame_num_minus4
-			$picOrderType = $this->expGolombUe();                   // pic_order_cnt_type
+			$level_idc = $this->getBits(8); // level_idc
+			$this->expGolombUe(); // seq_parameter_set_id // sps
+			$this->expGolombUe(); // log2_max_frame_num_minus4
+			$picOrderType = $this->expGolombUe(); // pic_order_cnt_type
 			if ($picOrderType == 0) {
-				$this->expGolombUe();                               // log2_max_pic_order_cnt_lsb_minus4
+				$this->expGolombUe(); // log2_max_pic_order_cnt_lsb_minus4
 			} elseif ($picOrderType == 1) {
-				$this->skipBits(1);                                 // delta_pic_order_always_zero_flag
-				$this->expGolombSe();                               // offset_for_non_ref_pic
-				$this->expGolombSe();                               // offset_for_top_to_bottom_field
+				$this->skipBits(1); // delta_pic_order_always_zero_flag
+				$this->expGolombSe(); // offset_for_non_ref_pic
+				$this->expGolombSe(); // offset_for_top_to_bottom_field
 				$num_ref_frames_in_pic_order_cnt_cycle = $this->expGolombUe(); // num_ref_frames_in_pic_order_cnt_cycle
 				for ($i = 0; $i < $num_ref_frames_in_pic_order_cnt_cycle; $i++) {
-					$this->expGolombSe();                           // offset_for_ref_frame[ i ]
+					$this->expGolombSe(); // offset_for_ref_frame[ i ]
 				}
 			}
-			$this->expGolombUe();                                   // num_ref_frames
-			$this->skipBits(1);                                     // gaps_in_frame_num_value_allowed_flag
-			$pic_width_in_mbs_minus1 = $this->expGolombUe();        // pic_width_in_mbs_minus1
+			$this->expGolombUe(); // num_ref_frames
+			$this->skipBits(1); // gaps_in_frame_num_value_allowed_flag
+			$pic_width_in_mbs_minus1 = $this->expGolombUe(); // pic_width_in_mbs_minus1
 			$pic_height_in_map_units_minus1 = $this->expGolombUe(); // pic_height_in_map_units_minus1
 
-			$frame_mbs_only_flag = $this->getBits(1);               // frame_mbs_only_flag
+			$frame_mbs_only_flag = $this->getBits(1); // frame_mbs_only_flag
 			if ($frame_mbs_only_flag == 0) {
-				$this->skipBits(1);                                 // mb_adaptive_frame_field_flag
+				$this->skipBits(1); // mb_adaptive_frame_field_flag
 			}
-			$this->skipBits(1);                                     // direct_8x8_inference_flag
-			$frame_cropping_flag = $this->getBits(1);               // frame_cropping_flag
+			$this->skipBits(1); // direct_8x8_inference_flag
+			$frame_cropping_flag = $this->getBits(1); // frame_cropping_flag
 
 			$frame_crop_left_offset   = 0;
 			$frame_crop_right_offset  = 0;
@@ -678,12 +678,12 @@ 
 			$frame_crop_bottom_offset = 0;
 
 			if ($frame_cropping_flag) {
-				$frame_crop_left_offset   = $this->expGolombUe();   // frame_crop_left_offset
-				$frame_crop_right_offset  = $this->expGolombUe();   // frame_crop_right_offset
-				$frame_crop_top_offset    = $this->expGolombUe();   // frame_crop_top_offset
-				$frame_crop_bottom_offset = $this->expGolombUe();   // frame_crop_bottom_offset
+				$frame_crop_left_offset   = $this->expGolombUe(); // frame_crop_left_offset
+				$frame_crop_right_offset  = $this->expGolombUe(); // frame_crop_right_offset
+				$frame_crop_top_offset    = $this->expGolombUe(); // frame_crop_top_offset
+				$frame_crop_bottom_offset = $this->expGolombUe(); // frame_crop_bottom_offset
 			}
-			$this->skipBits(1);                                     // vui_parameters_present_flag
+			$this->skipBits(1); // vui_parameters_present_flag
 			// etc
 
 			$this->width  = (($pic_width_in_mbs_minus1 + 1) * 16) - ($frame_crop_left_offset * 2) - ($frame_crop_right_offset * 2);
@@ -693,7 +693,7 @@ 
 
 	public function skipBits($bits) {
 		$newBits = $this->currentBits + $bits;
-		$this->currentBytes += (int)floor($newBits / 8);
+		$this->currentBytes += (int) floor($newBits / 8);
 		$this->currentBits = $newBits % 8;
 	}
 

src/wp-includes/ID3/module.audio-video.matroska.php

Doc Comments +7 added lines

@@ -1289,6 +1289,10 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $type
+	 * @param integer $line
+	 */
 	private function unhandledElement($type, $line, $element) {
 		// warn only about unknown and missed elements, not about unuseful
 		if (!in_array($element['id'], $this->unuseful_elements)) {
@@ -1345,6 +1349,9 @@ 
 		return $simpletag_entry;
 	}
 
+	/**
+	 * @param integer $block_type
+	 */
 	private function HandleEMBLClusterBlock($element, $block_type, &$info) {
 		// http://www.matroska.org/technical/specs/index.html#block_structure
 		// http://www.matroska.org/technical/specs/index.html#simpleblock_structure

Spacing +245 added lines, -245 removed lines

@@ -15,196 +15,196 @@ 
 /////////////////////////////////////////////////////////////////
 
 
-define('EBML_ID_CHAPTERS',                  0x0043A770); // [10][43][A7][70] -- A system to define basic menus and partition data. For more detailed information, look at the Chapters Explanation.
-define('EBML_ID_SEEKHEAD',                  0x014D9B74); // [11][4D][9B][74] -- Contains the position of other level 1 elements.
-define('EBML_ID_TAGS',                      0x0254C367); // [12][54][C3][67] -- Element containing elements specific to Tracks/Chapters. A list of valid tags can be found <http://www.matroska.org/technical/specs/tagging/index.html>.
-define('EBML_ID_INFO',                      0x0549A966); // [15][49][A9][66] -- Contains miscellaneous general information and statistics on the file.
-define('EBML_ID_TRACKS',                    0x0654AE6B); // [16][54][AE][6B] -- A top-level block of information with many tracks described.
-define('EBML_ID_SEGMENT',                   0x08538067); // [18][53][80][67] -- This element contains all other top-level (level 1) elements. Typically a Matroska file is composed of 1 segment.
-define('EBML_ID_ATTACHMENTS',               0x0941A469); // [19][41][A4][69] -- Contain attached files.
-define('EBML_ID_EBML',                      0x0A45DFA3); // [1A][45][DF][A3] -- Set the EBML characteristics of the data to follow. Each EBML document has to start with this.
-define('EBML_ID_CUES',                      0x0C53BB6B); // [1C][53][BB][6B] -- A top-level element to speed seeking access. All entries are local to the segment.
-define('EBML_ID_CLUSTER',                   0x0F43B675); // [1F][43][B6][75] -- The lower level element containing the (monolithic) Block structure.
-define('EBML_ID_LANGUAGE',                    0x02B59C); //     [22][B5][9C] -- Specifies the language of the track in the Matroska languages form.
-define('EBML_ID_TRACKTIMECODESCALE',          0x03314F); //     [23][31][4F] -- The scale to apply on this track to work at normal speed in relation with other tracks (mostly used to adjust video speed when the audio length differs).
-define('EBML_ID_DEFAULTDURATION',             0x03E383); //     [23][E3][83] -- Number of nanoseconds (i.e. not scaled) per frame.
-define('EBML_ID_CODECNAME',                   0x058688); //     [25][86][88] -- A human-readable string specifying the codec.
-define('EBML_ID_CODECDOWNLOADURL',            0x06B240); //     [26][B2][40] -- A URL to download about the codec used.
-define('EBML_ID_TIMECODESCALE',               0x0AD7B1); //     [2A][D7][B1] -- Timecode scale in nanoseconds (1.000.000 means all timecodes in the segment are expressed in milliseconds).
-define('EBML_ID_COLOURSPACE',                 0x0EB524); //     [2E][B5][24] -- Same value as in AVI (32 bits).
-define('EBML_ID_GAMMAVALUE',                  0x0FB523); //     [2F][B5][23] -- Gamma Value.
-define('EBML_ID_CODECSETTINGS',               0x1A9697); //     [3A][96][97] -- A string describing the encoding setting used.
-define('EBML_ID_CODECINFOURL',                0x1B4040); //     [3B][40][40] -- A URL to find information about the codec used.
-define('EBML_ID_PREVFILENAME',                0x1C83AB); //     [3C][83][AB] -- An escaped filename corresponding to the previous segment.
-define('EBML_ID_PREVUID',                     0x1CB923); //     [3C][B9][23] -- A unique ID to identify the previous chained segment (128 bits).
-define('EBML_ID_NEXTFILENAME',                0x1E83BB); //     [3E][83][BB] -- An escaped filename corresponding to the next segment.
-define('EBML_ID_NEXTUID',                     0x1EB923); //     [3E][B9][23] -- A unique ID to identify the next chained segment (128 bits).
-define('EBML_ID_CONTENTCOMPALGO',               0x0254); //         [42][54] -- The compression algorithm used. Algorithms that have been specified so far are:
-define('EBML_ID_CONTENTCOMPSETTINGS',           0x0255); //         [42][55] -- Settings that might be needed by the decompressor. For Header Stripping (ContentCompAlgo=3), the bytes that were removed from the beggining of each frames of the track.
-define('EBML_ID_DOCTYPE',                       0x0282); //         [42][82] -- A string that describes the type of document that follows this EBML header ('matroska' in our case).
-define('EBML_ID_DOCTYPEREADVERSION',            0x0285); //         [42][85] -- The minimum DocType version an interpreter has to support to read this file.
-define('EBML_ID_EBMLVERSION',                   0x0286); //         [42][86] -- The version of EBML parser used to create the file.
-define('EBML_ID_DOCTYPEVERSION',                0x0287); //         [42][87] -- The version of DocType interpreter used to create the file.
-define('EBML_ID_EBMLMAXIDLENGTH',               0x02F2); //         [42][F2] -- The maximum length of the IDs you'll find in this file (4 or less in Matroska).
-define('EBML_ID_EBMLMAXSIZELENGTH',             0x02F3); //         [42][F3] -- The maximum length of the sizes you'll find in this file (8 or less in Matroska). This does not override the element size indicated at the beginning of an element. Elements that have an indicated size which is larger than what is allowed by EBMLMaxSizeLength shall be considered invalid.
-define('EBML_ID_EBMLREADVERSION',               0x02F7); //         [42][F7] -- The minimum EBML version a parser has to support to read this file.
-define('EBML_ID_CHAPLANGUAGE',                  0x037C); //         [43][7C] -- The languages corresponding to the string, in the bibliographic ISO-639-2 form.
-define('EBML_ID_CHAPCOUNTRY',                   0x037E); //         [43][7E] -- The countries corresponding to the string, same 2 octets as in Internet domains.
-define('EBML_ID_SEGMENTFAMILY',                 0x0444); //         [44][44] -- A randomly generated unique ID that all segments related to each other must use (128 bits).
-define('EBML_ID_DATEUTC',                       0x0461); //         [44][61] -- Date of the origin of timecode (value 0), i.e. production date.
-define('EBML_ID_TAGLANGUAGE',                   0x047A); //         [44][7A] -- Specifies the language of the tag specified, in the Matroska languages form.
-define('EBML_ID_TAGDEFAULT',                    0x0484); //         [44][84] -- Indication to know if this is the default/original language to use for the given tag.
-define('EBML_ID_TAGBINARY',                     0x0485); //         [44][85] -- The values of the Tag if it is binary. Note that this cannot be used in the same SimpleTag as TagString.
-define('EBML_ID_TAGSTRING',                     0x0487); //         [44][87] -- The value of the Tag.
-define('EBML_ID_DURATION',                      0x0489); //         [44][89] -- Duration of the segment (based on TimecodeScale).
-define('EBML_ID_CHAPPROCESSPRIVATE',            0x050D); //         [45][0D] -- Some optional data attached to the ChapProcessCodecID information. For ChapProcessCodecID = 1, it is the "DVD level" equivalent.
-define('EBML_ID_CHAPTERFLAGENABLED',            0x0598); //         [45][98] -- Specify wether the chapter is enabled. It can be enabled/disabled by a Control Track. When disabled, the movie should skip all the content between the TimeStart and TimeEnd of this chapter.
-define('EBML_ID_TAGNAME',                       0x05A3); //         [45][A3] -- The name of the Tag that is going to be stored.
-define('EBML_ID_EDITIONENTRY',                  0x05B9); //         [45][B9] -- Contains all information about a segment edition.
-define('EBML_ID_EDITIONUID',                    0x05BC); //         [45][BC] -- A unique ID to identify the edition. It's useful for tagging an edition.
-define('EBML_ID_EDITIONFLAGHIDDEN',             0x05BD); //         [45][BD] -- If an edition is hidden (1), it should not be available to the user interface (but still to Control Tracks).
-define('EBML_ID_EDITIONFLAGDEFAULT',            0x05DB); //         [45][DB] -- If a flag is set (1) the edition should be used as the default one.
-define('EBML_ID_EDITIONFLAGORDERED',            0x05DD); //         [45][DD] -- Specify if the chapters can be defined multiple times and the order to play them is enforced.
-define('EBML_ID_FILEDATA',                      0x065C); //         [46][5C] -- The data of the file.
-define('EBML_ID_FILEMIMETYPE',                  0x0660); //         [46][60] -- MIME type of the file.
-define('EBML_ID_FILENAME',                      0x066E); //         [46][6E] -- Filename of the attached file.
-define('EBML_ID_FILEREFERRAL',                  0x0675); //         [46][75] -- A binary value that a track/codec can refer to when the attachment is needed.
-define('EBML_ID_FILEDESCRIPTION',               0x067E); //         [46][7E] -- A human-friendly name for the attached file.
-define('EBML_ID_FILEUID',                       0x06AE); //         [46][AE] -- Unique ID representing the file, as random as possible.
-define('EBML_ID_CONTENTENCALGO',                0x07E1); //         [47][E1] -- The encryption algorithm used. The value '0' means that the contents have not been encrypted but only signed. Predefined values:
-define('EBML_ID_CONTENTENCKEYID',               0x07E2); //         [47][E2] -- For public key algorithms this is the ID of the public key the the data was encrypted with.
-define('EBML_ID_CONTENTSIGNATURE',              0x07E3); //         [47][E3] -- A cryptographic signature of the contents.
-define('EBML_ID_CONTENTSIGKEYID',               0x07E4); //         [47][E4] -- This is the ID of the private key the data was signed with.
-define('EBML_ID_CONTENTSIGALGO',                0x07E5); //         [47][E5] -- The algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
-define('EBML_ID_CONTENTSIGHASHALGO',            0x07E6); //         [47][E6] -- The hash algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
-define('EBML_ID_MUXINGAPP',                     0x0D80); //         [4D][80] -- Muxing application or library ("libmatroska-0.4.3").
-define('EBML_ID_SEEK',                          0x0DBB); //         [4D][BB] -- Contains a single seek entry to an EBML element.
-define('EBML_ID_CONTENTENCODINGORDER',          0x1031); //         [50][31] -- Tells when this modification was used during encoding/muxing starting with 0 and counting upwards. The decoder/demuxer has to start with the highest order number it finds and work its way down. This value has to be unique over all ContentEncodingOrder elements in the segment.
-define('EBML_ID_CONTENTENCODINGSCOPE',          0x1032); //         [50][32] -- A bit field that describes which elements have been modified in this way. Values (big endian) can be OR'ed. Possible values:
-define('EBML_ID_CONTENTENCODINGTYPE',           0x1033); //         [50][33] -- A value describing what kind of transformation has been done. Possible values:
-define('EBML_ID_CONTENTCOMPRESSION',            0x1034); //         [50][34] -- Settings describing the compression used. Must be present if the value of ContentEncodingType is 0 and absent otherwise. Each block must be decompressable even if no previous block is available in order not to prevent seeking.
-define('EBML_ID_CONTENTENCRYPTION',             0x1035); //         [50][35] -- Settings describing the encryption used. Must be present if the value of ContentEncodingType is 1 and absent otherwise.
-define('EBML_ID_CUEREFNUMBER',                  0x135F); //         [53][5F] -- Number of the referenced Block of Track X in the specified Cluster.
-define('EBML_ID_NAME',                          0x136E); //         [53][6E] -- A human-readable track name.
-define('EBML_ID_CUEBLOCKNUMBER',                0x1378); //         [53][78] -- Number of the Block in the specified Cluster.
-define('EBML_ID_TRACKOFFSET',                   0x137F); //         [53][7F] -- A value to add to the Block's Timecode. This can be used to adjust the playback offset of a track.
-define('EBML_ID_SEEKID',                        0x13AB); //         [53][AB] -- The binary ID corresponding to the element name.
-define('EBML_ID_SEEKPOSITION',                  0x13AC); //         [53][AC] -- The position of the element in the segment in octets (0 = first level 1 element).
-define('EBML_ID_STEREOMODE',                    0x13B8); //         [53][B8] -- Stereo-3D video mode.
-define('EBML_ID_OLDSTEREOMODE',                 0x13B9); //         [53][B9] -- Bogus StereoMode value used in old versions of libmatroska. DO NOT USE. (0: mono, 1: right eye, 2: left eye, 3: both eyes).
-define('EBML_ID_PIXELCROPBOTTOM',               0x14AA); //         [54][AA] -- The number of video pixels to remove at the bottom of the image (for HDTV content).
-define('EBML_ID_DISPLAYWIDTH',                  0x14B0); //         [54][B0] -- Width of the video frames to display.
-define('EBML_ID_DISPLAYUNIT',                   0x14B2); //         [54][B2] -- Type of the unit for DisplayWidth/Height (0: pixels, 1: centimeters, 2: inches).
-define('EBML_ID_ASPECTRATIOTYPE',               0x14B3); //         [54][B3] -- Specify the possible modifications to the aspect ratio (0: free resizing, 1: keep aspect ratio, 2: fixed).
-define('EBML_ID_DISPLAYHEIGHT',                 0x14BA); //         [54][BA] -- Height of the video frames to display.
-define('EBML_ID_PIXELCROPTOP',                  0x14BB); //         [54][BB] -- The number of video pixels to remove at the top of the image.
-define('EBML_ID_PIXELCROPLEFT',                 0x14CC); //         [54][CC] -- The number of video pixels to remove on the left of the image.
-define('EBML_ID_PIXELCROPRIGHT',                0x14DD); //         [54][DD] -- The number of video pixels to remove on the right of the image.
-define('EBML_ID_FLAGFORCED',                    0x15AA); //         [55][AA] -- Set if that track MUST be used during playback. There can be many forced track for a kind (audio, video or subs), the player should select the one which language matches the user preference or the default + forced track. Overlay MAY happen between a forced and non-forced track of the same kind.
-define('EBML_ID_MAXBLOCKADDITIONID',            0x15EE); //         [55][EE] -- The maximum value of BlockAddID. A value 0 means there is no BlockAdditions for this track.
-define('EBML_ID_WRITINGAPP',                    0x1741); //         [57][41] -- Writing application ("mkvmerge-0.3.3").
-define('EBML_ID_CLUSTERSILENTTRACKS',           0x1854); //         [58][54] -- The list of tracks that are not used in that part of the stream. It is useful when using overlay tracks on seeking. Then you should decide what track to use.
-define('EBML_ID_CLUSTERSILENTTRACKNUMBER',      0x18D7); //         [58][D7] -- One of the track number that are not used from now on in the stream. It could change later if not specified as silent in a further Cluster.
-define('EBML_ID_ATTACHEDFILE',                  0x21A7); //         [61][A7] -- An attached file.
-define('EBML_ID_CONTENTENCODING',               0x2240); //         [62][40] -- Settings for one content encoding like compression or encryption.
-define('EBML_ID_BITDEPTH',                      0x2264); //         [62][64] -- Bits per sample, mostly used for PCM.
-define('EBML_ID_CODECPRIVATE',                  0x23A2); //         [63][A2] -- Private data only known to the codec.
-define('EBML_ID_TARGETS',                       0x23C0); //         [63][C0] -- Contain all UIDs where the specified meta data apply. It is void to describe everything in the segment.
-define('EBML_ID_CHAPTERPHYSICALEQUIV',          0x23C3); //         [63][C3] -- Specify the physical equivalent of this ChapterAtom like "DVD" (60) or "SIDE" (50), see complete list of values.
-define('EBML_ID_TAGCHAPTERUID',                 0x23C4); //         [63][C4] -- A unique ID to identify the Chapter(s) the tags belong to. If the value is 0 at this level, the tags apply to all chapters in the Segment.
-define('EBML_ID_TAGTRACKUID',                   0x23C5); //         [63][C5] -- A unique ID to identify the Track(s) the tags belong to. If the value is 0 at this level, the tags apply to all tracks in the Segment.
-define('EBML_ID_TAGATTACHMENTUID',              0x23C6); //         [63][C6] -- A unique ID to identify the Attachment(s) the tags belong to. If the value is 0 at this level, the tags apply to all the attachments in the Segment.
-define('EBML_ID_TAGEDITIONUID',                 0x23C9); //         [63][C9] -- A unique ID to identify the EditionEntry(s) the tags belong to. If the value is 0 at this level, the tags apply to all editions in the Segment.
-define('EBML_ID_TARGETTYPE',                    0x23CA); //         [63][CA] -- An informational string that can be used to display the logical level of the target like "ALBUM", "TRACK", "MOVIE", "CHAPTER", etc (see TargetType).
-define('EBML_ID_TRACKTRANSLATE',                0x2624); //         [66][24] -- The track identification for the given Chapter Codec.
-define('EBML_ID_TRACKTRANSLATETRACKID',         0x26A5); //         [66][A5] -- The binary value used to represent this track in the chapter codec data. The format depends on the ChapProcessCodecID used.
-define('EBML_ID_TRACKTRANSLATECODEC',           0x26BF); //         [66][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
-define('EBML_ID_TRACKTRANSLATEEDITIONUID',      0x26FC); //         [66][FC] -- Specify an edition UID on which this translation applies. When not specified, it means for all editions found in the segment.
-define('EBML_ID_SIMPLETAG',                     0x27C8); //         [67][C8] -- Contains general information about the target.
-define('EBML_ID_TARGETTYPEVALUE',               0x28CA); //         [68][CA] -- A number to indicate the logical level of the target (see TargetType).
-define('EBML_ID_CHAPPROCESSCOMMAND',            0x2911); //         [69][11] -- Contains all the commands associated to the Atom.
-define('EBML_ID_CHAPPROCESSTIME',               0x2922); //         [69][22] -- Defines when the process command should be handled (0: during the whole chapter, 1: before starting playback, 2: after playback of the chapter).
-define('EBML_ID_CHAPTERTRANSLATE',              0x2924); //         [69][24] -- A tuple of corresponding ID used by chapter codecs to represent this segment.
-define('EBML_ID_CHAPPROCESSDATA',               0x2933); //         [69][33] -- Contains the command information. The data should be interpreted depending on the ChapProcessCodecID value. For ChapProcessCodecID = 1, the data correspond to the binary DVD cell pre/post commands.
-define('EBML_ID_CHAPPROCESS',                   0x2944); //         [69][44] -- Contains all the commands associated to the Atom.
-define('EBML_ID_CHAPPROCESSCODECID',            0x2955); //         [69][55] -- Contains the type of the codec used for the processing. A value of 0 means native Matroska processing (to be defined), a value of 1 means the DVD command set is used. More codec IDs can be added later.
-define('EBML_ID_CHAPTERTRANSLATEID',            0x29A5); //         [69][A5] -- The binary value used to represent this segment in the chapter codec data. The format depends on the ChapProcessCodecID used.
-define('EBML_ID_CHAPTERTRANSLATECODEC',         0x29BF); //         [69][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
-define('EBML_ID_CHAPTERTRANSLATEEDITIONUID',    0x29FC); //         [69][FC] -- Specify an edition UID on which this correspondance applies. When not specified, it means for all editions found in the segment.
-define('EBML_ID_CONTENTENCODINGS',              0x2D80); //         [6D][80] -- Settings for several content encoding mechanisms like compression or encryption.
-define('EBML_ID_MINCACHE',                      0x2DE7); //         [6D][E7] -- The minimum number of frames a player should be able to cache during playback. If set to 0, the reference pseudo-cache system is not used.
-define('EBML_ID_MAXCACHE',                      0x2DF8); //         [6D][F8] -- The maximum cache size required to store referenced frames in and the current frame. 0 means no cache is needed.
-define('EBML_ID_CHAPTERSEGMENTUID',             0x2E67); //         [6E][67] -- A segment to play in place of this chapter. Edition ChapterSegmentEditionUID should be used for this segment, otherwise no edition is used.
-define('EBML_ID_CHAPTERSEGMENTEDITIONUID',      0x2EBC); //         [6E][BC] -- The edition to play from the segment linked in ChapterSegmentUID.
-define('EBML_ID_TRACKOVERLAY',                  0x2FAB); //         [6F][AB] -- Specify that this track is an overlay track for the Track specified (in the u-integer). That means when this track has a gap (see SilentTracks) the overlay track should be used instead. The order of multiple TrackOverlay matters, the first one is the one that should be used. If not found it should be the second, etc.
-define('EBML_ID_TAG',                           0x3373); //         [73][73] -- Element containing elements specific to Tracks/Chapters.
-define('EBML_ID_SEGMENTFILENAME',               0x3384); //         [73][84] -- A filename corresponding to this segment.
-define('EBML_ID_SEGMENTUID',                    0x33A4); //         [73][A4] -- A randomly generated unique ID to identify the current segment between many others (128 bits).
-define('EBML_ID_CHAPTERUID',                    0x33C4); //         [73][C4] -- A unique ID to identify the Chapter.
-define('EBML_ID_TRACKUID',                      0x33C5); //         [73][C5] -- A unique ID to identify the Track. This should be kept the same when making a direct stream copy of the Track to another file.
-define('EBML_ID_ATTACHMENTLINK',                0x3446); //         [74][46] -- The UID of an attachment that is used by this codec.
-define('EBML_ID_CLUSTERBLOCKADDITIONS',         0x35A1); //         [75][A1] -- Contain additional blocks to complete the main one. An EBML parser that has no knowledge of the Block structure could still see and use/skip these data.
-define('EBML_ID_CHANNELPOSITIONS',              0x347B); //         [7D][7B] -- Table of horizontal angles for each successive channel, see appendix.
-define('EBML_ID_OUTPUTSAMPLINGFREQUENCY',       0x38B5); //         [78][B5] -- Real output sampling frequency in Hz (used for SBR techniques).
-define('EBML_ID_TITLE',                         0x3BA9); //         [7B][A9] -- General name of the segment.
-define('EBML_ID_CHAPTERDISPLAY',                  0x00); //             [80] -- Contains all possible strings to use for the chapter display.
-define('EBML_ID_TRACKTYPE',                       0x03); //             [83] -- A set of track types coded on 8 bits (1: video, 2: audio, 3: complex, 0x10: logo, 0x11: subtitle, 0x12: buttons, 0x20: control).
-define('EBML_ID_CHAPSTRING',                      0x05); //             [85] -- Contains the string to use as the chapter atom.
-define('EBML_ID_CODECID',                         0x06); //             [86] -- An ID corresponding to the codec, see the codec page for more info.
-define('EBML_ID_FLAGDEFAULT',                     0x08); //             [88] -- Set if that track (audio, video or subs) SHOULD be used if no language found matches the user preference.
-define('EBML_ID_CHAPTERTRACKNUMBER',              0x09); //             [89] -- UID of the Track to apply this chapter too. In the absense of a control track, choosing this chapter will select the listed Tracks and deselect unlisted tracks. Absense of this element indicates that the Chapter should be applied to any currently used Tracks.
-define('EBML_ID_CLUSTERSLICES',                   0x0E); //             [8E] -- Contains slices description.
-define('EBML_ID_CHAPTERTRACK',                    0x0F); //             [8F] -- List of tracks on which the chapter applies. If this element is not present, all tracks apply
-define('EBML_ID_CHAPTERTIMESTART',                0x11); //             [91] -- Timecode of the start of Chapter (not scaled).
-define('EBML_ID_CHAPTERTIMEEND',                  0x12); //             [92] -- Timecode of the end of Chapter (timecode excluded, not scaled).
-define('EBML_ID_CUEREFTIME',                      0x16); //             [96] -- Timecode of the referenced Block.
-define('EBML_ID_CUEREFCLUSTER',                   0x17); //             [97] -- Position of the Cluster containing the referenced Block.
-define('EBML_ID_CHAPTERFLAGHIDDEN',               0x18); //             [98] -- If a chapter is hidden (1), it should not be available to the user interface (but still to Control Tracks).
-define('EBML_ID_FLAGINTERLACED',                  0x1A); //             [9A] -- Set if the video is interlaced.
-define('EBML_ID_CLUSTERBLOCKDURATION',            0x1B); //             [9B] -- The duration of the Block (based on TimecodeScale). This element is mandatory when DefaultDuration is set for the track. When not written and with no DefaultDuration, the value is assumed to be the difference between the timecode of this Block and the timecode of the next Block in "display" order (not coding order). This element can be useful at the end of a Track (as there is not other Block available), or when there is a break in a track like for subtitle tracks.
-define('EBML_ID_FLAGLACING',                      0x1C); //             [9C] -- Set if the track may contain blocks using lacing.
-define('EBML_ID_CHANNELS',                        0x1F); //             [9F] -- Numbers of channels in the track.
-define('EBML_ID_CLUSTERBLOCKGROUP',               0x20); //             [A0] -- Basic container of information containing a single Block or BlockVirtual, and information specific to that Block/VirtualBlock.
-define('EBML_ID_CLUSTERBLOCK',                    0x21); //             [A1] -- Block containing the actual data to be rendered and a timecode relative to the Cluster Timecode.
-define('EBML_ID_CLUSTERBLOCKVIRTUAL',             0x22); //             [A2] -- A Block with no data. It must be stored in the stream at the place the real Block should be in display order.
-define('EBML_ID_CLUSTERSIMPLEBLOCK',              0x23); //             [A3] -- Similar to Block but without all the extra information, mostly used to reduced overhead when no extra feature is needed.
-define('EBML_ID_CLUSTERCODECSTATE',               0x24); //             [A4] -- The new codec state to use. Data interpretation is private to the codec. This information should always be referenced by a seek entry.
-define('EBML_ID_CLUSTERBLOCKADDITIONAL',          0x25); //             [A5] -- Interpreted by the codec as it wishes (using the BlockAddID).
-define('EBML_ID_CLUSTERBLOCKMORE',                0x26); //             [A6] -- Contain the BlockAdditional and some parameters.
-define('EBML_ID_CLUSTERPOSITION',                 0x27); //             [A7] -- Position of the Cluster in the segment (0 in live broadcast streams). It might help to resynchronise offset on damaged streams.
-define('EBML_ID_CODECDECODEALL',                  0x2A); //             [AA] -- The codec can decode potentially damaged data.
-define('EBML_ID_CLUSTERPREVSIZE',                 0x2B); //             [AB] -- Size of the previous Cluster, in octets. Can be useful for backward playing.
-define('EBML_ID_TRACKENTRY',                      0x2E); //             [AE] -- Describes a track with all elements.
-define('EBML_ID_CLUSTERENCRYPTEDBLOCK',           0x2F); //             [AF] -- Similar to SimpleBlock but the data inside the Block are Transformed (encrypt and/or signed).
-define('EBML_ID_PIXELWIDTH',                      0x30); //             [B0] -- Width of the encoded video frames in pixels.
-define('EBML_ID_CUETIME',                         0x33); //             [B3] -- Absolute timecode according to the segment time base.
-define('EBML_ID_SAMPLINGFREQUENCY',               0x35); //             [B5] -- Sampling frequency in Hz.
-define('EBML_ID_CHAPTERATOM',                     0x36); //             [B6] -- Contains the atom information to use as the chapter atom (apply to all tracks).
-define('EBML_ID_CUETRACKPOSITIONS',               0x37); //             [B7] -- Contain positions for different tracks corresponding to the timecode.
-define('EBML_ID_FLAGENABLED',                     0x39); //             [B9] -- Set if the track is used.
-define('EBML_ID_PIXELHEIGHT',                     0x3A); //             [BA] -- Height of the encoded video frames in pixels.
-define('EBML_ID_CUEPOINT',                        0x3B); //             [BB] -- Contains all information relative to a seek point in the segment.
-define('EBML_ID_CRC32',                           0x3F); //             [BF] -- The CRC is computed on all the data of the Master element it's in, regardless of its position. It's recommended to put the CRC value at the beggining of the Master element for easier reading. All level 1 elements should include a CRC-32.
-define('EBML_ID_CLUSTERBLOCKADDITIONID',          0x4B); //             [CB] -- The ID of the BlockAdditional element (0 is the main Block).
-define('EBML_ID_CLUSTERLACENUMBER',               0x4C); //             [CC] -- The reverse number of the frame in the lace (0 is the last frame, 1 is the next to last, etc). While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
-define('EBML_ID_CLUSTERFRAMENUMBER',              0x4D); //             [CD] -- The number of the frame to generate from this lace with this delay (allow you to generate many frames from the same Block/Frame).
-define('EBML_ID_CLUSTERDELAY',                    0x4E); //             [CE] -- The (scaled) delay to apply to the element.
-define('EBML_ID_CLUSTERDURATION',                 0x4F); //             [CF] -- The (scaled) duration to apply to the element.
-define('EBML_ID_TRACKNUMBER',                     0x57); //             [D7] -- The track number as used in the Block Header (using more than 127 tracks is not encouraged, though the design allows an unlimited number).
-define('EBML_ID_CUEREFERENCE',                    0x5B); //             [DB] -- The Clusters containing the required referenced Blocks.
-define('EBML_ID_VIDEO',                           0x60); //             [E0] -- Video settings.
-define('EBML_ID_AUDIO',                           0x61); //             [E1] -- Audio settings.
-define('EBML_ID_CLUSTERTIMESLICE',                0x68); //             [E8] -- Contains extra time information about the data contained in the Block. While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
-define('EBML_ID_CUECODECSTATE',                   0x6A); //             [EA] -- The position of the Codec State corresponding to this Cue element. 0 means that the data is taken from the initial Track Entry.
-define('EBML_ID_CUEREFCODECSTATE',                0x6B); //             [EB] -- The position of the Codec State corresponding to this referenced element. 0 means that the data is taken from the initial Track Entry.
-define('EBML_ID_VOID',                            0x6C); //             [EC] -- Used to void damaged data, to avoid unexpected behaviors when using damaged data. The content is discarded. Also used to reserve space in a sub-element for later use.
-define('EBML_ID_CLUSTERTIMECODE',                 0x67); //             [E7] -- Absolute timecode of the cluster (based on TimecodeScale).
-define('EBML_ID_CLUSTERBLOCKADDID',               0x6E); //             [EE] -- An ID to identify the BlockAdditional level.
-define('EBML_ID_CUECLUSTERPOSITION',              0x71); //             [F1] -- The position of the Cluster containing the required Block.
-define('EBML_ID_CUETRACK',                        0x77); //             [F7] -- The track for which a position is given.
-define('EBML_ID_CLUSTERREFERENCEPRIORITY',        0x7A); //             [FA] -- This frame is referenced and has the specified cache priority. In cache only a frame of the same or higher priority can replace this frame. A value of 0 means the frame is not referenced.
-define('EBML_ID_CLUSTERREFERENCEBLOCK',           0x7B); //             [FB] -- Timecode of another frame used as a reference (ie: B or P frame). The timecode is relative to the block it's attached to.
-define('EBML_ID_CLUSTERREFERENCEVIRTUAL',         0x7D); //             [FD] -- Relative position of the data that should be in position of the virtual block.
+define('EBML_ID_CHAPTERS', 0x0043A770); // [10][43][A7][70] -- A system to define basic menus and partition data. For more detailed information, look at the Chapters Explanation.
+define('EBML_ID_SEEKHEAD', 0x014D9B74); // [11][4D][9B][74] -- Contains the position of other level 1 elements.
+define('EBML_ID_TAGS', 0x0254C367); // [12][54][C3][67] -- Element containing elements specific to Tracks/Chapters. A list of valid tags can be found <http://www.matroska.org/technical/specs/tagging/index.html>.
+define('EBML_ID_INFO', 0x0549A966); // [15][49][A9][66] -- Contains miscellaneous general information and statistics on the file.
+define('EBML_ID_TRACKS', 0x0654AE6B); // [16][54][AE][6B] -- A top-level block of information with many tracks described.
+define('EBML_ID_SEGMENT', 0x08538067); // [18][53][80][67] -- This element contains all other top-level (level 1) elements. Typically a Matroska file is composed of 1 segment.
+define('EBML_ID_ATTACHMENTS', 0x0941A469); // [19][41][A4][69] -- Contain attached files.
+define('EBML_ID_EBML', 0x0A45DFA3); // [1A][45][DF][A3] -- Set the EBML characteristics of the data to follow. Each EBML document has to start with this.
+define('EBML_ID_CUES', 0x0C53BB6B); // [1C][53][BB][6B] -- A top-level element to speed seeking access. All entries are local to the segment.
+define('EBML_ID_CLUSTER', 0x0F43B675); // [1F][43][B6][75] -- The lower level element containing the (monolithic) Block structure.
+define('EBML_ID_LANGUAGE', 0x02B59C); //     [22][B5][9C] -- Specifies the language of the track in the Matroska languages form.
+define('EBML_ID_TRACKTIMECODESCALE', 0x03314F); //     [23][31][4F] -- The scale to apply on this track to work at normal speed in relation with other tracks (mostly used to adjust video speed when the audio length differs).
+define('EBML_ID_DEFAULTDURATION', 0x03E383); //     [23][E3][83] -- Number of nanoseconds (i.e. not scaled) per frame.
+define('EBML_ID_CODECNAME', 0x058688); //     [25][86][88] -- A human-readable string specifying the codec.
+define('EBML_ID_CODECDOWNLOADURL', 0x06B240); //     [26][B2][40] -- A URL to download about the codec used.
+define('EBML_ID_TIMECODESCALE', 0x0AD7B1); //     [2A][D7][B1] -- Timecode scale in nanoseconds (1.000.000 means all timecodes in the segment are expressed in milliseconds).
+define('EBML_ID_COLOURSPACE', 0x0EB524); //     [2E][B5][24] -- Same value as in AVI (32 bits).
+define('EBML_ID_GAMMAVALUE', 0x0FB523); //     [2F][B5][23] -- Gamma Value.
+define('EBML_ID_CODECSETTINGS', 0x1A9697); //     [3A][96][97] -- A string describing the encoding setting used.
+define('EBML_ID_CODECINFOURL', 0x1B4040); //     [3B][40][40] -- A URL to find information about the codec used.
+define('EBML_ID_PREVFILENAME', 0x1C83AB); //     [3C][83][AB] -- An escaped filename corresponding to the previous segment.
+define('EBML_ID_PREVUID', 0x1CB923); //     [3C][B9][23] -- A unique ID to identify the previous chained segment (128 bits).
+define('EBML_ID_NEXTFILENAME', 0x1E83BB); //     [3E][83][BB] -- An escaped filename corresponding to the next segment.
+define('EBML_ID_NEXTUID', 0x1EB923); //     [3E][B9][23] -- A unique ID to identify the next chained segment (128 bits).
+define('EBML_ID_CONTENTCOMPALGO', 0x0254); //         [42][54] -- The compression algorithm used. Algorithms that have been specified so far are:
+define('EBML_ID_CONTENTCOMPSETTINGS', 0x0255); //         [42][55] -- Settings that might be needed by the decompressor. For Header Stripping (ContentCompAlgo=3), the bytes that were removed from the beggining of each frames of the track.
+define('EBML_ID_DOCTYPE', 0x0282); //         [42][82] -- A string that describes the type of document that follows this EBML header ('matroska' in our case).
+define('EBML_ID_DOCTYPEREADVERSION', 0x0285); //         [42][85] -- The minimum DocType version an interpreter has to support to read this file.
+define('EBML_ID_EBMLVERSION', 0x0286); //         [42][86] -- The version of EBML parser used to create the file.
+define('EBML_ID_DOCTYPEVERSION', 0x0287); //         [42][87] -- The version of DocType interpreter used to create the file.
+define('EBML_ID_EBMLMAXIDLENGTH', 0x02F2); //         [42][F2] -- The maximum length of the IDs you'll find in this file (4 or less in Matroska).
+define('EBML_ID_EBMLMAXSIZELENGTH', 0x02F3); //         [42][F3] -- The maximum length of the sizes you'll find in this file (8 or less in Matroska). This does not override the element size indicated at the beginning of an element. Elements that have an indicated size which is larger than what is allowed by EBMLMaxSizeLength shall be considered invalid.
+define('EBML_ID_EBMLREADVERSION', 0x02F7); //         [42][F7] -- The minimum EBML version a parser has to support to read this file.
+define('EBML_ID_CHAPLANGUAGE', 0x037C); //         [43][7C] -- The languages corresponding to the string, in the bibliographic ISO-639-2 form.
+define('EBML_ID_CHAPCOUNTRY', 0x037E); //         [43][7E] -- The countries corresponding to the string, same 2 octets as in Internet domains.
+define('EBML_ID_SEGMENTFAMILY', 0x0444); //         [44][44] -- A randomly generated unique ID that all segments related to each other must use (128 bits).
+define('EBML_ID_DATEUTC', 0x0461); //         [44][61] -- Date of the origin of timecode (value 0), i.e. production date.
+define('EBML_ID_TAGLANGUAGE', 0x047A); //         [44][7A] -- Specifies the language of the tag specified, in the Matroska languages form.
+define('EBML_ID_TAGDEFAULT', 0x0484); //         [44][84] -- Indication to know if this is the default/original language to use for the given tag.
+define('EBML_ID_TAGBINARY', 0x0485); //         [44][85] -- The values of the Tag if it is binary. Note that this cannot be used in the same SimpleTag as TagString.
+define('EBML_ID_TAGSTRING', 0x0487); //         [44][87] -- The value of the Tag.
+define('EBML_ID_DURATION', 0x0489); //         [44][89] -- Duration of the segment (based on TimecodeScale).
+define('EBML_ID_CHAPPROCESSPRIVATE', 0x050D); //         [45][0D] -- Some optional data attached to the ChapProcessCodecID information. For ChapProcessCodecID = 1, it is the "DVD level" equivalent.
+define('EBML_ID_CHAPTERFLAGENABLED', 0x0598); //         [45][98] -- Specify wether the chapter is enabled. It can be enabled/disabled by a Control Track. When disabled, the movie should skip all the content between the TimeStart and TimeEnd of this chapter.
+define('EBML_ID_TAGNAME', 0x05A3); //         [45][A3] -- The name of the Tag that is going to be stored.
+define('EBML_ID_EDITIONENTRY', 0x05B9); //         [45][B9] -- Contains all information about a segment edition.
+define('EBML_ID_EDITIONUID', 0x05BC); //         [45][BC] -- A unique ID to identify the edition. It's useful for tagging an edition.
+define('EBML_ID_EDITIONFLAGHIDDEN', 0x05BD); //         [45][BD] -- If an edition is hidden (1), it should not be available to the user interface (but still to Control Tracks).
+define('EBML_ID_EDITIONFLAGDEFAULT', 0x05DB); //         [45][DB] -- If a flag is set (1) the edition should be used as the default one.
+define('EBML_ID_EDITIONFLAGORDERED', 0x05DD); //         [45][DD] -- Specify if the chapters can be defined multiple times and the order to play them is enforced.
+define('EBML_ID_FILEDATA', 0x065C); //         [46][5C] -- The data of the file.
+define('EBML_ID_FILEMIMETYPE', 0x0660); //         [46][60] -- MIME type of the file.
+define('EBML_ID_FILENAME', 0x066E); //         [46][6E] -- Filename of the attached file.
+define('EBML_ID_FILEREFERRAL', 0x0675); //         [46][75] -- A binary value that a track/codec can refer to when the attachment is needed.
+define('EBML_ID_FILEDESCRIPTION', 0x067E); //         [46][7E] -- A human-friendly name for the attached file.
+define('EBML_ID_FILEUID', 0x06AE); //         [46][AE] -- Unique ID representing the file, as random as possible.
+define('EBML_ID_CONTENTENCALGO', 0x07E1); //         [47][E1] -- The encryption algorithm used. The value '0' means that the contents have not been encrypted but only signed. Predefined values:
+define('EBML_ID_CONTENTENCKEYID', 0x07E2); //         [47][E2] -- For public key algorithms this is the ID of the public key the the data was encrypted with.
+define('EBML_ID_CONTENTSIGNATURE', 0x07E3); //         [47][E3] -- A cryptographic signature of the contents.
+define('EBML_ID_CONTENTSIGKEYID', 0x07E4); //         [47][E4] -- This is the ID of the private key the data was signed with.
+define('EBML_ID_CONTENTSIGALGO', 0x07E5); //         [47][E5] -- The algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
+define('EBML_ID_CONTENTSIGHASHALGO', 0x07E6); //         [47][E6] -- The hash algorithm used for the signature. A value of '0' means that the contents have not been signed but only encrypted. Predefined values:
+define('EBML_ID_MUXINGAPP', 0x0D80); //         [4D][80] -- Muxing application or library ("libmatroska-0.4.3").
+define('EBML_ID_SEEK', 0x0DBB); //         [4D][BB] -- Contains a single seek entry to an EBML element.
+define('EBML_ID_CONTENTENCODINGORDER', 0x1031); //         [50][31] -- Tells when this modification was used during encoding/muxing starting with 0 and counting upwards. The decoder/demuxer has to start with the highest order number it finds and work its way down. This value has to be unique over all ContentEncodingOrder elements in the segment.
+define('EBML_ID_CONTENTENCODINGSCOPE', 0x1032); //         [50][32] -- A bit field that describes which elements have been modified in this way. Values (big endian) can be OR'ed. Possible values:
+define('EBML_ID_CONTENTENCODINGTYPE', 0x1033); //         [50][33] -- A value describing what kind of transformation has been done. Possible values:
+define('EBML_ID_CONTENTCOMPRESSION', 0x1034); //         [50][34] -- Settings describing the compression used. Must be present if the value of ContentEncodingType is 0 and absent otherwise. Each block must be decompressable even if no previous block is available in order not to prevent seeking.
+define('EBML_ID_CONTENTENCRYPTION', 0x1035); //         [50][35] -- Settings describing the encryption used. Must be present if the value of ContentEncodingType is 1 and absent otherwise.
+define('EBML_ID_CUEREFNUMBER', 0x135F); //         [53][5F] -- Number of the referenced Block of Track X in the specified Cluster.
+define('EBML_ID_NAME', 0x136E); //         [53][6E] -- A human-readable track name.
+define('EBML_ID_CUEBLOCKNUMBER', 0x1378); //         [53][78] -- Number of the Block in the specified Cluster.
+define('EBML_ID_TRACKOFFSET', 0x137F); //         [53][7F] -- A value to add to the Block's Timecode. This can be used to adjust the playback offset of a track.
+define('EBML_ID_SEEKID', 0x13AB); //         [53][AB] -- The binary ID corresponding to the element name.
+define('EBML_ID_SEEKPOSITION', 0x13AC); //         [53][AC] -- The position of the element in the segment in octets (0 = first level 1 element).
+define('EBML_ID_STEREOMODE', 0x13B8); //         [53][B8] -- Stereo-3D video mode.
+define('EBML_ID_OLDSTEREOMODE', 0x13B9); //         [53][B9] -- Bogus StereoMode value used in old versions of libmatroska. DO NOT USE. (0: mono, 1: right eye, 2: left eye, 3: both eyes).
+define('EBML_ID_PIXELCROPBOTTOM', 0x14AA); //         [54][AA] -- The number of video pixels to remove at the bottom of the image (for HDTV content).
+define('EBML_ID_DISPLAYWIDTH', 0x14B0); //         [54][B0] -- Width of the video frames to display.
+define('EBML_ID_DISPLAYUNIT', 0x14B2); //         [54][B2] -- Type of the unit for DisplayWidth/Height (0: pixels, 1: centimeters, 2: inches).
+define('EBML_ID_ASPECTRATIOTYPE', 0x14B3); //         [54][B3] -- Specify the possible modifications to the aspect ratio (0: free resizing, 1: keep aspect ratio, 2: fixed).
+define('EBML_ID_DISPLAYHEIGHT', 0x14BA); //         [54][BA] -- Height of the video frames to display.
+define('EBML_ID_PIXELCROPTOP', 0x14BB); //         [54][BB] -- The number of video pixels to remove at the top of the image.
+define('EBML_ID_PIXELCROPLEFT', 0x14CC); //         [54][CC] -- The number of video pixels to remove on the left of the image.
+define('EBML_ID_PIXELCROPRIGHT', 0x14DD); //         [54][DD] -- The number of video pixels to remove on the right of the image.
+define('EBML_ID_FLAGFORCED', 0x15AA); //         [55][AA] -- Set if that track MUST be used during playback. There can be many forced track for a kind (audio, video or subs), the player should select the one which language matches the user preference or the default + forced track. Overlay MAY happen between a forced and non-forced track of the same kind.
+define('EBML_ID_MAXBLOCKADDITIONID', 0x15EE); //         [55][EE] -- The maximum value of BlockAddID. A value 0 means there is no BlockAdditions for this track.
+define('EBML_ID_WRITINGAPP', 0x1741); //         [57][41] -- Writing application ("mkvmerge-0.3.3").
+define('EBML_ID_CLUSTERSILENTTRACKS', 0x1854); //         [58][54] -- The list of tracks that are not used in that part of the stream. It is useful when using overlay tracks on seeking. Then you should decide what track to use.
+define('EBML_ID_CLUSTERSILENTTRACKNUMBER', 0x18D7); //         [58][D7] -- One of the track number that are not used from now on in the stream. It could change later if not specified as silent in a further Cluster.
+define('EBML_ID_ATTACHEDFILE', 0x21A7); //         [61][A7] -- An attached file.
+define('EBML_ID_CONTENTENCODING', 0x2240); //         [62][40] -- Settings for one content encoding like compression or encryption.
+define('EBML_ID_BITDEPTH', 0x2264); //         [62][64] -- Bits per sample, mostly used for PCM.
+define('EBML_ID_CODECPRIVATE', 0x23A2); //         [63][A2] -- Private data only known to the codec.
+define('EBML_ID_TARGETS', 0x23C0); //         [63][C0] -- Contain all UIDs where the specified meta data apply. It is void to describe everything in the segment.
+define('EBML_ID_CHAPTERPHYSICALEQUIV', 0x23C3); //         [63][C3] -- Specify the physical equivalent of this ChapterAtom like "DVD" (60) or "SIDE" (50), see complete list of values.
+define('EBML_ID_TAGCHAPTERUID', 0x23C4); //         [63][C4] -- A unique ID to identify the Chapter(s) the tags belong to. If the value is 0 at this level, the tags apply to all chapters in the Segment.
+define('EBML_ID_TAGTRACKUID', 0x23C5); //         [63][C5] -- A unique ID to identify the Track(s) the tags belong to. If the value is 0 at this level, the tags apply to all tracks in the Segment.
+define('EBML_ID_TAGATTACHMENTUID', 0x23C6); //         [63][C6] -- A unique ID to identify the Attachment(s) the tags belong to. If the value is 0 at this level, the tags apply to all the attachments in the Segment.
+define('EBML_ID_TAGEDITIONUID', 0x23C9); //         [63][C9] -- A unique ID to identify the EditionEntry(s) the tags belong to. If the value is 0 at this level, the tags apply to all editions in the Segment.
+define('EBML_ID_TARGETTYPE', 0x23CA); //         [63][CA] -- An informational string that can be used to display the logical level of the target like "ALBUM", "TRACK", "MOVIE", "CHAPTER", etc (see TargetType).
+define('EBML_ID_TRACKTRANSLATE', 0x2624); //         [66][24] -- The track identification for the given Chapter Codec.
+define('EBML_ID_TRACKTRANSLATETRACKID', 0x26A5); //         [66][A5] -- The binary value used to represent this track in the chapter codec data. The format depends on the ChapProcessCodecID used.
+define('EBML_ID_TRACKTRANSLATECODEC', 0x26BF); //         [66][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
+define('EBML_ID_TRACKTRANSLATEEDITIONUID', 0x26FC); //         [66][FC] -- Specify an edition UID on which this translation applies. When not specified, it means for all editions found in the segment.
+define('EBML_ID_SIMPLETAG', 0x27C8); //         [67][C8] -- Contains general information about the target.
+define('EBML_ID_TARGETTYPEVALUE', 0x28CA); //         [68][CA] -- A number to indicate the logical level of the target (see TargetType).
+define('EBML_ID_CHAPPROCESSCOMMAND', 0x2911); //         [69][11] -- Contains all the commands associated to the Atom.
+define('EBML_ID_CHAPPROCESSTIME', 0x2922); //         [69][22] -- Defines when the process command should be handled (0: during the whole chapter, 1: before starting playback, 2: after playback of the chapter).
+define('EBML_ID_CHAPTERTRANSLATE', 0x2924); //         [69][24] -- A tuple of corresponding ID used by chapter codecs to represent this segment.
+define('EBML_ID_CHAPPROCESSDATA', 0x2933); //         [69][33] -- Contains the command information. The data should be interpreted depending on the ChapProcessCodecID value. For ChapProcessCodecID = 1, the data correspond to the binary DVD cell pre/post commands.
+define('EBML_ID_CHAPPROCESS', 0x2944); //         [69][44] -- Contains all the commands associated to the Atom.
+define('EBML_ID_CHAPPROCESSCODECID', 0x2955); //         [69][55] -- Contains the type of the codec used for the processing. A value of 0 means native Matroska processing (to be defined), a value of 1 means the DVD command set is used. More codec IDs can be added later.
+define('EBML_ID_CHAPTERTRANSLATEID', 0x29A5); //         [69][A5] -- The binary value used to represent this segment in the chapter codec data. The format depends on the ChapProcessCodecID used.
+define('EBML_ID_CHAPTERTRANSLATECODEC', 0x29BF); //         [69][BF] -- The chapter codec using this ID (0: Matroska Script, 1: DVD-menu).
+define('EBML_ID_CHAPTERTRANSLATEEDITIONUID', 0x29FC); //         [69][FC] -- Specify an edition UID on which this correspondance applies. When not specified, it means for all editions found in the segment.
+define('EBML_ID_CONTENTENCODINGS', 0x2D80); //         [6D][80] -- Settings for several content encoding mechanisms like compression or encryption.
+define('EBML_ID_MINCACHE', 0x2DE7); //         [6D][E7] -- The minimum number of frames a player should be able to cache during playback. If set to 0, the reference pseudo-cache system is not used.
+define('EBML_ID_MAXCACHE', 0x2DF8); //         [6D][F8] -- The maximum cache size required to store referenced frames in and the current frame. 0 means no cache is needed.
+define('EBML_ID_CHAPTERSEGMENTUID', 0x2E67); //         [6E][67] -- A segment to play in place of this chapter. Edition ChapterSegmentEditionUID should be used for this segment, otherwise no edition is used.
+define('EBML_ID_CHAPTERSEGMENTEDITIONUID', 0x2EBC); //         [6E][BC] -- The edition to play from the segment linked in ChapterSegmentUID.
+define('EBML_ID_TRACKOVERLAY', 0x2FAB); //         [6F][AB] -- Specify that this track is an overlay track for the Track specified (in the u-integer). That means when this track has a gap (see SilentTracks) the overlay track should be used instead. The order of multiple TrackOverlay matters, the first one is the one that should be used. If not found it should be the second, etc.
+define('EBML_ID_TAG', 0x3373); //         [73][73] -- Element containing elements specific to Tracks/Chapters.
+define('EBML_ID_SEGMENTFILENAME', 0x3384); //         [73][84] -- A filename corresponding to this segment.
+define('EBML_ID_SEGMENTUID', 0x33A4); //         [73][A4] -- A randomly generated unique ID to identify the current segment between many others (128 bits).
+define('EBML_ID_CHAPTERUID', 0x33C4); //         [73][C4] -- A unique ID to identify the Chapter.
+define('EBML_ID_TRACKUID', 0x33C5); //         [73][C5] -- A unique ID to identify the Track. This should be kept the same when making a direct stream copy of the Track to another file.
+define('EBML_ID_ATTACHMENTLINK', 0x3446); //         [74][46] -- The UID of an attachment that is used by this codec.
+define('EBML_ID_CLUSTERBLOCKADDITIONS', 0x35A1); //         [75][A1] -- Contain additional blocks to complete the main one. An EBML parser that has no knowledge of the Block structure could still see and use/skip these data.
+define('EBML_ID_CHANNELPOSITIONS', 0x347B); //         [7D][7B] -- Table of horizontal angles for each successive channel, see appendix.
+define('EBML_ID_OUTPUTSAMPLINGFREQUENCY', 0x38B5); //         [78][B5] -- Real output sampling frequency in Hz (used for SBR techniques).
+define('EBML_ID_TITLE', 0x3BA9); //         [7B][A9] -- General name of the segment.
+define('EBML_ID_CHAPTERDISPLAY', 0x00); //             [80] -- Contains all possible strings to use for the chapter display.
+define('EBML_ID_TRACKTYPE', 0x03); //             [83] -- A set of track types coded on 8 bits (1: video, 2: audio, 3: complex, 0x10: logo, 0x11: subtitle, 0x12: buttons, 0x20: control).
+define('EBML_ID_CHAPSTRING', 0x05); //             [85] -- Contains the string to use as the chapter atom.
+define('EBML_ID_CODECID', 0x06); //             [86] -- An ID corresponding to the codec, see the codec page for more info.
+define('EBML_ID_FLAGDEFAULT', 0x08); //             [88] -- Set if that track (audio, video or subs) SHOULD be used if no language found matches the user preference.
+define('EBML_ID_CHAPTERTRACKNUMBER', 0x09); //             [89] -- UID of the Track to apply this chapter too. In the absense of a control track, choosing this chapter will select the listed Tracks and deselect unlisted tracks. Absense of this element indicates that the Chapter should be applied to any currently used Tracks.
+define('EBML_ID_CLUSTERSLICES', 0x0E); //             [8E] -- Contains slices description.
+define('EBML_ID_CHAPTERTRACK', 0x0F); //             [8F] -- List of tracks on which the chapter applies. If this element is not present, all tracks apply
+define('EBML_ID_CHAPTERTIMESTART', 0x11); //             [91] -- Timecode of the start of Chapter (not scaled).
+define('EBML_ID_CHAPTERTIMEEND', 0x12); //             [92] -- Timecode of the end of Chapter (timecode excluded, not scaled).
+define('EBML_ID_CUEREFTIME', 0x16); //             [96] -- Timecode of the referenced Block.
+define('EBML_ID_CUEREFCLUSTER', 0x17); //             [97] -- Position of the Cluster containing the referenced Block.
+define('EBML_ID_CHAPTERFLAGHIDDEN', 0x18); //             [98] -- If a chapter is hidden (1), it should not be available to the user interface (but still to Control Tracks).
+define('EBML_ID_FLAGINTERLACED', 0x1A); //             [9A] -- Set if the video is interlaced.
+define('EBML_ID_CLUSTERBLOCKDURATION', 0x1B); //             [9B] -- The duration of the Block (based on TimecodeScale). This element is mandatory when DefaultDuration is set for the track. When not written and with no DefaultDuration, the value is assumed to be the difference between the timecode of this Block and the timecode of the next Block in "display" order (not coding order). This element can be useful at the end of a Track (as there is not other Block available), or when there is a break in a track like for subtitle tracks.
+define('EBML_ID_FLAGLACING', 0x1C); //             [9C] -- Set if the track may contain blocks using lacing.
+define('EBML_ID_CHANNELS', 0x1F); //             [9F] -- Numbers of channels in the track.
+define('EBML_ID_CLUSTERBLOCKGROUP', 0x20); //             [A0] -- Basic container of information containing a single Block or BlockVirtual, and information specific to that Block/VirtualBlock.
+define('EBML_ID_CLUSTERBLOCK', 0x21); //             [A1] -- Block containing the actual data to be rendered and a timecode relative to the Cluster Timecode.
+define('EBML_ID_CLUSTERBLOCKVIRTUAL', 0x22); //             [A2] -- A Block with no data. It must be stored in the stream at the place the real Block should be in display order.
+define('EBML_ID_CLUSTERSIMPLEBLOCK', 0x23); //             [A3] -- Similar to Block but without all the extra information, mostly used to reduced overhead when no extra feature is needed.
+define('EBML_ID_CLUSTERCODECSTATE', 0x24); //             [A4] -- The new codec state to use. Data interpretation is private to the codec. This information should always be referenced by a seek entry.
+define('EBML_ID_CLUSTERBLOCKADDITIONAL', 0x25); //             [A5] -- Interpreted by the codec as it wishes (using the BlockAddID).
+define('EBML_ID_CLUSTERBLOCKMORE', 0x26); //             [A6] -- Contain the BlockAdditional and some parameters.
+define('EBML_ID_CLUSTERPOSITION', 0x27); //             [A7] -- Position of the Cluster in the segment (0 in live broadcast streams). It might help to resynchronise offset on damaged streams.
+define('EBML_ID_CODECDECODEALL', 0x2A); //             [AA] -- The codec can decode potentially damaged data.
+define('EBML_ID_CLUSTERPREVSIZE', 0x2B); //             [AB] -- Size of the previous Cluster, in octets. Can be useful for backward playing.
+define('EBML_ID_TRACKENTRY', 0x2E); //             [AE] -- Describes a track with all elements.
+define('EBML_ID_CLUSTERENCRYPTEDBLOCK', 0x2F); //             [AF] -- Similar to SimpleBlock but the data inside the Block are Transformed (encrypt and/or signed).
+define('EBML_ID_PIXELWIDTH', 0x30); //             [B0] -- Width of the encoded video frames in pixels.
+define('EBML_ID_CUETIME', 0x33); //             [B3] -- Absolute timecode according to the segment time base.
+define('EBML_ID_SAMPLINGFREQUENCY', 0x35); //             [B5] -- Sampling frequency in Hz.
+define('EBML_ID_CHAPTERATOM', 0x36); //             [B6] -- Contains the atom information to use as the chapter atom (apply to all tracks).
+define('EBML_ID_CUETRACKPOSITIONS', 0x37); //             [B7] -- Contain positions for different tracks corresponding to the timecode.
+define('EBML_ID_FLAGENABLED', 0x39); //             [B9] -- Set if the track is used.
+define('EBML_ID_PIXELHEIGHT', 0x3A); //             [BA] -- Height of the encoded video frames in pixels.
+define('EBML_ID_CUEPOINT', 0x3B); //             [BB] -- Contains all information relative to a seek point in the segment.
+define('EBML_ID_CRC32', 0x3F); //             [BF] -- The CRC is computed on all the data of the Master element it's in, regardless of its position. It's recommended to put the CRC value at the beggining of the Master element for easier reading. All level 1 elements should include a CRC-32.
+define('EBML_ID_CLUSTERBLOCKADDITIONID', 0x4B); //             [CB] -- The ID of the BlockAdditional element (0 is the main Block).
+define('EBML_ID_CLUSTERLACENUMBER', 0x4C); //             [CC] -- The reverse number of the frame in the lace (0 is the last frame, 1 is the next to last, etc). While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
+define('EBML_ID_CLUSTERFRAMENUMBER', 0x4D); //             [CD] -- The number of the frame to generate from this lace with this delay (allow you to generate many frames from the same Block/Frame).
+define('EBML_ID_CLUSTERDELAY', 0x4E); //             [CE] -- The (scaled) delay to apply to the element.
+define('EBML_ID_CLUSTERDURATION', 0x4F); //             [CF] -- The (scaled) duration to apply to the element.
+define('EBML_ID_TRACKNUMBER', 0x57); //             [D7] -- The track number as used in the Block Header (using more than 127 tracks is not encouraged, though the design allows an unlimited number).
+define('EBML_ID_CUEREFERENCE', 0x5B); //             [DB] -- The Clusters containing the required referenced Blocks.
+define('EBML_ID_VIDEO', 0x60); //             [E0] -- Video settings.
+define('EBML_ID_AUDIO', 0x61); //             [E1] -- Audio settings.
+define('EBML_ID_CLUSTERTIMESLICE', 0x68); //             [E8] -- Contains extra time information about the data contained in the Block. While there are a few files in the wild with this element, it is no longer in use and has been deprecated. Being able to interpret this element is not required for playback.
+define('EBML_ID_CUECODECSTATE', 0x6A); //             [EA] -- The position of the Codec State corresponding to this Cue element. 0 means that the data is taken from the initial Track Entry.
+define('EBML_ID_CUEREFCODECSTATE', 0x6B); //             [EB] -- The position of the Codec State corresponding to this referenced element. 0 means that the data is taken from the initial Track Entry.
+define('EBML_ID_VOID', 0x6C); //             [EC] -- Used to void damaged data, to avoid unexpected behaviors when using damaged data. The content is discarded. Also used to reserve space in a sub-element for later use.
+define('EBML_ID_CLUSTERTIMECODE', 0x67); //             [E7] -- Absolute timecode of the cluster (based on TimecodeScale).
+define('EBML_ID_CLUSTERBLOCKADDID', 0x6E); //             [EE] -- An ID to identify the BlockAdditional level.
+define('EBML_ID_CUECLUSTERPOSITION', 0x71); //             [F1] -- The position of the Cluster containing the required Block.
+define('EBML_ID_CUETRACK', 0x77); //             [F7] -- The track for which a position is given.
+define('EBML_ID_CLUSTERREFERENCEPRIORITY', 0x7A); //             [FA] -- This frame is referenced and has the specified cache priority. In cache only a frame of the same or higher priority can replace this frame. A value of 0 means the frame is not referenced.
+define('EBML_ID_CLUSTERREFERENCEBLOCK', 0x7B); //             [FB] -- Timecode of another frame used as a reference (ie: B or P frame). The timecode is relative to the block it's attached to.
+define('EBML_ID_CLUSTERREFERENCEVIRTUAL', 0x7D); //             [FD] -- Relative position of the data that should be in position of the virtual block.
 
 
 /**
@@ -216,7 +216,7 @@ 
 class getid3_matroska extends getid3_handler
 {
 	// public options
-	public static $hide_clusters    = true;  // if true, do not return information about CLUSTER chunks, since there's a lot of them and they're not usually useful [default: TRUE]
+	public static $hide_clusters    = true; // if true, do not return information about CLUSTER chunks, since there's a lot of them and they're not usually useful [default: TRUE]
 	public static $parse_whole_file = false; // true to parse the whole file, not only header [default: FALSE]
 
 	// private parser settings/placeholders
@@ -274,11 +274,11 @@ 
 						$track_info['display_y']    = (isset($trackarray['DisplayHeight']) ? $trackarray['DisplayHeight'] : $trackarray['PixelHeight']);
 
 						if (isset($trackarray['PixelCropBottom'])) { $track_info['crop_bottom'] = $trackarray['PixelCropBottom']; }
-						if (isset($trackarray['PixelCropTop']))    { $track_info['crop_top']    = $trackarray['PixelCropTop']; }
-						if (isset($trackarray['PixelCropLeft']))   { $track_info['crop_left']   = $trackarray['PixelCropLeft']; }
-						if (isset($trackarray['PixelCropRight']))  { $track_info['crop_right']  = $trackarray['PixelCropRight']; }
+						if (isset($trackarray['PixelCropTop'])) { $track_info['crop_top']    = $trackarray['PixelCropTop']; }
+						if (isset($trackarray['PixelCropLeft'])) { $track_info['crop_left']   = $trackarray['PixelCropLeft']; }
+						if (isset($trackarray['PixelCropRight'])) { $track_info['crop_right']  = $trackarray['PixelCropRight']; }
 						if (isset($trackarray['DefaultDuration'])) { $track_info['frame_rate']  = round(1000000000 / $trackarray['DefaultDuration'], 3); }
-						if (isset($trackarray['CodecName']))       { $track_info['codec']       = $trackarray['CodecName']; }
+						if (isset($trackarray['CodecName'])) { $track_info['codec']       = $trackarray['CodecName']; }
 
 						switch ($trackarray['CodecID']) {
 							case 'V_MS/VFW/FOURCC':
@@ -320,7 +320,7 @@ 
 						$track_info['sample_rate'] = (isset($trackarray['SamplingFrequency']) ? $trackarray['SamplingFrequency'] : 8000.0);
 						$track_info['channels']    = (isset($trackarray['Channels']) ? $trackarray['Channels'] : 1);
 						$track_info['language']    = (isset($trackarray['Language']) ? $trackarray['Language'] : 'eng');
-						if (isset($trackarray['BitDepth']))  { $track_info['bits_per_sample'] = $trackarray['BitDepth']; }
+						if (isset($trackarray['BitDepth'])) { $track_info['bits_per_sample'] = $trackarray['BitDepth']; }
 						if (isset($trackarray['CodecName'])) { $track_info['codec']           = $trackarray['CodecName']; }
 
 						switch ($trackarray['CodecID']) {
@@ -336,7 +336,7 @@ 
 							case 'A_FLAC':
 								getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio.'.($track_info['dataformat'] == 'mp2' ? 'mp3' : $track_info['dataformat']).'.php', __FILE__, true);
 
-								if (!isset($info['matroska']['track_data_offsets'][$trackarray['TrackNumber']])) {
+								if ( ! isset($info['matroska']['track_data_offsets'][$trackarray['TrackNumber']])) {
 									$this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because $info[matroska][track_data_offsets]['.$trackarray['TrackNumber'].'] not set');
 									break;
 								}
@@ -361,7 +361,7 @@ 
 								else {
 									$getid3_audio->Analyze();
 								}
-								if (!empty($getid3_temp->info[$header_data_key])) {
+								if ( ! empty($getid3_temp->info[$header_data_key])) {
 									$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $getid3_temp->info[$header_data_key];
 									if (isset($getid3_temp->info['audio']) && is_array($getid3_temp->info['audio'])) {
 										foreach ($getid3_temp->info['audio'] as $key => $value) {
@@ -374,12 +374,12 @@ 
 								}
 
 								// copy errors and warnings
-								if (!empty($getid3_temp->info['error'])) {
+								if ( ! empty($getid3_temp->info['error'])) {
 									foreach ($getid3_temp->info['error'] as $newerror) {
 										$this->warning($class.'() says: ['.$newerror.']');
 									}
 								}
-								if (!empty($getid3_temp->info['warning'])) {
+								if ( ! empty($getid3_temp->info['warning'])) {
 									foreach ($getid3_temp->info['warning'] as $newerror) {
 										$this->warning($class.'() says: ['.$newerror.']');
 									}
@@ -396,7 +396,7 @@ 
 								break;
 
 							case 'A_VORBIS':
-								if (!isset($trackarray['CodecPrivate'])) {
+								if ( ! isset($trackarray['CodecPrivate'])) {
 									$this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because CodecPrivate data not set');
 									break;
 								}
@@ -416,7 +416,7 @@ 
 								$getid3_ogg = new getid3_ogg($getid3_temp);
 								$oggpageinfo['page_seqno'] = 0;
 								$getid3_ogg->ParseVorbisPageHeader($trackarray['CodecPrivate'], $vorbis_offset, $oggpageinfo);
-								if (!empty($getid3_temp->info['ogg'])) {
+								if ( ! empty($getid3_temp->info['ogg'])) {
 									$info['matroska']['track_codec_parsed'][$trackarray['TrackNumber']] = $getid3_temp->info['ogg'];
 									if (isset($getid3_temp->info['audio']) && is_array($getid3_temp->info['audio'])) {
 										foreach ($getid3_temp->info['audio'] as $key => $value) {
@@ -426,18 +426,18 @@ 
 								}
 
 								// copy errors and warnings
-								if (!empty($getid3_temp->info['error'])) {
+								if ( ! empty($getid3_temp->info['error'])) {
 									foreach ($getid3_temp->info['error'] as $newerror) {
 										$this->warning('getid3_ogg() says: ['.$newerror.']');
 									}
 								}
-								if (!empty($getid3_temp->info['warning'])) {
+								if ( ! empty($getid3_temp->info['warning'])) {
 									foreach ($getid3_temp->info['warning'] as $newerror) {
 										$this->warning('getid3_ogg() says: ['.$newerror.']');
 									}
 								}
 
-								if (!empty($getid3_temp->info['ogg']['bitrate_nominal'])) {
+								if ( ! empty($getid3_temp->info['ogg']['bitrate_nominal'])) {
 									$track_info['bitrate'] = $getid3_temp->info['ogg']['bitrate_nominal'];
 								}
 								unset($getid3_temp, $getid3_ogg, $oggpageinfo, $vorbis_offset);
@@ -464,10 +464,10 @@ 
 				}
 			}
 
-			if (!empty($info['video']['streams'])) {
+			if ( ! empty($info['video']['streams'])) {
 				$info['video'] = self::getDefaultStreamInfo($info['video']['streams']);
 			}
-			if (!empty($info['audio']['streams'])) {
+			if ( ! empty($info['audio']['streams'])) {
 				$info['audio'] = self::getDefaultStreamInfo($info['audio']['streams']);
 			}
 		}
@@ -475,16 +475,16 @@ 
 		// process attachments
 		if (isset($info['matroska']['attachments']) && $this->getid3->option_save_attachments !== getID3::ATTACHMENTS_NONE) {
 			foreach ($info['matroska']['attachments'] as $i => $entry) {
-				if (strpos($entry['FileMimeType'], 'image/') === 0 && !empty($entry['FileData'])) {
+				if (strpos($entry['FileMimeType'], 'image/') === 0 && ! empty($entry['FileData'])) {
 					$info['matroska']['comments']['picture'][] = array('data' => $entry['FileData'], 'image_mime' => $entry['FileMimeType'], 'filename' => $entry['FileName']);
 				}
 			}
 		}
 
 		// determine mime type
-		if (!empty($info['video']['streams'])) {
+		if ( ! empty($info['video']['streams'])) {
 			$info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'video/webm' : 'video/x-matroska');
-		} elseif (!empty($info['audio']['streams'])) {
+		} elseif ( ! empty($info['audio']['streams'])) {
 			$info['mime_type'] = ($info['matroska']['doctype'] == 'webm' ? 'audio/webm' : 'audio/x-matroska');
 		} elseif (isset($info['mime_type'])) {
 			unset($info['mime_type']);
@@ -536,7 +536,7 @@ 
 					$info['matroska']['segment'][0]['length'] = $top_element['length'];
 
 					while ($this->getEBMLelement($element_data, $top_element['end'])) {
-						if ($element_data['id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
+						if ($element_data['id'] != EBML_ID_CLUSTER || ! self::$hide_clusters) { // collect clusters only if required
 							$info['matroska']['segments'][] = $element_data;
 						}
 						switch ($element_data['id']) {
@@ -561,10 +561,10 @@ 
 														break;
 
 													default:
-														$this->unhandledElement('seekhead.seek', __LINE__, $sub_seek_entry);												}
+														$this->unhandledElement('seekhead.seek', __LINE__, $sub_seek_entry); }
 											}
 
-											if ($seek_entry['target_id'] != EBML_ID_CLUSTER || !self::$hide_clusters) { // collect clusters only if required
+											if ($seek_entry['target_id'] != EBML_ID_CLUSTER || ! self::$hide_clusters) { // collect clusters only if required
 												$info['matroska']['seek'][] = $seek_entry;
 											}
 											break;
@@ -640,7 +640,7 @@ 
 																	break;
 
 																case EBML_ID_FLAGINTERLACED:
-																	$track_entry[$sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_subelement['data']);
+																	$track_entry[$sub_subelement['id_name']] = (bool) getid3_lib::BigEndian2Int($sub_subelement['data']);
 																	break;
 
 																case EBML_ID_GAMMAVALUE:
@@ -1014,7 +1014,7 @@ 
 													case EBML_ID_EDITIONFLAGHIDDEN:
 													case EBML_ID_EDITIONFLAGDEFAULT:
 													case EBML_ID_EDITIONFLAGORDERED:
-														$editionentry_entry[$sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_subelement['data']);
+														$editionentry_entry[$sub_subelement['id_name']] = (bool) getid3_lib::BigEndian2Int($sub_subelement['data']);
 														break;
 
 													case EBML_ID_CHAPTERATOM:
@@ -1030,7 +1030,7 @@ 
 
 																case EBML_ID_CHAPTERFLAGENABLED:
 																case EBML_ID_CHAPTERFLAGHIDDEN:
-																	$chapteratom_entry[$sub_sub_subelement['id_name']] = (bool)getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
+																	$chapteratom_entry[$sub_sub_subelement['id_name']] = (bool) getid3_lib::BigEndian2Int($sub_sub_subelement['data']);
 																	break;
 
 																case EBML_ID_CHAPTERUID:
@@ -1163,12 +1163,12 @@ 
 									}
 									$this->current_offset = $subelement['end'];
 								}
-								if (!self::$hide_clusters) {
+								if ( ! self::$hide_clusters) {
 									$info['matroska']['cluster'][] = $cluster_entry;
 								}
 
 								// check to see if all the data we need exists already, if so, break out of the loop
-								if (!self::$parse_whole_file) {
+								if ( ! self::$parse_whole_file) {
 									if (isset($info['matroska']['info']) && is_array($info['matroska']['info'])) {
 										if (isset($info['matroska']['tracks']['tracks']) && is_array($info['matroska']['tracks']['tracks'])) {
 											if (count($info['matroska']['track_data_offsets']) == count($info['matroska']['tracks']['tracks'])) {
@@ -1191,7 +1191,7 @@ 
 		}
 	}
 
-	private function EnsureBufferHasEnoughData($min_data=1024) {
+	private function EnsureBufferHasEnoughData($min_data = 1024) {
 		if (($this->current_offset - $this->EBMLbuffer_offset) >= ($this->EBMLbuffer_length - $min_data)) {
 			$read_bytes = max($min_data, $this->getid3->fread_buffer_size());
 
@@ -1217,7 +1217,7 @@ 
 
 		// get length of integer
 		$first_byte_int = ord($this->EBMLbuffer[$actual_offset]);
-		if       (0x80 & $first_byte_int) {
+		if (0x80 & $first_byte_int) {
 			$length = 1;
 		} elseif (0x40 & $first_byte_int) {
 			$length = 2;
@@ -1244,8 +1244,8 @@ 
 		return $int_value;
 	}
 
-	private function readEBMLelementData($length, $check_buffer=false) {
-		if ($check_buffer && !$this->EnsureBufferHasEnoughData($length)) {
+	private function readEBMLelementData($length, $check_buffer = false) {
+		if ($check_buffer && ! $this->EnsureBufferHasEnoughData($length)) {
 			return false;
 		}
 		$data = substr($this->EBMLbuffer, $this->current_offset - $this->EBMLbuffer_offset, $length);
@@ -1253,12 +1253,12 @@ 
 		return $data;
 	}
 
-	private function getEBMLelement(&$element, $parent_end, $get_data=false) {
+	private function getEBMLelement(&$element, $parent_end, $get_data = false) {
 		if ($this->current_offset >= $parent_end) {
 			return false;
 		}
 
-		if (!$this->EnsureBufferHasEnoughData()) {
+		if ( ! $this->EnsureBufferHasEnoughData()) {
 			$this->current_offset = PHP_INT_MAX; // do not exit parser right now, allow to finish current loop to gather maximum information
 			return false;
 		}
@@ -1282,7 +1282,7 @@ 
 
 		// get raw data
 		$dont_parse = (in_array($element['id'], $this->unuseful_elements) || $element['id_name'] == dechex($element['id']));
-		if (($get_data === true || (is_array($get_data) && !in_array($element['id'], $get_data))) && !$dont_parse) {
+		if (($get_data === true || (is_array($get_data) && ! in_array($element['id'], $get_data))) && ! $dont_parse) {
 			$element['data'] = $this->readEBMLelementData($element['length'], $element);
 		}
 
@@ -1291,23 +1291,23 @@ 
 
 	private function unhandledElement($type, $line, $element) {
 		// warn only about unknown and missed elements, not about unuseful
-		if (!in_array($element['id'], $this->unuseful_elements)) {
+		if ( ! in_array($element['id'], $this->unuseful_elements)) {
 			$this->warning('Unhandled '.$type.' element ['.basename(__FILE__).':'.$line.'] ('.$element['id'].'::'.$element['id_name'].' ['.$element['length'].' bytes]) at '.$element['offset']);
 		}
 
 		// increase offset for unparsed elements
-		if (!isset($element['data'])) {
+		if ( ! isset($element['data'])) {
 			$this->current_offset = $element['end'];
 		}
 	}
 
 	private function ExtractCommentsSimpleTag($SimpleTagArray) {
-		if (!empty($SimpleTagArray['SimpleTag'])) {
+		if ( ! empty($SimpleTagArray['SimpleTag'])) {
 			foreach ($SimpleTagArray['SimpleTag'] as $SimpleTagKey => $SimpleTagData) {
-				if (!empty($SimpleTagData['TagName']) && !empty($SimpleTagData['TagString'])) {
+				if ( ! empty($SimpleTagData['TagName']) && ! empty($SimpleTagData['TagString'])) {
 					$this->getid3->info['matroska']['comments'][strtolower($SimpleTagData['TagName'])][] = $SimpleTagData['TagString'];
 				}
-				if (!empty($SimpleTagData['SimpleTag'])) {
+				if ( ! empty($SimpleTagData['SimpleTag'])) {
 					$this->ExtractCommentsSimpleTag($SimpleTagData);
 				}
 			}
@@ -1334,7 +1334,7 @@ 
 					break;
 
 				case EBML_ID_TAGDEFAULT:
-					$simpletag_entry[$element['id_name']] = (bool)getid3_lib::BigEndian2Int($element['data']);
+					$simpletag_entry[$element['id_name']] = (bool) getid3_lib::BigEndian2Int($element['data']);
 					break;
 
 				default:
@@ -1355,14 +1355,14 @@ 
 		$block_data['flags_raw']   = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));
 
 		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
-			$block_data['flags']['keyframe']  = (($block_data['flags_raw'] & 0x80) >> 7);
+			$block_data['flags']['keyframe'] = (($block_data['flags_raw'] & 0x80) >> 7);
 			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0x70) >> 4);
 		}
 		else {
 			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0xF0) >> 4);
 		}
-		$block_data['flags']['invisible'] = (bool)(($block_data['flags_raw'] & 0x08) >> 3);
-		$block_data['flags']['lacing']    =       (($block_data['flags_raw'] & 0x06) >> 1);  // 00=no lacing; 01=Xiph lacing; 11=EBML lacing; 10=fixed-size lacing
+		$block_data['flags']['invisible'] = (bool) (($block_data['flags_raw'] & 0x08) >> 3);
+		$block_data['flags']['lacing']    = (($block_data['flags_raw'] & 0x06) >> 1); // 00=no lacing; 01=Xiph lacing; 11=EBML lacing; 10=fixed-size lacing
 		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
 			$block_data['flags']['discardable'] = (($block_data['flags_raw'] & 0x01));
 		}
@@ -1375,7 +1375,7 @@ 
 		if ($block_data['flags']['lacing'] > 0) {
 			$block_data['lace_frames'] = getid3_lib::BigEndian2Int($this->readEBMLelementData(1)) + 1; // Number of frames in the lace-1 (uint8)
 			if ($block_data['flags']['lacing'] != 0x02) {
-				for ($i = 1; $i < $block_data['lace_frames']; $i ++) { // Lace-coded size of each frame of the lace, except for the last one (multiple uint8). *This is not used with Fixed-size lacing as it is calculated automatically from (total size of lace) / (number of frames in lace).
+				for ($i = 1; $i < $block_data['lace_frames']; $i++) { // Lace-coded size of each frame of the lace, except for the last one (multiple uint8). *This is not used with Fixed-size lacing as it is calculated automatically from (total size of lace) / (number of frames in lace).
 					if ($block_data['flags']['lacing'] == 0x03) { // EBML lacing
 						$block_data['lace_frames_size'][$i] = $this->readEBMLint(); // TODO: read size correctly, calc size for the last frame. For now offsets are deteminded OK with readEBMLint() and that's the most important thing.
 					}
@@ -1394,7 +1394,7 @@ 
 			}
 		}
 
-		if (!isset($info['matroska']['track_data_offsets'][$block_data['tracknumber']])) {
+		if ( ! isset($info['matroska']['track_data_offsets'][$block_data['tracknumber']])) {
 			$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['offset'] = $this->current_offset;
 			$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['length'] = $element['end'] - $this->current_offset;
 			//$info['matroska']['track_data_offsets'][$block_data['tracknumber']]['total_length'] = 0;
@@ -1460,13 +1460,13 @@ 
 		// http://www.matroska.org/technical/specs/tagging/index.html
 		static $TargetTypeValue = array();
 		if (empty($TargetTypeValue)) {
-			$TargetTypeValue[10] = 'A: ~ V:shot';                                           // the lowest hierarchy found in music or movies
-			$TargetTypeValue[20] = 'A:subtrack/part/movement ~ V:scene';                    // corresponds to parts of a track for audio (like a movement)
-			$TargetTypeValue[30] = 'A:track/song ~ V:chapter';                              // the common parts of an album or a movie
-			$TargetTypeValue[40] = 'A:part/session ~ V:part/session';                       // when an album or episode has different logical parts
-			$TargetTypeValue[50] = 'A:album/opera/concert ~ V:movie/episode/concert';       // the most common grouping level of music and video (equals to an episode for TV series)
-			$TargetTypeValue[60] = 'A:edition/issue/volume/opus ~ V:season/sequel/volume';  // a list of lower levels grouped together
-			$TargetTypeValue[70] = 'A:collection ~ V:collection';                           // the high hierarchy consisting of many different lower items
+			$TargetTypeValue[10] = 'A: ~ V:shot'; // the lowest hierarchy found in music or movies
+			$TargetTypeValue[20] = 'A:subtrack/part/movement ~ V:scene'; // corresponds to parts of a track for audio (like a movement)
+			$TargetTypeValue[30] = 'A:track/song ~ V:chapter'; // the common parts of an album or a movie
+			$TargetTypeValue[40] = 'A:part/session ~ V:part/session'; // when an album or episode has different logical parts
+			$TargetTypeValue[50] = 'A:album/opera/concert ~ V:movie/episode/concert'; // the most common grouping level of music and video (equals to an episode for TV series)
+			$TargetTypeValue[60] = 'A:edition/issue/volume/opus ~ V:season/sequel/volume'; // a list of lower levels grouped together
+			$TargetTypeValue[70] = 'A:collection ~ V:collection'; // the high hierarchy consisting of many different lower items
 		}
 		return (isset($TargetTypeValue[$target_type]) ? $TargetTypeValue[$target_type] : $target_type);
 	}
@@ -1495,8 +1495,8 @@ 
 			$CodecIDlist['A_MPEG/L1']        = 'mp1';
 			$CodecIDlist['A_MPEG/L2']        = 'mp2';
 			$CodecIDlist['A_MPEG/L3']        = 'mp3';
-			$CodecIDlist['A_PCM/INT/LIT']    = 'pcm';       // PCM Integer Little Endian
-			$CodecIDlist['A_PCM/INT/BIG']    = 'pcm';       // PCM Integer Big Endian
+			$CodecIDlist['A_PCM/INT/LIT']    = 'pcm'; // PCM Integer Little Endian
+			$CodecIDlist['A_PCM/INT/BIG']    = 'pcm'; // PCM Integer Big Endian
 			$CodecIDlist['A_QUICKTIME/QDMC'] = 'quicktime'; // Quicktime: QDesign Music
 			$CodecIDlist['A_QUICKTIME/QDM2'] = 'quicktime'; // Quicktime: QDesign Music v2
 			$CodecIDlist['A_VORBIS']         = 'vorbis';

Braces +5 added lines, -10 removed lines

@@ -357,8 +357,7 @@ 
 								$getid3_audio = new $class($getid3_temp, __CLASS__);
 								if ($track_info['dataformat'] == 'flac') {
 									$getid3_audio->AnalyzeString($trackarray['CodecPrivate']);
-								}
-								else {
+								} else {
 									$getid3_audio->Analyze();
 								}
 								if (!empty($getid3_temp->info[$header_data_key])) {
@@ -368,8 +367,7 @@ 
 											$track_info[$key] = $value;
 										}
 									}
-								}
-								else {
+								} else {
 									$this->warning('Unable to parse audio data ['.basename(__FILE__).':'.__LINE__.'] because '.$class.'::Analyze() failed at offset '.$getid3_temp->info['avdataoffset']);
 								}
 
@@ -1357,16 +1355,14 @@ 
 		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
 			$block_data['flags']['keyframe']  = (($block_data['flags_raw'] & 0x80) >> 7);
 			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0x70) >> 4);
-		}
-		else {
+		} else {
 			//$block_data['flags']['reserved1'] = (($block_data['flags_raw'] & 0xF0) >> 4);
 		}
 		$block_data['flags']['invisible'] = (bool)(($block_data['flags_raw'] & 0x08) >> 3);
 		$block_data['flags']['lacing']    =       (($block_data['flags_raw'] & 0x06) >> 1);  // 00=no lacing; 01=Xiph lacing; 11=EBML lacing; 10=fixed-size lacing
 		if ($block_type == EBML_ID_CLUSTERSIMPLEBLOCK) {
 			$block_data['flags']['discardable'] = (($block_data['flags_raw'] & 0x01));
-		}
-		else {
+		} else {
 			//$block_data['flags']['reserved2'] = (($block_data['flags_raw'] & 0x01) >> 0);
 		}
 		$block_data['flags']['lacing_type'] = self::BlockLacingType($block_data['flags']['lacing']);
@@ -1378,8 +1374,7 @@ 
 				for ($i = 1; $i < $block_data['lace_frames']; $i ++) { // Lace-coded size of each frame of the lace, except for the last one (multiple uint8). *This is not used with Fixed-size lacing as it is calculated automatically from (total size of lace) / (number of frames in lace).
 					if ($block_data['flags']['lacing'] == 0x03) { // EBML lacing
 						$block_data['lace_frames_size'][$i] = $this->readEBMLint(); // TODO: read size correctly, calc size for the last frame. For now offsets are deteminded OK with readEBMLint() and that's the most important thing.
-					}
-					else { // Xiph lacing
+					} else { // Xiph lacing
 						$block_data['lace_frames_size'][$i] = 0;
 						do {
 							$size = getid3_lib::BigEndian2Int($this->readEBMLelementData(1));

src/wp-includes/ID3/module.audio-video.quicktime.php

Doc Comments +16 added lines

@@ -118,6 +118,10 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $atomname
+	 * @param string $atom_data
+	 */
 	public function QuicktimeParseAtom($atomname, $atomsize, $atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
 		// http://developer.apple.com/techpubs/quicktime/qtdevdocs/APIREF/INDEX/atomalphaindex.htm
 
@@ -1424,6 +1428,9 @@ 
 		return $atom_structure;
 	}
 
+	/**
+	 * @param integer $baseoffset
+	 */
 	public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
 //echo 'QuicktimeParseContainerAtom('.substr($atom_data, 4, 4).') @ '.$baseoffset.'<br><br>';
 		$atom_structure  = false;
@@ -1452,6 +1459,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $offset
+	 */
 	public function quicktime_read_mp4_descr_length($data, &$offset) {
 		// http://libquicktime.sourcearchive.com/documentation/2:1.0.2plus-pdebian-2build1/esds_8c-source.html
 		$num_bytes = 0;
@@ -2230,6 +2240,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $nullterminatedstring
+	 */
 	public function NoNullString($nullterminatedstring) {
 		// remove the single null terminator on null terminated strings
 		if (substr($nullterminatedstring, strlen($nullterminatedstring) - 1, 1) === "\x00") {
@@ -2238,6 +2251,9 @@ 
 		return $nullterminatedstring;
 	}
 
+	/**
+	 * @param string $pascalstring
+	 */
 	public function Pascal2String($pascalstring) {
 		// Pascal strings have 1 unsigned byte at the beginning saying how many chars (1-255) are in the string
 		return substr($pascalstring, 1);

Indentation +53 added lines, -53 removed lines

@@ -1402,9 +1402,9 @@ 
 				// mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4
 				// http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
 
-	            $atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
-	            $atom_structure['flags_raw'] =          getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
-	            $atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom(substr($atom_data, 4), $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
+				$atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw'] =          getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+				$atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom(substr($atom_data, 4), $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
 				//$atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
 				break;
 
@@ -1753,56 +1753,56 @@ 
 		static $QuicktimeIODSaudioProfileNameLookup = array();
 		if (empty($QuicktimeIODSaudioProfileNameLookup)) {
 			$QuicktimeIODSaudioProfileNameLookup = array(
-			    0x00 => 'ISO Reserved (0x00)',
-			    0x01 => 'Main Audio Profile @ Level 1',
-			    0x02 => 'Main Audio Profile @ Level 2',
-			    0x03 => 'Main Audio Profile @ Level 3',
-			    0x04 => 'Main Audio Profile @ Level 4',
-			    0x05 => 'Scalable Audio Profile @ Level 1',
-			    0x06 => 'Scalable Audio Profile @ Level 2',
-			    0x07 => 'Scalable Audio Profile @ Level 3',
-			    0x08 => 'Scalable Audio Profile @ Level 4',
-			    0x09 => 'Speech Audio Profile @ Level 1',
-			    0x0A => 'Speech Audio Profile @ Level 2',
-			    0x0B => 'Synthetic Audio Profile @ Level 1',
-			    0x0C => 'Synthetic Audio Profile @ Level 2',
-			    0x0D => 'Synthetic Audio Profile @ Level 3',
-			    0x0E => 'High Quality Audio Profile @ Level 1',
-			    0x0F => 'High Quality Audio Profile @ Level 2',
-			    0x10 => 'High Quality Audio Profile @ Level 3',
-			    0x11 => 'High Quality Audio Profile @ Level 4',
-			    0x12 => 'High Quality Audio Profile @ Level 5',
-			    0x13 => 'High Quality Audio Profile @ Level 6',
-			    0x14 => 'High Quality Audio Profile @ Level 7',
-			    0x15 => 'High Quality Audio Profile @ Level 8',
-			    0x16 => 'Low Delay Audio Profile @ Level 1',
-			    0x17 => 'Low Delay Audio Profile @ Level 2',
-			    0x18 => 'Low Delay Audio Profile @ Level 3',
-			    0x19 => 'Low Delay Audio Profile @ Level 4',
-			    0x1A => 'Low Delay Audio Profile @ Level 5',
-			    0x1B => 'Low Delay Audio Profile @ Level 6',
-			    0x1C => 'Low Delay Audio Profile @ Level 7',
-			    0x1D => 'Low Delay Audio Profile @ Level 8',
-			    0x1E => 'Natural Audio Profile @ Level 1',
-			    0x1F => 'Natural Audio Profile @ Level 2',
-			    0x20 => 'Natural Audio Profile @ Level 3',
-			    0x21 => 'Natural Audio Profile @ Level 4',
-			    0x22 => 'Mobile Audio Internetworking Profile @ Level 1',
-			    0x23 => 'Mobile Audio Internetworking Profile @ Level 2',
-			    0x24 => 'Mobile Audio Internetworking Profile @ Level 3',
-			    0x25 => 'Mobile Audio Internetworking Profile @ Level 4',
-			    0x26 => 'Mobile Audio Internetworking Profile @ Level 5',
-			    0x27 => 'Mobile Audio Internetworking Profile @ Level 6',
-			    0x28 => 'AAC Profile @ Level 1',
-			    0x29 => 'AAC Profile @ Level 2',
-			    0x2A => 'AAC Profile @ Level 4',
-			    0x2B => 'AAC Profile @ Level 5',
-			    0x2C => 'High Efficiency AAC Profile @ Level 2',
-			    0x2D => 'High Efficiency AAC Profile @ Level 3',
-			    0x2E => 'High Efficiency AAC Profile @ Level 4',
-			    0x2F => 'High Efficiency AAC Profile @ Level 5',
-			    0xFE => 'Not part of MPEG-4 audio profiles',
-			    0xFF => 'No audio capability required',
+				0x00 => 'ISO Reserved (0x00)',
+				0x01 => 'Main Audio Profile @ Level 1',
+				0x02 => 'Main Audio Profile @ Level 2',
+				0x03 => 'Main Audio Profile @ Level 3',
+				0x04 => 'Main Audio Profile @ Level 4',
+				0x05 => 'Scalable Audio Profile @ Level 1',
+				0x06 => 'Scalable Audio Profile @ Level 2',
+				0x07 => 'Scalable Audio Profile @ Level 3',
+				0x08 => 'Scalable Audio Profile @ Level 4',
+				0x09 => 'Speech Audio Profile @ Level 1',
+				0x0A => 'Speech Audio Profile @ Level 2',
+				0x0B => 'Synthetic Audio Profile @ Level 1',
+				0x0C => 'Synthetic Audio Profile @ Level 2',
+				0x0D => 'Synthetic Audio Profile @ Level 3',
+				0x0E => 'High Quality Audio Profile @ Level 1',
+				0x0F => 'High Quality Audio Profile @ Level 2',
+				0x10 => 'High Quality Audio Profile @ Level 3',
+				0x11 => 'High Quality Audio Profile @ Level 4',
+				0x12 => 'High Quality Audio Profile @ Level 5',
+				0x13 => 'High Quality Audio Profile @ Level 6',
+				0x14 => 'High Quality Audio Profile @ Level 7',
+				0x15 => 'High Quality Audio Profile @ Level 8',
+				0x16 => 'Low Delay Audio Profile @ Level 1',
+				0x17 => 'Low Delay Audio Profile @ Level 2',
+				0x18 => 'Low Delay Audio Profile @ Level 3',
+				0x19 => 'Low Delay Audio Profile @ Level 4',
+				0x1A => 'Low Delay Audio Profile @ Level 5',
+				0x1B => 'Low Delay Audio Profile @ Level 6',
+				0x1C => 'Low Delay Audio Profile @ Level 7',
+				0x1D => 'Low Delay Audio Profile @ Level 8',
+				0x1E => 'Natural Audio Profile @ Level 1',
+				0x1F => 'Natural Audio Profile @ Level 2',
+				0x20 => 'Natural Audio Profile @ Level 3',
+				0x21 => 'Natural Audio Profile @ Level 4',
+				0x22 => 'Mobile Audio Internetworking Profile @ Level 1',
+				0x23 => 'Mobile Audio Internetworking Profile @ Level 2',
+				0x24 => 'Mobile Audio Internetworking Profile @ Level 3',
+				0x25 => 'Mobile Audio Internetworking Profile @ Level 4',
+				0x26 => 'Mobile Audio Internetworking Profile @ Level 5',
+				0x27 => 'Mobile Audio Internetworking Profile @ Level 6',
+				0x28 => 'AAC Profile @ Level 1',
+				0x29 => 'AAC Profile @ Level 2',
+				0x2A => 'AAC Profile @ Level 4',
+				0x2B => 'AAC Profile @ Level 5',
+				0x2C => 'High Efficiency AAC Profile @ Level 2',
+				0x2D => 'High Efficiency AAC Profile @ Level 3',
+				0x2E => 'High Efficiency AAC Profile @ Level 4',
+				0x2F => 'High Efficiency AAC Profile @ Level 5',
+				0xFE => 'Not part of MPEG-4 audio profiles',
+				0xFF => 'No audio capability required',
 			);
 		}
 		return (isset($QuicktimeIODSaudioProfileNameLookup[$audio_profile_id]) ? $QuicktimeIODSaudioProfileNameLookup[$audio_profile_id] : 'ISO Reserved / User Private');

Spacing +275 added lines, -275 removed lines

@@ -37,7 +37,7 @@ 
 		$atomcounter = 0;
 		$atom_data_read_buffer_size = ($info['php_memory_limit'] ? round($info['php_memory_limit'] / 2) : $this->getid3->option_fread_buffer_size * 1024); // allow [default: 32MB] if PHP configured with no memory_limit
 		while ($offset < $info['avdataend']) {
-			if (!getid3_lib::intValueSupported($offset)) {
+			if ( ! getid3_lib::intValueSupported($offset)) {
 				$info['error'][] = 'Unable to parse atom at offset '.$offset.' because beyond '.round(PHP_INT_MAX / 1073741824).'GB limit of PHP filesystem functions';
 				break;
 			}
@@ -74,20 +74,20 @@ 
 			$atomcounter++;
 		}
 
-		if (!empty($info['avdataend_tmp'])) {
+		if ( ! empty($info['avdataend_tmp'])) {
 			// this value is assigned to a temp value and then erased because
 			// otherwise any atoms beyond the 'mdat' atom would not get parsed
 			$info['avdataend'] = $info['avdataend_tmp'];
 			unset($info['avdataend_tmp']);
 		}
 
-		if (!isset($info['bitrate']) && isset($info['playtime_seconds'])) {
+		if ( ! isset($info['bitrate']) && isset($info['playtime_seconds'])) {
 			$info['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 		}
-		if (isset($info['bitrate']) && !isset($info['audio']['bitrate']) && !isset($info['quicktime']['video'])) {
+		if (isset($info['bitrate']) && ! isset($info['audio']['bitrate']) && ! isset($info['quicktime']['video'])) {
 			$info['audio']['bitrate'] = $info['bitrate'];
 		}
-		if (!empty($info['playtime_seconds']) && !isset($info['video']['frame_rate']) && !empty($info['quicktime']['stts_framecount'])) {
+		if ( ! empty($info['playtime_seconds']) && ! isset($info['video']['frame_rate']) && ! empty($info['quicktime']['stts_framecount'])) {
 			foreach ($info['quicktime']['stts_framecount'] as $key => $samples_count) {
 				$samples_per_second = $samples_count / $info['playtime_seconds'];
 				if ($samples_per_second > 240) {
@@ -104,14 +104,14 @@ 
 			unset($info['video']['dataformat']);
 		}
 
-		if (!$this->ReturnAtomData) {
+		if ( ! $this->ReturnAtomData) {
 			unset($info['quicktime']['moov']);
 		}
 
-		if (empty($info['audio']['dataformat']) && !empty($info['quicktime']['audio'])) {
+		if (empty($info['audio']['dataformat']) && ! empty($info['quicktime']['audio'])) {
 			$info['audio']['dataformat'] = 'quicktime';
 		}
-		if (empty($info['video']['dataformat']) && !empty($info['quicktime']['video'])) {
+		if (empty($info['video']['dataformat']) && ! empty($info['quicktime']['video'])) {
 			$info['video']['dataformat'] = 'quicktime';
 		}
 
@@ -152,7 +152,7 @@ 
 					// some "ilst" atoms contain data atoms that have a numeric name, and the data is far more accessible if the returned array is compacted
 					$allnumericnames = true;
 					foreach ($atom_structure['subatoms'] as $subatomarray) {
-						if (!is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) {
+						if ( ! is_integer($subatomarray['name']) || (count($subatomarray['subatoms']) != 1)) {
 							$allnumericnames = false;
 							break;
 						}
@@ -301,10 +301,10 @@ 
 					// User data atom handler
 					$atom_structure['data_length'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
 					$atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2));
-					$atom_structure['data']        =                           substr($atom_data, 4);
+					$atom_structure['data']        = substr($atom_data, 4);
 
 					$atom_structure['language']    = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
-					if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
+					if (empty($info['comments']['language']) || ( ! in_array($atom_structure['language'], $info['comments']['language']))) {
 						$info['comments']['language'][] = $atom_structure['language'];
 					}
 				} else {
@@ -314,9 +314,9 @@ 
 						// not sure what it means, but observed on iPhone4 data.
 						// Each $atom_data has 2 bytes of datasize, plus 0x10B5, then data
 						while ($atomoffset < strlen($atom_data)) {
-							$boxsmallsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset,     2));
-							$boxsmalltype =                           substr($atom_data, $atomoffset + 2, 2);
-							$boxsmalldata =                           substr($atom_data, $atomoffset + 4, $boxsmallsize);
+							$boxsmallsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset, 2));
+							$boxsmalltype = substr($atom_data, $atomoffset + 2, 2);
+							$boxsmalldata = substr($atom_data, $atomoffset + 4, $boxsmallsize);
 							if ($boxsmallsize <= 1) {
 								$info['warning'][] = 'Invalid QuickTime atom smallbox size "'.$boxsmallsize.'" in atom "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" at offset: '.($atom_structure['offset'] + $atomoffset);
 								$atom_structure['data'] = null;
@@ -337,8 +337,8 @@ 
 					} else {
 						while ($atomoffset < strlen($atom_data)) {
 							$boxsize = getid3_lib::BigEndian2Int(substr($atom_data, $atomoffset, 4));
-							$boxtype =                           substr($atom_data, $atomoffset + 4, 4);
-							$boxdata =                           substr($atom_data, $atomoffset + 8, $boxsize - 8);
+							$boxtype = substr($atom_data, $atomoffset + 4, 4);
+							$boxdata = substr($atom_data, $atomoffset + 8, $boxsize - 8);
 							if ($boxsize <= 1) {
 								$info['warning'][] = 'Invalid QuickTime atom box size "'.$boxsize.'" in atom "'.preg_replace('#[^a-zA-Z0-9 _\\-]#', '?', $atomname).'" at offset: '.($atom_structure['offset'] + $atomoffset);
 								$atom_structure['data'] = null;
@@ -354,8 +354,8 @@ 
 									break;
 
 								case 'data':
-									$atom_structure['version']   = getid3_lib::BigEndian2Int(substr($boxdata,  0, 1));
-									$atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($boxdata,  1, 3));
+									$atom_structure['version']   = getid3_lib::BigEndian2Int(substr($boxdata, 0, 1));
+									$atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($boxdata, 1, 3));
 									switch ($atom_structure['flags_raw']) {
 										case  0: // data flag
 										case 21: // tmpo/cpil flag
@@ -380,7 +380,7 @@ 
 
 												case 'gnre':
 													$GenreID = getid3_lib::BigEndian2Int(substr($boxdata, 8, 4));
-													$atom_structure['data']    = getid3_id3v1::LookupGenreName($GenreID - 1);
+													$atom_structure['data'] = getid3_id3v1::LookupGenreName($GenreID - 1);
 													break;
 
 												case 'rtng':
@@ -440,15 +440,15 @@ 
 
 
 			case 'play': // auto-PLAY atom
-				$atom_structure['autoplay'] = (bool) getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
+				$atom_structure['autoplay'] = (bool) getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
 
 				$info['quicktime']['autoplay'] = $atom_structure['autoplay'];
 				break;
 
 
 			case 'WLOC': // Window LOCation atom
-				$atom_structure['location_x']  = getid3_lib::BigEndian2Int(substr($atom_data,  0, 2));
-				$atom_structure['location_y']  = getid3_lib::BigEndian2Int(substr($atom_data,  2, 2));
+				$atom_structure['location_x']  = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2));
+				$atom_structure['location_y']  = getid3_lib::BigEndian2Int(substr($atom_data, 2, 2));
 				break;
 
 
@@ -488,27 +488,27 @@ 
 
 
 			case 'rdrf': // Reference movie Data ReFerence atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
 				$atom_structure['flags']['internal_data'] = (bool) ($atom_structure['flags_raw'] & 0x000001);
 
-				$atom_structure['reference_type_name']    =                           substr($atom_data,  4, 4);
-				$atom_structure['reference_length']       = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
+				$atom_structure['reference_type_name']    = substr($atom_data, 4, 4);
+				$atom_structure['reference_length']       = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
 				switch ($atom_structure['reference_type_name']) {
 					case 'url ':
-						$atom_structure['url']            =       $this->NoNullString(substr($atom_data, 12));
+						$atom_structure['url'] = $this->NoNullString(substr($atom_data, 12));
 						break;
 
 					case 'alis':
-						$atom_structure['file_alias']     =                           substr($atom_data, 12);
+						$atom_structure['file_alias'] = substr($atom_data, 12);
 						break;
 
 					case 'rsrc':
-						$atom_structure['resource_alias'] =                           substr($atom_data, 12);
+						$atom_structure['resource_alias'] = substr($atom_data, 12);
 						break;
 
 					default:
-						$atom_structure['data']           =                           substr($atom_data, 12);
+						$atom_structure['data'] = substr($atom_data, 12);
 						break;
 				}
 				break;
@@ -520,28 +520,28 @@ 
 
 
 			case 'rmcs': // Reference Movie Cpu Speed atom
-				$atom_structure['version']          = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']        = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['cpu_speed_rating'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
+				$atom_structure['version']          = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']        = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['cpu_speed_rating'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
 				break;
 
 
 			case 'rmvc': // Reference Movie Version Check atom
-				$atom_structure['version']            = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']          = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['gestalt_selector']   =                           substr($atom_data,  4, 4);
-				$atom_structure['gestalt_value_mask'] = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
+				$atom_structure['version']            = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']          = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['gestalt_selector']   = substr($atom_data, 4, 4);
+				$atom_structure['gestalt_value_mask'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
 				$atom_structure['gestalt_value']      = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
 				$atom_structure['gestalt_check_type'] = getid3_lib::BigEndian2Int(substr($atom_data, 14, 2));
 				break;
 
 
 			case 'rmcd': // Reference Movie Component check atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['component_type']         =                           substr($atom_data,  4, 4);
-				$atom_structure['component_subtype']      =                           substr($atom_data,  8, 4);
-				$atom_structure['component_manufacturer'] =                           substr($atom_data, 12, 4);
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['component_type']         = substr($atom_data, 4, 4);
+				$atom_structure['component_subtype']      = substr($atom_data, 8, 4);
+				$atom_structure['component_manufacturer'] = substr($atom_data, 12, 4);
 				$atom_structure['component_flags_raw']    = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
 				$atom_structure['component_flags_mask']   = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
 				$atom_structure['component_min_version']  = getid3_lib::BigEndian2Int(substr($atom_data, 24, 4));
@@ -549,30 +549,30 @@ 
 
 
 			case 'rmdr': // Reference Movie Data Rate atom
-				$atom_structure['version']       = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']     = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['data_rate']     = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+				$atom_structure['version']       = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']     = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['data_rate']     = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 
 				$atom_structure['data_rate_bps'] = $atom_structure['data_rate'] * 10;
 				break;
 
 
 			case 'rmla': // Reference Movie Language Atom
-				$atom_structure['version']     = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']   = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
+				$atom_structure['version']     = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']   = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['language_id'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
 
 				$atom_structure['language']    = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
-				if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
+				if (empty($info['comments']['language']) || ( ! in_array($atom_structure['language'], $info['comments']['language']))) {
 					$info['comments']['language'][] = $atom_structure['language'];
 				}
 				break;
 
 
 			case 'rmla': // Reference Movie Language Atom
-				$atom_structure['version']   = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['track_id']  = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
+				$atom_structure['version']   = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['track_id']  = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
 				break;
 
 
@@ -601,49 +601,49 @@ 
 
 
 			case 'stsd': // Sample Table Sample Description atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 				$stsdEntriesDataOffset = 8;
 				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
 					$atom_structure['sample_description_table'][$i]['size']             = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 4));
 					$stsdEntriesDataOffset += 4;
-					$atom_structure['sample_description_table'][$i]['data_format']      =                           substr($atom_data, $stsdEntriesDataOffset, 4);
+					$atom_structure['sample_description_table'][$i]['data_format']      = substr($atom_data, $stsdEntriesDataOffset, 4);
 					$stsdEntriesDataOffset += 4;
 					$atom_structure['sample_description_table'][$i]['reserved']         = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 6));
 					$stsdEntriesDataOffset += 6;
 					$atom_structure['sample_description_table'][$i]['reference_index']  = getid3_lib::BigEndian2Int(substr($atom_data, $stsdEntriesDataOffset, 2));
 					$stsdEntriesDataOffset += 2;
-					$atom_structure['sample_description_table'][$i]['data']             =                           substr($atom_data, $stsdEntriesDataOffset, ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2));
+					$atom_structure['sample_description_table'][$i]['data']             = substr($atom_data, $stsdEntriesDataOffset, ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2));
 					$stsdEntriesDataOffset += ($atom_structure['sample_description_table'][$i]['size'] - 4 - 4 - 6 - 2);
 
-					$atom_structure['sample_description_table'][$i]['encoder_version']  = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  0, 2));
-					$atom_structure['sample_description_table'][$i]['encoder_revision'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  2, 2));
-					$atom_structure['sample_description_table'][$i]['encoder_vendor']   =                           substr($atom_structure['sample_description_table'][$i]['data'],  4, 4);
+					$atom_structure['sample_description_table'][$i]['encoder_version']  = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 0, 2));
+					$atom_structure['sample_description_table'][$i]['encoder_revision'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 2, 2));
+					$atom_structure['sample_description_table'][$i]['encoder_vendor']   = substr($atom_structure['sample_description_table'][$i]['data'], 4, 4);
 
 					switch ($atom_structure['sample_description_table'][$i]['encoder_vendor']) {
 
 						case "\x00\x00\x00\x00":
 							// audio tracks
-							$atom_structure['sample_description_table'][$i]['audio_channels']       =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  8,  2));
-							$atom_structure['sample_description_table'][$i]['audio_bit_depth']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 10,  2));
-							$atom_structure['sample_description_table'][$i]['audio_compression_id'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12,  2));
-							$atom_structure['sample_description_table'][$i]['audio_packet_size']    =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 14,  2));
-							$atom_structure['sample_description_table'][$i]['audio_sample_rate']    = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 16,  4));
+							$atom_structure['sample_description_table'][$i]['audio_channels']       = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 2));
+							$atom_structure['sample_description_table'][$i]['audio_bit_depth']      = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 10, 2));
+							$atom_structure['sample_description_table'][$i]['audio_compression_id'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 2));
+							$atom_structure['sample_description_table'][$i]['audio_packet_size']    = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 14, 2));
+							$atom_structure['sample_description_table'][$i]['audio_sample_rate']    = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 16, 4));
 
 							// video tracks
 							// http://developer.apple.com/library/mac/#documentation/QuickTime/QTFF/QTFFChap3/qtff3.html
-							$atom_structure['sample_description_table'][$i]['temporal_quality'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  8,  4));
-							$atom_structure['sample_description_table'][$i]['spatial_quality']  =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12,  4));
-							$atom_structure['sample_description_table'][$i]['width']            =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16,  2));
-							$atom_structure['sample_description_table'][$i]['height']           =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18,  2));
-							$atom_structure['sample_description_table'][$i]['resolution_x']     = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24,  4));
-							$atom_structure['sample_description_table'][$i]['resolution_y']     = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 28,  4));
-							$atom_structure['sample_description_table'][$i]['data_size']        =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32,  4));
-							$atom_structure['sample_description_table'][$i]['frame_count']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 36,  2));
-							$atom_structure['sample_description_table'][$i]['compressor_name']  =                             substr($atom_structure['sample_description_table'][$i]['data'], 38,  4);
-							$atom_structure['sample_description_table'][$i]['pixel_depth']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 42,  2));
-							$atom_structure['sample_description_table'][$i]['color_table_id']   =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 44,  2));
+							$atom_structure['sample_description_table'][$i]['temporal_quality'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 4));
+							$atom_structure['sample_description_table'][$i]['spatial_quality']  = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 4));
+							$atom_structure['sample_description_table'][$i]['width']            = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16, 2));
+							$atom_structure['sample_description_table'][$i]['height']           = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18, 2));
+							$atom_structure['sample_description_table'][$i]['resolution_x']     = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24, 4));
+							$atom_structure['sample_description_table'][$i]['resolution_y']     = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 28, 4));
+							$atom_structure['sample_description_table'][$i]['data_size']        = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32, 4));
+							$atom_structure['sample_description_table'][$i]['frame_count']      = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 36, 2));
+							$atom_structure['sample_description_table'][$i]['compressor_name']  = substr($atom_structure['sample_description_table'][$i]['data'], 38, 4);
+							$atom_structure['sample_description_table'][$i]['pixel_depth']      = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 42, 2));
+							$atom_structure['sample_description_table'][$i]['color_table_id']   = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 44, 2));
 
 							switch ($atom_structure['sample_description_table'][$i]['data_format']) {
 								case '2vuY':
@@ -676,7 +676,7 @@ 
 									$info['video']['fourcc'] = $atom_structure['sample_description_table'][$i]['data_format'];
 // http://www.getid3.org/phpBB3/viewtopic.php?t=1550
 //if ((!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($atom_structure['sample_description_table'][$i]['width'])) && (empty($info['video']['resolution_x']) || empty($info['video']['resolution_y']) || (number_format($info['video']['resolution_x'], 6) != number_format(round($info['video']['resolution_x']), 6)) || (number_format($info['video']['resolution_y'], 6) != number_format(round($info['video']['resolution_y']), 6)))) { // ugly check for floating point numbers
-if (!empty($atom_structure['sample_description_table'][$i]['width']) && !empty($atom_structure['sample_description_table'][$i]['height'])) {
+if ( ! empty($atom_structure['sample_description_table'][$i]['width']) && ! empty($atom_structure['sample_description_table'][$i]['height'])) {
 	// assume that values stored here are more important than values stored in [tkhd] atom
 	$info['video']['resolution_x'] = $atom_structure['sample_description_table'][$i]['width'];
 	$info['video']['resolution_y'] = $atom_structure['sample_description_table'][$i]['height'];
@@ -720,18 +720,18 @@ 
 
 								default:
 									// video atom
-									$atom_structure['sample_description_table'][$i]['video_temporal_quality']  =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'],  8,  4));
-									$atom_structure['sample_description_table'][$i]['video_spatial_quality']   =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12,  4));
-									$atom_structure['sample_description_table'][$i]['video_frame_width']       =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16,  2));
-									$atom_structure['sample_description_table'][$i]['video_frame_height']      =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18,  2));
-									$atom_structure['sample_description_table'][$i]['video_resolution_x']      = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 20,  4));
-									$atom_structure['sample_description_table'][$i]['video_resolution_y']      = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24,  4));
-									$atom_structure['sample_description_table'][$i]['video_data_size']         =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 28,  4));
-									$atom_structure['sample_description_table'][$i]['video_frame_count']       =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32,  2));
-									$atom_structure['sample_description_table'][$i]['video_encoder_name_len']  =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 34,  1));
-									$atom_structure['sample_description_table'][$i]['video_encoder_name']      =                             substr($atom_structure['sample_description_table'][$i]['data'], 35, $atom_structure['sample_description_table'][$i]['video_encoder_name_len']);
-									$atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66,  2));
-									$atom_structure['sample_description_table'][$i]['video_color_table_id']    =   getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68,  2));
+									$atom_structure['sample_description_table'][$i]['video_temporal_quality']  = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 8, 4));
+									$atom_structure['sample_description_table'][$i]['video_spatial_quality']   = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 12, 4));
+									$atom_structure['sample_description_table'][$i]['video_frame_width']       = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 16, 2));
+									$atom_structure['sample_description_table'][$i]['video_frame_height']      = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 18, 2));
+									$atom_structure['sample_description_table'][$i]['video_resolution_x']      = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 20, 4));
+									$atom_structure['sample_description_table'][$i]['video_resolution_y']      = getid3_lib::FixedPoint16_16(substr($atom_structure['sample_description_table'][$i]['data'], 24, 4));
+									$atom_structure['sample_description_table'][$i]['video_data_size']         = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 28, 4));
+									$atom_structure['sample_description_table'][$i]['video_frame_count']       = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 32, 2));
+									$atom_structure['sample_description_table'][$i]['video_encoder_name_len']  = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 34, 1));
+									$atom_structure['sample_description_table'][$i]['video_encoder_name']      = substr($atom_structure['sample_description_table'][$i]['data'], 35, $atom_structure['sample_description_table'][$i]['video_encoder_name_len']);
+									$atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 66, 2));
+									$atom_structure['sample_description_table'][$i]['video_color_table_id']    = getid3_lib::BigEndian2Int(substr($atom_structure['sample_description_table'][$i]['data'], 68, 2));
 
 									$atom_structure['sample_description_table'][$i]['video_pixel_color_type']  = (($atom_structure['sample_description_table'][$i]['video_pixel_color_depth'] > 32) ? 'grayscale' : 'color');
 									$atom_structure['sample_description_table'][$i]['video_pixel_color_name']  = $this->QuicktimeColorNameLookup($atom_structure['sample_description_table'][$i]['video_pixel_color_depth']);
@@ -792,9 +792,9 @@ 
 
 
 			case 'stts': // Sample Table Time-to-Sample atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 				$sttsEntriesDataOffset = 8;
 				//$FrameRateCalculatorArray = array();
 				$frames_count = 0;
@@ -845,9 +845,9 @@ 
 
 			case 'stss': // Sample Table Sync Sample (key frames) atom
 				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 					$stssEntriesDataOffset = 8;
 					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
 						$atom_structure['time_to_sample_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stssEntriesDataOffset, 4));
@@ -859,9 +859,9 @@ 
 
 			case 'stsc': // Sample Table Sample-to-Chunk atom
 				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 					$stscEntriesDataOffset = 8;
 					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
 						$atom_structure['sample_to_chunk_table'][$i]['first_chunk']        = getid3_lib::BigEndian2Int(substr($atom_data, $stscEntriesDataOffset, 4));
@@ -877,10 +877,10 @@ 
 
 			case 'stsz': // Sample Table SiZe atom
 				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['sample_size']    = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
+					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+					$atom_structure['sample_size']    = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
 					$stszEntriesDataOffset = 12;
 					if ($atom_structure['sample_size'] == 0) {
 						for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
@@ -894,9 +894,9 @@ 
 
 			case 'stco': // Sample Table Chunk Offset atom
 				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 					$stcoEntriesDataOffset = 8;
 					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
 						$atom_structure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stcoEntriesDataOffset, 4));
@@ -908,9 +908,9 @@ 
 
 			case 'co64': // Chunk Offset 64-bit (version of "stco" that supports > 2GB files)
 				if ($ParseAllPossibleAtoms) {
-					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+					$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+					$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+					$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 					$stcoEntriesDataOffset = 8;
 					for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
 						$atom_structure['chunk_offset_table'][$i] = getid3_lib::BigEndian2Int(substr($atom_data, $stcoEntriesDataOffset, 8));
@@ -921,20 +921,20 @@ 
 
 
 			case 'dref': // Data REFerence atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
+				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
 				$drefDataOffset = 8;
 				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
 					$atom_structure['data_references'][$i]['size']                    = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 4));
 					$drefDataOffset += 4;
-					$atom_structure['data_references'][$i]['type']                    =               substr($atom_data, $drefDataOffset, 4);
+					$atom_structure['data_references'][$i]['type']                    = substr($atom_data, $drefDataOffset, 4);
 					$drefDataOffset += 4;
-					$atom_structure['data_references'][$i]['version']                 = getid3_lib::BigEndian2Int(substr($atom_data,  $drefDataOffset, 1));
+					$atom_structure['data_references'][$i]['version']                 = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 1));
 					$drefDataOffset += 1;
-					$atom_structure['data_references'][$i]['flags_raw']               = getid3_lib::BigEndian2Int(substr($atom_data,  $drefDataOffset, 3)); // hardcoded: 0x0000
+					$atom_structure['data_references'][$i]['flags_raw']               = getid3_lib::BigEndian2Int(substr($atom_data, $drefDataOffset, 3)); // hardcoded: 0x0000
 					$drefDataOffset += 3;
-					$atom_structure['data_references'][$i]['data']                    =               substr($atom_data, $drefDataOffset, ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3));
+					$atom_structure['data_references'][$i]['data']                    = substr($atom_data, $drefDataOffset, ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3));
 					$drefDataOffset += ($atom_structure['data_references'][$i]['size'] - 4 - 4 - 1 - 3);
 
 					$atom_structure['data_references'][$i]['flags']['self_reference'] = (bool) ($atom_structure['data_references'][$i]['flags_raw'] & 0x001);
@@ -943,11 +943,11 @@ 
 
 
 			case 'gmin': // base Media INformation atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['graphics_mode']          = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				$atom_structure['opcolor_red']            = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2));
-				$atom_structure['opcolor_green']          = getid3_lib::BigEndian2Int(substr($atom_data,  8, 2));
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['graphics_mode']          = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+				$atom_structure['opcolor_red']            = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2));
+				$atom_structure['opcolor_green']          = getid3_lib::BigEndian2Int(substr($atom_data, 8, 2));
 				$atom_structure['opcolor_blue']           = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2));
 				$atom_structure['balance']                = getid3_lib::BigEndian2Int(substr($atom_data, 12, 2));
 				$atom_structure['reserved']               = getid3_lib::BigEndian2Int(substr($atom_data, 14, 2));
@@ -955,19 +955,19 @@ 
 
 
 			case 'smhd': // Sound Media information HeaDer atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['balance']                = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				$atom_structure['reserved']               = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2));
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['balance']                = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+				$atom_structure['reserved']               = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2));
 				break;
 
 
 			case 'vmhd': // Video Media information HeaDer atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['graphics_mode']          = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2));
-				$atom_structure['opcolor_red']            = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2));
-				$atom_structure['opcolor_green']          = getid3_lib::BigEndian2Int(substr($atom_data,  8, 2));
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+				$atom_structure['graphics_mode']          = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2));
+				$atom_structure['opcolor_red']            = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2));
+				$atom_structure['opcolor_green']          = getid3_lib::BigEndian2Int(substr($atom_data, 8, 2));
 				$atom_structure['opcolor_blue']           = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2));
 
 				$atom_structure['flags']['no_lean_ahead'] = (bool) ($atom_structure['flags_raw'] & 0x001);
@@ -975,14 +975,14 @@ 
 
 
 			case 'hdlr': // HanDLeR reference atom
-				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['component_type']         =                           substr($atom_data,  4, 4);
-				$atom_structure['component_subtype']      =                           substr($atom_data,  8, 4);
-				$atom_structure['component_manufacturer'] =                           substr($atom_data, 12, 4);
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['component_type']         = substr($atom_data, 4, 4);
+				$atom_structure['component_subtype']      = substr($atom_data, 8, 4);
+				$atom_structure['component_manufacturer'] = substr($atom_data, 12, 4);
 				$atom_structure['component_flags_raw']    = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
 				$atom_structure['component_flags_mask']   = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
-				$atom_structure['component_name']         =      $this->Pascal2String(substr($atom_data, 24));
+				$atom_structure['component_name']         = $this->Pascal2String(substr($atom_data, 24));
 
 				if (($atom_structure['component_subtype'] == 'STpn') && ($atom_structure['component_manufacturer'] == 'zzzz')) {
 					$info['video']['dataformat'] = 'quicktimevr';
@@ -991,10 +991,10 @@ 
 
 
 			case 'mdhd': // MeDia HeaDer atom
-				$atom_structure['version']               = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']             = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['creation_time']         = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['modify_time']           = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
+				$atom_structure['version']               = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']             = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['creation_time']         = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+				$atom_structure['modify_time']           = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
 				$atom_structure['time_scale']            = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
 				$atom_structure['duration']              = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
 				$atom_structure['language_id']           = getid3_lib::BigEndian2Int(substr($atom_data, 20, 2));
@@ -1010,16 +1010,16 @@ 
 				$atom_structure['modify_time_unix']      = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
 				$atom_structure['playtime_seconds']      = $atom_structure['duration'] / $atom_structure['time_scale'];
 				$atom_structure['language']              = $this->QuicktimeLanguageLookup($atom_structure['language_id']);
-				if (empty($info['comments']['language']) || (!in_array($atom_structure['language'], $info['comments']['language']))) {
+				if (empty($info['comments']['language']) || ( ! in_array($atom_structure['language'], $info['comments']['language']))) {
 					$info['comments']['language'][] = $atom_structure['language'];
 				}
 				break;
 
 
 			case 'pnot': // Preview atom
-				$atom_structure['modification_date']      = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4)); // "standard Macintosh format"
-				$atom_structure['version_number']         = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2)); // hardcoded: 0x00
-				$atom_structure['atom_type']              =               substr($atom_data,  6, 4);        // usually: 'PICT'
+				$atom_structure['modification_date']      = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4)); // "standard Macintosh format"
+				$atom_structure['version_number']         = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)); // hardcoded: 0x00
+				$atom_structure['atom_type']              = substr($atom_data, 6, 4); // usually: 'PICT'
 				$atom_structure['atom_index']             = getid3_lib::BigEndian2Int(substr($atom_data, 10, 2)); // usually: 0x01
 
 				$atom_structure['modification_date_unix'] = getid3_lib::DateMac2Unix($atom_structure['modification_date']);
@@ -1027,16 +1027,16 @@ 
 
 
 			case 'crgn': // Clipping ReGioN atom
-				$atom_structure['region_size']   = getid3_lib::BigEndian2Int(substr($atom_data,  0, 2)); // The Region size, Region boundary box,
-				$atom_structure['boundary_box']  = getid3_lib::BigEndian2Int(substr($atom_data,  2, 8)); // and Clipping region data fields
-				$atom_structure['clipping_data'] =               substr($atom_data, 10);           // constitute a QuickDraw region.
+				$atom_structure['region_size']   = getid3_lib::BigEndian2Int(substr($atom_data, 0, 2)); // The Region size, Region boundary box,
+				$atom_structure['boundary_box']  = getid3_lib::BigEndian2Int(substr($atom_data, 2, 8)); // and Clipping region data fields
+				$atom_structure['clipping_data'] = substr($atom_data, 10); // constitute a QuickDraw region.
 				break;
 
 
 			case 'load': // track LOAD settings atom
-				$atom_structure['preload_start_time'] = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4));
-				$atom_structure['preload_duration']   = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['preload_flags_raw']  = getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
+				$atom_structure['preload_start_time'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
+				$atom_structure['preload_duration']   = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+				$atom_structure['preload_flags_raw']  = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
 				$atom_structure['default_hints_raw']  = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
 
 				$atom_structure['default_hints']['double_buffer'] = (bool) ($atom_structure['default_hints_raw'] & 0x0020);
@@ -1056,28 +1056,28 @@ 
 
 
 			case 'elst': // Edit LiST atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				for ($i = 0; $i < $atom_structure['number_entries']; $i++ ) {
-					$atom_structure['edit_list'][$i]['track_duration'] =   getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 0, 4));
-					$atom_structure['edit_list'][$i]['media_time']     =   getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 4, 4));
+				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['number_entries'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+				for ($i = 0; $i < $atom_structure['number_entries']; $i++) {
+					$atom_structure['edit_list'][$i]['track_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 0, 4));
+					$atom_structure['edit_list'][$i]['media_time']     = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($i * 12) + 4, 4));
 					$atom_structure['edit_list'][$i]['media_rate']     = getid3_lib::FixedPoint16_16(substr($atom_data, 8 + ($i * 12) + 8, 4));
 				}
 				break;
 
 
 			case 'kmat': // compressed MATte atom
-				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data,  1, 3)); // hardcoded: 0x0000
-				$atom_structure['matte_data_raw'] =               substr($atom_data,  4);
+				$atom_structure['version']        = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']      = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3)); // hardcoded: 0x0000
+				$atom_structure['matte_data_raw'] = substr($atom_data, 4);
 				break;
 
 
 			case 'ctab': // Color TABle atom
-				$atom_structure['color_table_seed']   = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4)); // hardcoded: 0x00000000
-				$atom_structure['color_table_flags']  = getid3_lib::BigEndian2Int(substr($atom_data,  4, 2)); // hardcoded: 0x8000
-				$atom_structure['color_table_size']   = getid3_lib::BigEndian2Int(substr($atom_data,  6, 2)) + 1;
+				$atom_structure['color_table_seed']   = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4)); // hardcoded: 0x00000000
+				$atom_structure['color_table_flags']  = getid3_lib::BigEndian2Int(substr($atom_data, 4, 2)); // hardcoded: 0x8000
+				$atom_structure['color_table_size']   = getid3_lib::BigEndian2Int(substr($atom_data, 6, 2)) + 1;
 				for ($colortableentry = 0; $colortableentry < $atom_structure['color_table_size']; $colortableentry++) {
 					$atom_structure['color_table'][$colortableentry]['alpha'] = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 0, 2));
 					$atom_structure['color_table'][$colortableentry]['red']   = getid3_lib::BigEndian2Int(substr($atom_data, 8 + ($colortableentry * 8) + 2, 2));
@@ -1088,31 +1088,31 @@ 
 
 
 			case 'mvhd': // MoVie HeaDer atom
-				$atom_structure['version']            =   getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']          =   getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['creation_time']      =   getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['modify_time']        =   getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['time_scale']         =   getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-				$atom_structure['duration']           =   getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+				$atom_structure['version']            = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']          = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+				$atom_structure['creation_time']      = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+				$atom_structure['modify_time']        = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+				$atom_structure['time_scale']         = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+				$atom_structure['duration']           = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
 				$atom_structure['preferred_rate']     = getid3_lib::FixedPoint16_16(substr($atom_data, 20, 4));
-				$atom_structure['preferred_volume']   =   getid3_lib::FixedPoint8_8(substr($atom_data, 24, 2));
-				$atom_structure['reserved']           =                             substr($atom_data, 26, 10);
+				$atom_structure['preferred_volume']   = getid3_lib::FixedPoint8_8(substr($atom_data, 24, 2));
+				$atom_structure['reserved']           = substr($atom_data, 26, 10);
 				$atom_structure['matrix_a']           = getid3_lib::FixedPoint16_16(substr($atom_data, 36, 4));
 				$atom_structure['matrix_b']           = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
-				$atom_structure['matrix_u']           =  getid3_lib::FixedPoint2_30(substr($atom_data, 44, 4));
+				$atom_structure['matrix_u']           = getid3_lib::FixedPoint2_30(substr($atom_data, 44, 4));
 				$atom_structure['matrix_c']           = getid3_lib::FixedPoint16_16(substr($atom_data, 48, 4));
 				$atom_structure['matrix_d']           = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
-				$atom_structure['matrix_v']           =  getid3_lib::FixedPoint2_30(substr($atom_data, 56, 4));
+				$atom_structure['matrix_v']           = getid3_lib::FixedPoint2_30(substr($atom_data, 56, 4));
 				$atom_structure['matrix_x']           = getid3_lib::FixedPoint16_16(substr($atom_data, 60, 4));
 				$atom_structure['matrix_y']           = getid3_lib::FixedPoint16_16(substr($atom_data, 64, 4));
-				$atom_structure['matrix_w']           =  getid3_lib::FixedPoint2_30(substr($atom_data, 68, 4));
-				$atom_structure['preview_time']       =   getid3_lib::BigEndian2Int(substr($atom_data, 72, 4));
-				$atom_structure['preview_duration']   =   getid3_lib::BigEndian2Int(substr($atom_data, 76, 4));
-				$atom_structure['poster_time']        =   getid3_lib::BigEndian2Int(substr($atom_data, 80, 4));
-				$atom_structure['selection_time']     =   getid3_lib::BigEndian2Int(substr($atom_data, 84, 4));
-				$atom_structure['selection_duration'] =   getid3_lib::BigEndian2Int(substr($atom_data, 88, 4));
-				$atom_structure['current_time']       =   getid3_lib::BigEndian2Int(substr($atom_data, 92, 4));
-				$atom_structure['next_track_id']      =   getid3_lib::BigEndian2Int(substr($atom_data, 96, 4));
+				$atom_structure['matrix_w']           = getid3_lib::FixedPoint2_30(substr($atom_data, 68, 4));
+				$atom_structure['preview_time']       = getid3_lib::BigEndian2Int(substr($atom_data, 72, 4));
+				$atom_structure['preview_duration']   = getid3_lib::BigEndian2Int(substr($atom_data, 76, 4));
+				$atom_structure['poster_time']        = getid3_lib::BigEndian2Int(substr($atom_data, 80, 4));
+				$atom_structure['selection_time']     = getid3_lib::BigEndian2Int(substr($atom_data, 84, 4));
+				$atom_structure['selection_duration'] = getid3_lib::BigEndian2Int(substr($atom_data, 88, 4));
+				$atom_structure['current_time']       = getid3_lib::BigEndian2Int(substr($atom_data, 92, 4));
+				$atom_structure['next_track_id']      = getid3_lib::BigEndian2Int(substr($atom_data, 96, 4));
 
 				if ($atom_structure['time_scale'] == 0) {
 					$info['error'][] = 'Corrupt Quicktime file: mvhd.time_scale == zero';
@@ -1127,29 +1127,29 @@ 
 
 
 			case 'tkhd': // TracK HeaDer atom
-				$atom_structure['version']             =   getid3_lib::BigEndian2Int(substr($atom_data,  0, 1));
-				$atom_structure['flags_raw']           =   getid3_lib::BigEndian2Int(substr($atom_data,  1, 3));
-				$atom_structure['creation_time']       =   getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['modify_time']         =   getid3_lib::BigEndian2Int(substr($atom_data,  8, 4));
-				$atom_structure['trackid']             =   getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
-				$atom_structure['reserved1']           =   getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
-				$atom_structure['duration']            =   getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
-				$atom_structure['reserved2']           =   getid3_lib::BigEndian2Int(substr($atom_data, 24, 8));
-				$atom_structure['layer']               =   getid3_lib::BigEndian2Int(substr($atom_data, 32, 2));
-				$atom_structure['alternate_group']     =   getid3_lib::BigEndian2Int(substr($atom_data, 34, 2));
-				$atom_structure['volume']              =   getid3_lib::FixedPoint8_8(substr($atom_data, 36, 2));
-				$atom_structure['reserved3']           =   getid3_lib::BigEndian2Int(substr($atom_data, 38, 2));
+				$atom_structure['version']             = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+				$atom_structure['flags_raw']           = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+				$atom_structure['creation_time']       = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+				$atom_structure['modify_time']         = getid3_lib::BigEndian2Int(substr($atom_data, 8, 4));
+				$atom_structure['trackid']             = getid3_lib::BigEndian2Int(substr($atom_data, 12, 4));
+				$atom_structure['reserved1']           = getid3_lib::BigEndian2Int(substr($atom_data, 16, 4));
+				$atom_structure['duration']            = getid3_lib::BigEndian2Int(substr($atom_data, 20, 4));
+				$atom_structure['reserved2']           = getid3_lib::BigEndian2Int(substr($atom_data, 24, 8));
+				$atom_structure['layer']               = getid3_lib::BigEndian2Int(substr($atom_data, 32, 2));
+				$atom_structure['alternate_group']     = getid3_lib::BigEndian2Int(substr($atom_data, 34, 2));
+				$atom_structure['volume']              = getid3_lib::FixedPoint8_8(substr($atom_data, 36, 2));
+				$atom_structure['reserved3']           = getid3_lib::BigEndian2Int(substr($atom_data, 38, 2));
 // http://developer.apple.com/library/mac/#documentation/QuickTime/RM/MovieBasics/MTEditing/K-Chapter/11MatrixFunctions.html
 // http://developer.apple.com/library/mac/#documentation/QuickTime/qtff/QTFFChap4/qtff4.html#//apple_ref/doc/uid/TP40000939-CH206-18737
 				$atom_structure['matrix_a']            = getid3_lib::FixedPoint16_16(substr($atom_data, 40, 4));
 				$atom_structure['matrix_b']            = getid3_lib::FixedPoint16_16(substr($atom_data, 44, 4));
-				$atom_structure['matrix_u']            =  getid3_lib::FixedPoint2_30(substr($atom_data, 48, 4));
+				$atom_structure['matrix_u']            = getid3_lib::FixedPoint2_30(substr($atom_data, 48, 4));
 				$atom_structure['matrix_c']            = getid3_lib::FixedPoint16_16(substr($atom_data, 52, 4));
 				$atom_structure['matrix_d']            = getid3_lib::FixedPoint16_16(substr($atom_data, 56, 4));
-				$atom_structure['matrix_v']            =  getid3_lib::FixedPoint2_30(substr($atom_data, 60, 4));
+				$atom_structure['matrix_v']            = getid3_lib::FixedPoint2_30(substr($atom_data, 60, 4));
 				$atom_structure['matrix_x']            = getid3_lib::FixedPoint16_16(substr($atom_data, 64, 4));
 				$atom_structure['matrix_y']            = getid3_lib::FixedPoint16_16(substr($atom_data, 68, 4));
-				$atom_structure['matrix_w']            =  getid3_lib::FixedPoint2_30(substr($atom_data, 72, 4));
+				$atom_structure['matrix_w']            = getid3_lib::FixedPoint2_30(substr($atom_data, 72, 4));
 				$atom_structure['width']               = getid3_lib::FixedPoint16_16(substr($atom_data, 76, 4));
 				$atom_structure['height']              = getid3_lib::FixedPoint16_16(substr($atom_data, 80, 4));
 				$atom_structure['flags']['enabled']    = (bool) ($atom_structure['flags_raw'] & 0x0001);
@@ -1160,7 +1160,7 @@ 
 				$atom_structure['modify_time_unix']    = getid3_lib::DateMac2Unix($atom_structure['modify_time']);
 
 				if ($atom_structure['flags']['enabled'] == 1) {
-					if (!isset($info['video']['resolution_x']) || !isset($info['video']['resolution_y'])) {
+					if ( ! isset($info['video']['resolution_x']) || ! isset($info['video']['resolution_y'])) {
 						$info['video']['resolution_x'] = $atom_structure['width'];
 						$info['video']['resolution_y'] = $atom_structure['height'];
 					}
@@ -1181,34 +1181,34 @@ 
 				// http://www.koders.com/c/fid1FAB3E762903DC482D8A246D4A4BF9F28E049594.aspx?s=windows.h
 				// http://libquicktime.sourcearchive.com/documentation/1.0.2plus-pdebian/iods_8c-source.html
 				$offset = 0;
-				$atom_structure['version']                =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['version']                = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
-				$atom_structure['flags_raw']              =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 3));
+				$atom_structure['flags_raw']              = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 3));
 				$offset += 3;
-				$atom_structure['mp4_iod_tag']            =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['mp4_iod_tag']            = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
 				$atom_structure['length']                 = $this->quicktime_read_mp4_descr_length($atom_data, $offset);
 				//$offset already adjusted by quicktime_read_mp4_descr_length()
-				$atom_structure['object_descriptor_id']   =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));
+				$atom_structure['object_descriptor_id']   = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));
 				$offset += 2;
-				$atom_structure['od_profile_level']       =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['od_profile_level']       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
-				$atom_structure['scene_profile_level']    =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['scene_profile_level']    = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
-				$atom_structure['audio_profile_id']       =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['audio_profile_id']       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
-				$atom_structure['video_profile_id']       =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['video_profile_id']       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
-				$atom_structure['graphics_profile_level'] =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+				$atom_structure['graphics_profile_level'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 				$offset += 1;
 
 				$atom_structure['num_iods_tracks'] = ($atom_structure['length'] - 7) / 6; // 6 bytes would only be right if all tracks use 1-byte length fields
 				for ($i = 0; $i < $atom_structure['num_iods_tracks']; $i++) {
-					$atom_structure['track'][$i]['ES_ID_IncTag'] =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
+					$atom_structure['track'][$i]['ES_ID_IncTag'] = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 1));
 					$offset += 1;
 					$atom_structure['track'][$i]['length']       = $this->quicktime_read_mp4_descr_length($atom_data, $offset);
 					//$offset already adjusted by quicktime_read_mp4_descr_length()
-					$atom_structure['track'][$i]['track_id']     =       getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));
+					$atom_structure['track'][$i]['track_id']     = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));
 					$offset += 4;
 				}
 
@@ -1217,9 +1217,9 @@ 
 				break;
 
 			case 'ftyp': // FileTYPe (?) atom (for MP4 it seems)
-				$atom_structure['signature'] =                           substr($atom_data,  0, 4);
-				$atom_structure['unknown_1'] = getid3_lib::BigEndian2Int(substr($atom_data,  4, 4));
-				$atom_structure['fourcc']    =                           substr($atom_data,  8, 4);
+				$atom_structure['signature'] = substr($atom_data, 0, 4);
+				$atom_structure['unknown_1'] = getid3_lib::BigEndian2Int(substr($atom_data, 4, 4));
+				$atom_structure['fourcc']    = substr($atom_data, 8, 4);
 				break;
 
 			case 'mdat': // Media DATa atom
@@ -1240,7 +1240,7 @@ 
 				}
 
 				// check to see if it looks like chapter titles, in the form of unterminated strings with a leading 16-bit size field
-				while  (($chapter_string_length = getid3_lib::BigEndian2Int(substr($atom_data, $mdat_offset, 2)))
+				while (($chapter_string_length = getid3_lib::BigEndian2Int(substr($atom_data, $mdat_offset, 2)))
 					&& ($chapter_string_length < 1000)
 					&& ($chapter_string_length <= (strlen($atom_data) - $mdat_offset - 2))
 					&& preg_match('#^[\x20-\xFF]+$#', substr($atom_data, $mdat_offset + 2, $chapter_string_length), $chapter_matches)) {
@@ -1250,9 +1250,9 @@ 
 
 
 
-				if (($atomsize > 8) && (!isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) {
+				if (($atomsize > 8) && ( ! isset($info['avdataend_tmp']) || ($info['quicktime'][$atomname]['size'] > ($info['avdataend_tmp'] - $info['avdataoffset'])))) {
 
-					$info['avdataoffset'] = $atom_structure['offset'] + 8;                       // $info['quicktime'][$atomname]['offset'] + 8;
+					$info['avdataoffset'] = $atom_structure['offset'] + 8; // $info['quicktime'][$atomname]['offset'] + 8;
 					$OldAVDataEnd         = $info['avdataend'];
 					$info['avdataend']    = $atom_structure['offset'] + $atom_structure['size']; // $info['quicktime'][$atomname]['offset'] + $info['quicktime'][$atomname]['size'];
 
@@ -1263,16 +1263,16 @@ 
 					$getid3_mp3 = new getid3_mp3($getid3_temp);
 					if ($getid3_mp3->MPEGaudioHeaderValid($getid3_mp3->MPEGaudioHeaderDecode($this->fread(4)))) {
 						$getid3_mp3->getOnlyMPEGaudioInfo($getid3_temp->info['avdataoffset'], false);
-						if (!empty($getid3_temp->info['warning'])) {
+						if ( ! empty($getid3_temp->info['warning'])) {
 							foreach ($getid3_temp->info['warning'] as $value) {
 								$info['warning'][] = $value;
 							}
 						}
-						if (!empty($getid3_temp->info['mpeg'])) {
+						if ( ! empty($getid3_temp->info['mpeg'])) {
 							$info['mpeg'] = $getid3_temp->info['mpeg'];
 							if (isset($info['mpeg']['audio'])) {
 								$info['audio']['dataformat']   = 'mp3';
-								$info['audio']['codec']        = (!empty($info['mpeg']['audio']['encoder']) ? $info['mpeg']['audio']['encoder'] : (!empty($info['mpeg']['audio']['codec']) ? $info['mpeg']['audio']['codec'] : (!empty($info['mpeg']['audio']['LAME']) ? 'LAME' :'mp3')));
+								$info['audio']['codec']        = ( ! empty($info['mpeg']['audio']['encoder']) ? $info['mpeg']['audio']['encoder'] : ( ! empty($info['mpeg']['audio']['codec']) ? $info['mpeg']['audio']['codec'] : ( ! empty($info['mpeg']['audio']['LAME']) ? 'LAME' : 'mp3')));
 								$info['audio']['sample_rate']  = $info['mpeg']['audio']['sample_rate'];
 								$info['audio']['channels']     = $info['mpeg']['audio']['channels'];
 								$info['audio']['bitrate']      = $info['mpeg']['audio']['bitrate'];
@@ -1307,7 +1307,7 @@ 
 
 			case 'nsav': // NoSAVe atom
 				// http://developer.apple.com/technotes/tn/tn2038.html
-				$atom_structure['data'] = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4));
+				$atom_structure['data'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
 				break;
 
 			case 'ctyp': // Controller TYPe atom (seen on QTVR)
@@ -1325,7 +1325,7 @@ 
 				break;
 
 			case 'pano': // PANOrama track (seen on QTVR)
-				$atom_structure['pano'] = getid3_lib::BigEndian2Int(substr($atom_data,  0, 4));
+				$atom_structure['pano'] = getid3_lib::BigEndian2Int(substr($atom_data, 0, 4));
 				break;
 
 			case 'hint': // HINT track
@@ -1364,7 +1364,7 @@ 
 					@list($all, $latitude, $longitude, $altitude) = $matches;
 					$info['quicktime']['comments']['gps_latitude'][]  = floatval($latitude);
 					$info['quicktime']['comments']['gps_longitude'][] = floatval($longitude);
-					if (!empty($altitude)) {
+					if ( ! empty($altitude)) {
 						$info['quicktime']['comments']['gps_altitude'][] = floatval($altitude);
 					}
 				} else {
@@ -1402,17 +1402,17 @@ 
 				// mdta keys \005 mdtacom.apple.quicktime.make (mdtacom.apple.quicktime.creationdate ,mdtacom.apple.quicktime.location.ISO6709 $mdtacom.apple.quicktime.software !mdtacom.apple.quicktime.model ilst \01D \001 \015data \001DE\010Apple 0 \002 (data \001DE\0102011-05-11T17:54:04+0200 2 \003 *data \001DE\010+52.4936+013.3897+040.247/ \01D \004 \015data \001DE\0104.3.1 \005 \018data \001DE\010iPhone 4
 				// http://www.geocities.com/xhelmboyx/quicktime/formats/qti-layout.txt
 
-	            $atom_structure['version']   =          getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
-	            $atom_structure['flags_raw'] =          getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
+	            $atom_structure['version']   = getid3_lib::BigEndian2Int(substr($atom_data, 0, 1));
+	            $atom_structure['flags_raw'] = getid3_lib::BigEndian2Int(substr($atom_data, 1, 3));
 	            $atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom(substr($atom_data, 4), $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
 				//$atom_structure['subatoms']  = $this->QuicktimeParseContainerAtom($atom_data, $baseoffset + 8, $atomHierarchy, $ParseAllPossibleAtoms);
 				break;
 
 			case 'data': // metaDATA atom
 				// seems to be 2 bytes language code (ASCII), 2 bytes unknown (set to 0x10B5 in sample I have), remainder is useful data
-				$atom_structure['language'] =                           substr($atom_data, 4 + 0, 2);
+				$atom_structure['language'] = substr($atom_data, 4 + 0, 2);
 				$atom_structure['unknown']  = getid3_lib::BigEndian2Int(substr($atom_data, 4 + 2, 2));
-				$atom_structure['data']     =                           substr($atom_data, 4 + 4);
+				$atom_structure['data']     = substr($atom_data, 4 + 4);
 				break;
 
 			default:
@@ -1426,7 +1426,7 @@ 
 
 	public function QuicktimeParseContainerAtom($atom_data, $baseoffset, &$atomHierarchy, $ParseAllPossibleAtoms) {
 //echo 'QuicktimeParseContainerAtom('.substr($atom_data, 4, 4).') @ '.$baseoffset.'<br><br>';
-		$atom_structure  = false;
+		$atom_structure = false;
 		$subatomoffset  = 0;
 		$subatomcounter = 0;
 		if ((strlen($atom_data) == 4) && (getid3_lib::BigEndian2Int($atom_data) == 0x00000000)) {
@@ -1434,8 +1434,8 @@ 
 		}
 		while ($subatomoffset < strlen($atom_data)) {
 			$subatomsize = getid3_lib::BigEndian2Int(substr($atom_data, $subatomoffset + 0, 4));
-			$subatomname =                           substr($atom_data, $subatomoffset + 4, 4);
-			$subatomdata =                           substr($atom_data, $subatomoffset + 8, $subatomsize - 8);
+			$subatomname = substr($atom_data, $subatomoffset + 4, 4);
+			$subatomdata = substr($atom_data, $subatomoffset + 8, $subatomsize - 8);
 			if ($subatomsize == 0) {
 				// Furthermore, for historical reasons the list of atoms is optionally
 				// terminated by a 32-bit integer set to 0. If you are writing a program
@@ -1594,8 +1594,8 @@ 
 			*/
 			$iso_language_id  = '';
 			$iso_language_id .= chr((($languageid & 0x7C00) >> 10) + 0x60);
-			$iso_language_id .= chr((($languageid & 0x03E0) >>  5) + 0x60);
-			$iso_language_id .= chr((($languageid & 0x001F) >>  0) + 0x60);
+			$iso_language_id .= chr((($languageid & 0x03E0) >> 5) + 0x60);
+			$iso_language_id .= chr((($languageid & 0x001F) >> 0) + 0x60);
 			$QuicktimeLanguageLookup[$languageid] = getid3_id3v2::LanguageLookup($iso_language_id);
 		}
 		return (isset($QuicktimeLanguageLookup[$languageid]) ? $QuicktimeLanguageLookup[$languageid] : 'invalid');
@@ -1975,9 +1975,9 @@ 
 		$parsed = array();
 		while ($offset < $datalength) {
 //echo getid3_lib::PrintHexBytes(substr($atom_data, $offset, 4)).'<br>';
-			$record_type       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4));  $offset += 4;
-			$data_size_type    = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
-			$data_size         = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2));  $offset += 2;
+			$record_type       = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 4)); $offset += 4;
+			$data_size_type    = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2)); $offset += 2;
+			$data_size         = getid3_lib::BigEndian2Int(substr($atom_data, $offset, 2)); $offset += 2;
 			switch ($data_size_type) {
 				case 0x0001: // 0x0001 = flag   (size field *= 1-byte)
 					$data = getid3_lib::BigEndian2Int(substr($atom_data, $offset, $data_size * 1));
@@ -2050,23 +2050,23 @@ 
 					break;
 				case 0x02000023: // PictureControlData
 					$PictureControlAdjust = array(0=>'default', 1=>'quick', 2=>'full');
-					$FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange',    0x83=>'red', 0x84=>'green',  0xff=>'n/a');
-					$ToningEffect = array(0x80=>'b&w', 0x81=>'sepia',  0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a');
+					$FilterEffect = array(0x80=>'off', 0x81=>'yellow', 0x82=>'orange', 0x83=>'red', 0x84=>'green', 0xff=>'n/a');
+					$ToningEffect = array(0x80=>'b&w', 0x81=>'sepia', 0x82=>'cyanotype', 0x83=>'red', 0x84=>'yellow', 0x85=>'green', 0x86=>'blue-green', 0x87=>'blue', 0x88=>'purple-blue', 0x89=>'red-purple', 0xff=>'n/a');
 					$data = array(
-						'PictureControlVersion'     =>                           substr($data,  0,  4),
-						'PictureControlName'        =>                     rtrim(substr($data,  4, 20), "\x00"),
+						'PictureControlVersion'     =>                           substr($data, 0, 4),
+						'PictureControlName'        =>                     rtrim(substr($data, 4, 20), "\x00"),
 						'PictureControlBase'        =>                     rtrim(substr($data, 24, 20), "\x00"),
 						//'?'                       =>                           substr($data, 44,  4),
-						'PictureControlAdjust'      => $PictureControlAdjust[ord(substr($data, 48,  1))],
-						'PictureControlQuickAdjust' =>                       ord(substr($data, 49,  1)),
-						'Sharpness'                 =>                       ord(substr($data, 50,  1)),
-						'Contrast'                  =>                       ord(substr($data, 51,  1)),
-						'Brightness'                =>                       ord(substr($data, 52,  1)),
-						'Saturation'                =>                       ord(substr($data, 53,  1)),
-						'HueAdjustment'             =>                       ord(substr($data, 54,  1)),
-						'FilterEffect'              =>         $FilterEffect[ord(substr($data, 55,  1))],
-						'ToningEffect'              =>         $ToningEffect[ord(substr($data, 56,  1))],
-						'ToningSaturation'          =>                       ord(substr($data, 57,  1)),
+						'PictureControlAdjust'      => $PictureControlAdjust[ord(substr($data, 48, 1))],
+						'PictureControlQuickAdjust' =>                       ord(substr($data, 49, 1)),
+						'Sharpness'                 =>                       ord(substr($data, 50, 1)),
+						'Contrast'                  =>                       ord(substr($data, 51, 1)),
+						'Brightness'                =>                       ord(substr($data, 52, 1)),
+						'Saturation'                =>                       ord(substr($data, 53, 1)),
+						'HueAdjustment'             =>                       ord(substr($data, 54, 1)),
+						'FilterEffect'              =>         $FilterEffect[ord(substr($data, 55, 1))],
+						'ToningEffect'              =>         $ToningEffect[ord(substr($data, 56, 1))],
+						'ToningSaturation'          =>                       ord(substr($data, 57, 1)),
 					);
 					break;
 				case 0x02000024: // WorldTime
@@ -2108,11 +2108,11 @@ 
 	}
 
 
-	public function CopyToAppropriateCommentsSection($keyname, $data, $boxname='') {
+	public function CopyToAppropriateCommentsSection($keyname, $data, $boxname = '') {
 		static $handyatomtranslatorarray = array();
 		if (empty($handyatomtranslatorarray)) {
 			$handyatomtranslatorarray["\xA9".'cpy'] = 'copyright';
-			$handyatomtranslatorarray["\xA9".'day'] = 'creation_date';    // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'day'] = 'creation_date'; // iTunes 4.0
 			$handyatomtranslatorarray["\xA9".'dir'] = 'director';
 			$handyatomtranslatorarray["\xA9".'ed1'] = 'edit1';
 			$handyatomtranslatorarray["\xA9".'ed2'] = 'edit2';
@@ -2132,8 +2132,8 @@ 
 			$handyatomtranslatorarray["\xA9".'wrt'] = 'writer';
 
 			// http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
-			$handyatomtranslatorarray["\xA9".'nam'] = 'title';           // iTunes 4.0
-			$handyatomtranslatorarray["\xA9".'cmt'] = 'comment';         // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'nam'] = 'title'; // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'cmt'] = 'comment'; // iTunes 4.0
 			$handyatomtranslatorarray["\xA9".'wrn'] = 'warning';
 			$handyatomtranslatorarray["\xA9".'hst'] = 'host_computer';
 			$handyatomtranslatorarray["\xA9".'mak'] = 'make';
@@ -2143,39 +2143,39 @@ 
 			$handyatomtranslatorarray["\xA9".'aut'] = 'author';
 			$handyatomtranslatorarray["\xA9".'ART'] = 'artist';
 			$handyatomtranslatorarray["\xA9".'trk'] = 'track';
-			$handyatomtranslatorarray["\xA9".'alb'] = 'album';           // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'alb'] = 'album'; // iTunes 4.0
 			$handyatomtranslatorarray["\xA9".'com'] = 'comment';
-			$handyatomtranslatorarray["\xA9".'gen'] = 'genre';           // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'gen'] = 'genre'; // iTunes 4.0
 			$handyatomtranslatorarray["\xA9".'ope'] = 'composer';
 			$handyatomtranslatorarray["\xA9".'url'] = 'url';
 			$handyatomtranslatorarray["\xA9".'enc'] = 'encoder';
 
 			// http://atomicparsley.sourceforge.net/mpeg-4files.html
-			$handyatomtranslatorarray["\xA9".'art'] = 'artist';           // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'art'] = 'artist'; // iTunes 4.0
 			$handyatomtranslatorarray['aART'] = 'album_artist';
-			$handyatomtranslatorarray['trkn'] = 'track_number';     // iTunes 4.0
-			$handyatomtranslatorarray['disk'] = 'disc_number';      // iTunes 4.0
-			$handyatomtranslatorarray['gnre'] = 'genre';            // iTunes 4.0
-			$handyatomtranslatorarray["\xA9".'too'] = 'encoder';          // iTunes 4.0
-			$handyatomtranslatorarray['tmpo'] = 'bpm';              // iTunes 4.0
-			$handyatomtranslatorarray['cprt'] = 'copyright';        // iTunes 4.0?
-			$handyatomtranslatorarray['cpil'] = 'compilation';      // iTunes 4.0
-			$handyatomtranslatorarray['covr'] = 'picture';          // iTunes 4.0
-			$handyatomtranslatorarray['rtng'] = 'rating';           // iTunes 4.0
-			$handyatomtranslatorarray["\xA9".'grp'] = 'grouping';         // iTunes 4.2
-			$handyatomtranslatorarray['stik'] = 'stik';             // iTunes 4.9
-			$handyatomtranslatorarray['pcst'] = 'podcast';          // iTunes 4.9
-			$handyatomtranslatorarray['catg'] = 'category';         // iTunes 4.9
-			$handyatomtranslatorarray['keyw'] = 'keyword';          // iTunes 4.9
-			$handyatomtranslatorarray['purl'] = 'podcast_url';      // iTunes 4.9
-			$handyatomtranslatorarray['egid'] = 'episode_guid';     // iTunes 4.9
-			$handyatomtranslatorarray['desc'] = 'description';      // iTunes 5.0
-			$handyatomtranslatorarray["\xA9".'lyr'] = 'lyrics';           // iTunes 5.0
-			$handyatomtranslatorarray['tvnn'] = 'tv_network_name';  // iTunes 6.0
-			$handyatomtranslatorarray['tvsh'] = 'tv_show_name';     // iTunes 6.0
-			$handyatomtranslatorarray['tvsn'] = 'tv_season';        // iTunes 6.0
-			$handyatomtranslatorarray['tves'] = 'tv_episode';       // iTunes 6.0
-			$handyatomtranslatorarray['purd'] = 'purchase_date';    // iTunes 6.0.2
+			$handyatomtranslatorarray['trkn'] = 'track_number'; // iTunes 4.0
+			$handyatomtranslatorarray['disk'] = 'disc_number'; // iTunes 4.0
+			$handyatomtranslatorarray['gnre'] = 'genre'; // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'too'] = 'encoder'; // iTunes 4.0
+			$handyatomtranslatorarray['tmpo'] = 'bpm'; // iTunes 4.0
+			$handyatomtranslatorarray['cprt'] = 'copyright'; // iTunes 4.0?
+			$handyatomtranslatorarray['cpil'] = 'compilation'; // iTunes 4.0
+			$handyatomtranslatorarray['covr'] = 'picture'; // iTunes 4.0
+			$handyatomtranslatorarray['rtng'] = 'rating'; // iTunes 4.0
+			$handyatomtranslatorarray["\xA9".'grp'] = 'grouping'; // iTunes 4.2
+			$handyatomtranslatorarray['stik'] = 'stik'; // iTunes 4.9
+			$handyatomtranslatorarray['pcst'] = 'podcast'; // iTunes 4.9
+			$handyatomtranslatorarray['catg'] = 'category'; // iTunes 4.9
+			$handyatomtranslatorarray['keyw'] = 'keyword'; // iTunes 4.9
+			$handyatomtranslatorarray['purl'] = 'podcast_url'; // iTunes 4.9
+			$handyatomtranslatorarray['egid'] = 'episode_guid'; // iTunes 4.9
+			$handyatomtranslatorarray['desc'] = 'description'; // iTunes 5.0
+			$handyatomtranslatorarray["\xA9".'lyr'] = 'lyrics'; // iTunes 5.0
+			$handyatomtranslatorarray['tvnn'] = 'tv_network_name'; // iTunes 6.0
+			$handyatomtranslatorarray['tvsh'] = 'tv_show_name'; // iTunes 6.0
+			$handyatomtranslatorarray['tvsn'] = 'tv_season'; // iTunes 6.0
+			$handyatomtranslatorarray['tves'] = 'tv_episode'; // iTunes 6.0
+			$handyatomtranslatorarray['purd'] = 'purchase_date'; // iTunes 6.0.2
 			$handyatomtranslatorarray['pgap'] = 'gapless_playback'; // iTunes 7.0
 
 			// http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt
@@ -2211,7 +2211,7 @@ 
 		}
 		if ($comment_key) {
 			if ($comment_key == 'picture') {
-				if (!is_array($data)) {
+				if ( ! is_array($data)) {
 					$image_mime = '';
 					if (preg_match('#^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A#', $data)) {
 						$image_mime = 'image/png';

src/wp-includes/ID3/module.audio-video.riff.php

Doc Comments +18 added lines

@@ -1320,6 +1320,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param double $startoffset
+	 */
 	public function ParseRIFFAMV($startoffset, $maxoffset) {
 		// AMV files are RIFF-AVI files with parts of the spec deliberately broken, such as chunk size fields hardcoded to zero (because players known in hardware that these fields are always a certain size
 
@@ -1715,6 +1718,9 @@ 
 		return $RIFFchunk;
 	}
 
+	/**
+	 * @param string $RIFFdata
+	 */
 	public function ParseRIFFdata(&$RIFFdata) {
 		$info = &$this->getid3->info;
 		if ($RIFFdata) {
@@ -1836,6 +1842,9 @@ 
 		return $WaveFormatEx;
 	}
 
+	/**
+	 * @param string $WavPackChunkData
+	 */
 	public function parseWavPackHeader($WavPackChunkData) {
 		// typedef struct {
 		//     char ckID [4];
@@ -1916,6 +1925,9 @@ 
 		return $parsed;
 	}
 
+	/**
+	 * @param string $DIVXTAG
+	 */
 	public static function ParseDIVXTAG($DIVXTAG, $raw=false) {
 		// structure from "IDivX" source, Form1.frm, by "Greg Frazier of Daemonic Software Group", email: gfrazier@icestorm.net, web: http://dsg.cjb.net/
 		// source available at http://files.divx-digest.com/download/c663efe7ef8ad2e90bf4af4d3ea6188a/on0SWN2r/edit/IDivX.zip
@@ -1990,6 +2002,9 @@ 
 		return $parsed;
 	}
 
+	/**
+	 * @param string $tagshortname
+	 */
 	public static function waveSNDMtagLookup($tagshortname) {
 		$begin = __LINE__;
 
@@ -2576,6 +2591,9 @@ 
 		return getid3_lib::EmbeddedLookup($fourcc, $begin, __LINE__, __FILE__, 'riff-fourcc');
 	}
 
+	/**
+	 * @param string $byteword
+	 */
 	private function EitherEndian2Int($byteword, $signed=false) {
 		if ($this->container == 'riff') {
 			return getid3_lib::LittleEndian2Int($byteword, $signed);

Indentation +6 added lines, -9 removed lines

@@ -693,7 +693,7 @@ 
 						'capturedfile' => 0x00010000,
 						'copyrighted'  => 0x00020010,
 					);
-                    foreach ($flags as $flag => $value) {
+					foreach ($flags as $flag => $value) {
 						$thisfile_riff_raw_avih['flags'][$flag] = (bool) ($thisfile_riff_raw_avih['dwFlags'] & $value);
 					}
 
@@ -912,7 +912,7 @@ 
 			// http://en.wikipedia.org/wiki/CD-DA
 			case 'CDDA':
 				$info['fileformat'] = 'cda';
-			    unset($info['mime_type']);
+				unset($info['mime_type']);
 
 				$thisfile_audio_dataformat      = 'cda';
 
@@ -945,7 +945,7 @@ 
 				}
 				break;
 
-            // http://en.wikipedia.org/wiki/AIFF
+			// http://en.wikipedia.org/wiki/AIFF
 			case 'AIFF':
 			case 'AIFC':
 				$info['fileformat'] = 'aiff';
@@ -2007,8 +2007,7 @@ 
 			©cdt	cdtitle
 			©alb	library
 			©com	composer
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($tagshortname, $begin, __LINE__, __FILE__, 'riff-sndm');
 	}
@@ -2176,8 +2175,7 @@ 
 			0x7A22	GSM-AMR (VBR, including SID)
 			0xFFFE	WAVE_FORMAT_EXTENSIBLE
 			0xFFFF	WAVE_FORMAT_DEVELOPMENT
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup('0x'.str_pad(strtoupper(dechex($wFormatTag)), 4, '0', STR_PAD_LEFT), $begin, __LINE__, __FILE__, 'riff-wFormatTag');
 	}
@@ -2570,8 +2568,7 @@ 
 			YVYU	YVYU 4:2:2 Packed
 			ZLIB	Lossless Codec Library zlib compression (www.geocities.co.jp/Playtown-Denei/2837/LRC.htm)
 			ZPEG	Metheus Video Zipper
-
-		*/
+		 */
 
 		return getid3_lib::EmbeddedLookup($fourcc, $begin, __LINE__, __FILE__, 'riff-fourcc');
 	}

Spacing +191 added lines, -191 removed lines

@@ -79,7 +79,7 @@ 
 				if ($RIFFsubtype != 'AMV ') {
 					// AMV files are RIFF-AVI files with parts of the spec deliberately broken, such as chunk size fields hardcoded to zero (because players known in hardware that these fields are always a certain size
 					// Handled separately in ParseRIFFAMV()
-					$thisfile_riff[$RIFFsubtype]  = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4));
+					$thisfile_riff[$RIFFsubtype] = $this->ParseRIFF($offset, ($offset + $thisfile_riff['header_size'] - 4));
 				}
 				if (($info['avdataend'] - $info['filesize']) == 1) {
 					// LiteWave appears to incorrectly *not* pad actual output file
@@ -109,9 +109,9 @@ 
 							break;
 						}
 					}
-					$nextRIFFheaderID =                         substr($nextRIFFheader, 0, 4);
+					$nextRIFFheaderID = substr($nextRIFFheader, 0, 4);
 					$nextRIFFsize     = $this->EitherEndian2Int(substr($nextRIFFheader, 4, 4));
-					$nextRIFFtype     =                         substr($nextRIFFheader, 8, 4);
+					$nextRIFFtype     = substr($nextRIFFheader, 8, 4);
 					$chunkdata = array();
 					$chunkdata['offset'] = $nextRIFFoffset + 8;
 					$chunkdata['size']   = $nextRIFFsize;
@@ -120,7 +120,7 @@ 
 					switch ($nextRIFFheaderID) {
 						case 'RIFF':
 							$chunkdata['chunks'] = $this->ParseRIFF($chunkdata['offset'] + 4, $nextRIFFoffset);
-							if (!isset($thisfile_riff[$nextRIFFtype])) {
+							if ( ! isset($thisfile_riff[$nextRIFFtype])) {
 								$thisfile_riff[$nextRIFFtype] = array();
 							}
 							$thisfile_riff[$nextRIFFtype][] = $chunkdata;
@@ -189,7 +189,7 @@ 
 
 					$thisfile_riff_audio[$streamindex] = self::parseWAVEFORMATex($thisfile_riff_WAVE['fmt '][0]['data']);
 					$thisfile_audio['wformattag'] = $thisfile_riff_audio[$streamindex]['raw']['wFormatTag'];
-					if (!isset($thisfile_riff_audio[$streamindex]['bitrate']) || ($thisfile_riff_audio[$streamindex]['bitrate'] == 0)) {
+					if ( ! isset($thisfile_riff_audio[$streamindex]['bitrate']) || ($thisfile_riff_audio[$streamindex]['bitrate'] == 0)) {
 						$info['error'][] = 'Corrupt RIFF file: bitrate_audio == zero';
 						return false;
 					}
@@ -241,8 +241,8 @@ 
 					$thisfile_riff_raw_rgad_album = &$thisfile_riff_raw_rgad['album'];
 
 					$thisfile_riff_raw_rgad['fPeakAmplitude']      = getid3_lib::LittleEndian2Float(substr($rgadData, 0, 4));
-					$thisfile_riff_raw_rgad['nRadioRgAdjust']      =        $this->EitherEndian2Int(substr($rgadData, 4, 2));
-					$thisfile_riff_raw_rgad['nAudiophileRgAdjust'] =        $this->EitherEndian2Int(substr($rgadData, 6, 2));
+					$thisfile_riff_raw_rgad['nRadioRgAdjust']      = $this->EitherEndian2Int(substr($rgadData, 4, 2));
+					$thisfile_riff_raw_rgad['nAudiophileRgAdjust'] = $this->EitherEndian2Int(substr($rgadData, 6, 2));
 
 					$nRadioRgAdjustBitstring      = str_pad(getid3_lib::Dec2Bin($thisfile_riff_raw_rgad['nRadioRgAdjust']), 16, '0', STR_PAD_LEFT);
 					$nAudiophileRgAdjustBitstring = str_pad(getid3_lib::Dec2Bin($thisfile_riff_raw_rgad['nAudiophileRgAdjust']), 16, '0', STR_PAD_LEFT);
@@ -279,7 +279,7 @@ 
 					//     $info['playtime_seconds'] = (float) $thisfile_riff_raw['fact']['NumberOfSamples'] / $thisfile_riff_raw['fmt ']['nSamplesPerSec'];
 					// }
 				}
-				if (!empty($thisfile_riff_raw['fmt ']['nAvgBytesPerSec'])) {
+				if ( ! empty($thisfile_riff_raw['fmt ']['nAvgBytesPerSec'])) {
 					$thisfile_audio['bitrate'] = getid3_lib::CastAsInt($thisfile_riff_raw['fmt ']['nAvgBytesPerSec'] * 8);
 				}
 
@@ -287,18 +287,18 @@ 
 					// shortcut
 					$thisfile_riff_WAVE_bext_0 = &$thisfile_riff_WAVE['bext'][0];
 
-					$thisfile_riff_WAVE_bext_0['title']          =                         trim(substr($thisfile_riff_WAVE_bext_0['data'],   0, 256));
-					$thisfile_riff_WAVE_bext_0['author']         =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 256,  32));
-					$thisfile_riff_WAVE_bext_0['reference']      =                         trim(substr($thisfile_riff_WAVE_bext_0['data'], 288,  32));
-					$thisfile_riff_WAVE_bext_0['origin_date']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 320,  10);
-					$thisfile_riff_WAVE_bext_0['origin_time']    =                              substr($thisfile_riff_WAVE_bext_0['data'], 330,   8);
-					$thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338,   8));
-					$thisfile_riff_WAVE_bext_0['bwf_version']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 346,   1));
-					$thisfile_riff_WAVE_bext_0['reserved']       =                              substr($thisfile_riff_WAVE_bext_0['data'], 347, 254);
-					$thisfile_riff_WAVE_bext_0['coding_history'] =         explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601)));
+					$thisfile_riff_WAVE_bext_0['title']          = trim(substr($thisfile_riff_WAVE_bext_0['data'], 0, 256));
+					$thisfile_riff_WAVE_bext_0['author']         = trim(substr($thisfile_riff_WAVE_bext_0['data'], 256, 32));
+					$thisfile_riff_WAVE_bext_0['reference']      = trim(substr($thisfile_riff_WAVE_bext_0['data'], 288, 32));
+					$thisfile_riff_WAVE_bext_0['origin_date']    = substr($thisfile_riff_WAVE_bext_0['data'], 320, 10);
+					$thisfile_riff_WAVE_bext_0['origin_time']    = substr($thisfile_riff_WAVE_bext_0['data'], 330, 8);
+					$thisfile_riff_WAVE_bext_0['time_reference'] = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 338, 8));
+					$thisfile_riff_WAVE_bext_0['bwf_version']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_bext_0['data'], 346, 1));
+					$thisfile_riff_WAVE_bext_0['reserved']       = substr($thisfile_riff_WAVE_bext_0['data'], 347, 254);
+					$thisfile_riff_WAVE_bext_0['coding_history'] = explode("\r\n", trim(substr($thisfile_riff_WAVE_bext_0['data'], 601)));
 					if (preg_match('#^([0-9]{4}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_date'], $matches_bext_date)) {
 						if (preg_match('#^([0-9]{2}).([0-9]{2}).([0-9]{2})$#', $thisfile_riff_WAVE_bext_0['origin_time'], $matches_bext_time)) {
-							list($dummy, $bext_timestamp['year'], $bext_timestamp['month'],  $bext_timestamp['day'])    = $matches_bext_date;
+							list($dummy, $bext_timestamp['year'], $bext_timestamp['month'], $bext_timestamp['day'])    = $matches_bext_date;
 							list($dummy, $bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second']) = $matches_bext_time;
 							$thisfile_riff_WAVE_bext_0['origin_date_unix'] = gmmktime($bext_timestamp['hour'], $bext_timestamp['minute'], $bext_timestamp['second'], $bext_timestamp['month'], $bext_timestamp['day'], $bext_timestamp['year']);
 						} else {
@@ -319,8 +319,8 @@ 
 					$thisfile_riff_WAVE_MEXT_0['flags']['homogenous']           = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0001);
 					if ($thisfile_riff_WAVE_MEXT_0['flags']['homogenous']) {
 						$thisfile_riff_WAVE_MEXT_0['flags']['padding']          = ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0002) ? false : true;
-						$thisfile_riff_WAVE_MEXT_0['flags']['22_or_44']         =        (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0004);
-						$thisfile_riff_WAVE_MEXT_0['flags']['free_format']      =        (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0008);
+						$thisfile_riff_WAVE_MEXT_0['flags']['22_or_44']         = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0004);
+						$thisfile_riff_WAVE_MEXT_0['flags']['free_format']      = (bool) ($thisfile_riff_WAVE_MEXT_0['raw']['sound_information'] & 0x0008);
 
 						$thisfile_riff_WAVE_MEXT_0['nominal_frame_size']        = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_MEXT_0['data'], 2, 2));
 					}
@@ -335,27 +335,27 @@ 
 					// shortcut
 					$thisfile_riff_WAVE_cart_0 = &$thisfile_riff_WAVE['cart'][0];
 
-					$thisfile_riff_WAVE_cart_0['version']              =                              substr($thisfile_riff_WAVE_cart_0['data'],   0,  4);
-					$thisfile_riff_WAVE_cart_0['title']                =                         trim(substr($thisfile_riff_WAVE_cart_0['data'],   4, 64));
-					$thisfile_riff_WAVE_cart_0['artist']               =                         trim(substr($thisfile_riff_WAVE_cart_0['data'],  68, 64));
-					$thisfile_riff_WAVE_cart_0['cut_id']               =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 132, 64));
-					$thisfile_riff_WAVE_cart_0['client_id']            =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 196, 64));
-					$thisfile_riff_WAVE_cart_0['category']             =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 260, 64));
-					$thisfile_riff_WAVE_cart_0['classification']       =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 324, 64));
-					$thisfile_riff_WAVE_cart_0['out_cue']              =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 388, 64));
-					$thisfile_riff_WAVE_cart_0['start_date']           =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 452, 10));
-					$thisfile_riff_WAVE_cart_0['start_time']           =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 462,  8));
-					$thisfile_riff_WAVE_cart_0['end_date']             =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 470, 10));
-					$thisfile_riff_WAVE_cart_0['end_time']             =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 480,  8));
-					$thisfile_riff_WAVE_cart_0['producer_app_id']      =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 488, 64));
-					$thisfile_riff_WAVE_cart_0['producer_app_version'] =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 552, 64));
-					$thisfile_riff_WAVE_cart_0['user_defined_text']    =                         trim(substr($thisfile_riff_WAVE_cart_0['data'], 616, 64));
-					$thisfile_riff_WAVE_cart_0['zero_db_reference']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 680,  4), true);
+					$thisfile_riff_WAVE_cart_0['version']              = substr($thisfile_riff_WAVE_cart_0['data'], 0, 4);
+					$thisfile_riff_WAVE_cart_0['title']                = trim(substr($thisfile_riff_WAVE_cart_0['data'], 4, 64));
+					$thisfile_riff_WAVE_cart_0['artist']               = trim(substr($thisfile_riff_WAVE_cart_0['data'], 68, 64));
+					$thisfile_riff_WAVE_cart_0['cut_id']               = trim(substr($thisfile_riff_WAVE_cart_0['data'], 132, 64));
+					$thisfile_riff_WAVE_cart_0['client_id']            = trim(substr($thisfile_riff_WAVE_cart_0['data'], 196, 64));
+					$thisfile_riff_WAVE_cart_0['category']             = trim(substr($thisfile_riff_WAVE_cart_0['data'], 260, 64));
+					$thisfile_riff_WAVE_cart_0['classification']       = trim(substr($thisfile_riff_WAVE_cart_0['data'], 324, 64));
+					$thisfile_riff_WAVE_cart_0['out_cue']              = trim(substr($thisfile_riff_WAVE_cart_0['data'], 388, 64));
+					$thisfile_riff_WAVE_cart_0['start_date']           = trim(substr($thisfile_riff_WAVE_cart_0['data'], 452, 10));
+					$thisfile_riff_WAVE_cart_0['start_time']           = trim(substr($thisfile_riff_WAVE_cart_0['data'], 462, 8));
+					$thisfile_riff_WAVE_cart_0['end_date']             = trim(substr($thisfile_riff_WAVE_cart_0['data'], 470, 10));
+					$thisfile_riff_WAVE_cart_0['end_time']             = trim(substr($thisfile_riff_WAVE_cart_0['data'], 480, 8));
+					$thisfile_riff_WAVE_cart_0['producer_app_id']      = trim(substr($thisfile_riff_WAVE_cart_0['data'], 488, 64));
+					$thisfile_riff_WAVE_cart_0['producer_app_version'] = trim(substr($thisfile_riff_WAVE_cart_0['data'], 552, 64));
+					$thisfile_riff_WAVE_cart_0['user_defined_text']    = trim(substr($thisfile_riff_WAVE_cart_0['data'], 616, 64));
+					$thisfile_riff_WAVE_cart_0['zero_db_reference']    = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 680, 4), true);
 					for ($i = 0; $i < 8; $i++) {
-						$thisfile_riff_WAVE_cart_0['post_time'][$i]['usage_fourcc'] =                  substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8), 4);
+						$thisfile_riff_WAVE_cart_0['post_time'][$i]['usage_fourcc'] = substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8), 4);
 						$thisfile_riff_WAVE_cart_0['post_time'][$i]['timer_value']  = getid3_lib::LittleEndian2Int(substr($thisfile_riff_WAVE_cart_0['data'], 684 + ($i * 8) + 4, 4));
 					}
-					$thisfile_riff_WAVE_cart_0['url']              =                 trim(substr($thisfile_riff_WAVE_cart_0['data'],  748, 1024));
+					$thisfile_riff_WAVE_cart_0['url']              = trim(substr($thisfile_riff_WAVE_cart_0['data'], 748, 1024));
 					$thisfile_riff_WAVE_cart_0['tag_text']         = explode("\r\n", trim(substr($thisfile_riff_WAVE_cart_0['data'], 1772)));
 
 					$thisfile_riff['comments']['artist'][] = $thisfile_riff_WAVE_cart_0['artist'];
@@ -375,13 +375,13 @@ 
 						$SNDM_thisTagOffset = 0;
 						$SNDM_thisTagSize      = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4));
 						$SNDM_thisTagOffset += 4;
-						$SNDM_thisTagKey       =                           substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4);
+						$SNDM_thisTagKey       = substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 4);
 						$SNDM_thisTagOffset += 4;
 						$SNDM_thisTagDataSize  = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 2));
 						$SNDM_thisTagOffset += 2;
 						$SNDM_thisTagDataFlags = getid3_lib::BigEndian2Int(substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, 2));
 						$SNDM_thisTagOffset += 2;
-						$SNDM_thisTagDataText =                            substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, $SNDM_thisTagDataSize);
+						$SNDM_thisTagDataText = substr($thisfile_riff_WAVE_SNDM_0_data, $SNDM_startoffset + $SNDM_thisTagOffset, $SNDM_thisTagDataSize);
 						$SNDM_thisTagOffset += $SNDM_thisTagDataSize;
 
 						if ($SNDM_thisTagSize != (4 + 4 + 2 + 2 + $SNDM_thisTagDataSize)) {
@@ -426,15 +426,15 @@ 
 							@list($numerator, $denominator) = explode('/', $parsedXML['SPEED']['TIMECODE_RATE']);
 							$thisfile_riff_WAVE['iXML'][0]['timecode_rate'] = $numerator / ($denominator ? $denominator : 1000);
 						}
-						if (isset($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO']) && !empty($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) && !empty($thisfile_riff_WAVE['iXML'][0]['timecode_rate'])) {
+						if (isset($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO']) && ! empty($parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE']) && ! empty($thisfile_riff_WAVE['iXML'][0]['timecode_rate'])) {
 							$samples_since_midnight = floatval(ltrim($parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_HI'].$parsedXML['SPEED']['TIMESTAMP_SAMPLES_SINCE_MIDNIGHT_LO'], '0'));
 							$thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] = $samples_since_midnight / $parsedXML['SPEED']['TIMESTAMP_SAMPLE_RATE'];
-							$h = floor( $thisfile_riff_WAVE['iXML'][0]['timecode_seconds']       / 3600);
-							$m = floor(($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600))      / 60);
-							$s = floor( $thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60));
-							$f =       ($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60) - $s) * $thisfile_riff_WAVE['iXML'][0]['timecode_rate'];
-							$thisfile_riff_WAVE['iXML'][0]['timecode_string']       = sprintf('%02d:%02d:%02d:%05.2f', $h, $m, $s,       $f);
-							$thisfile_riff_WAVE['iXML'][0]['timecode_string_round'] = sprintf('%02d:%02d:%02d:%02d',   $h, $m, $s, round($f));
+							$h = floor($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] / 3600);
+							$m = floor(($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600)) / 60);
+							$s = floor($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60));
+							$f = ($thisfile_riff_WAVE['iXML'][0]['timecode_seconds'] - ($h * 3600) - ($m * 60) - $s) * $thisfile_riff_WAVE['iXML'][0]['timecode_rate'];
+							$thisfile_riff_WAVE['iXML'][0]['timecode_string']       = sprintf('%02d:%02d:%02d:%05.2f', $h, $m, $s, $f);
+							$thisfile_riff_WAVE['iXML'][0]['timecode_string_round'] = sprintf('%02d:%02d:%02d:%02d', $h, $m, $s, round($f));
 						}
 						unset($parsedXML);
 					}
@@ -442,23 +442,23 @@ 
 
 
 
-				if (!isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
+				if ( ! isset($thisfile_audio['bitrate']) && isset($thisfile_riff_audio[$streamindex]['bitrate'])) {
 					$thisfile_audio['bitrate'] = $thisfile_riff_audio[$streamindex]['bitrate'];
 					$info['playtime_seconds'] = (float) ((($info['avdataend'] - $info['avdataoffset']) * 8) / $thisfile_audio['bitrate']);
 				}
 
-				if (!empty($info['wavpack'])) {
+				if ( ! empty($info['wavpack'])) {
 					$thisfile_audio_dataformat = 'wavpack';
 					$thisfile_audio['bitrate_mode'] = 'vbr';
 					$thisfile_audio['encoder']      = 'WavPack v'.$info['wavpack']['version'];
 
 					// Reset to the way it was - RIFF parsing will have messed this up
-					$info['avdataend']        = $Original['avdataend'];
+					$info['avdataend'] = $Original['avdataend'];
 					$thisfile_audio['bitrate'] = (($info['avdataend'] - $info['avdataoffset']) * 8) / $info['playtime_seconds'];
 
 					$this->fseek($info['avdataoffset'] - 44);
 					$RIFFdata = $this->fread(44);
-					$OrignalRIFFheaderSize = getid3_lib::LittleEndian2Int(substr($RIFFdata,  4, 4)) +  8;
+					$OrignalRIFFheaderSize = getid3_lib::LittleEndian2Int(substr($RIFFdata, 4, 4)) + 8;
 					$OrignalRIFFdataSize   = getid3_lib::LittleEndian2Int(substr($RIFFdata, 40, 4)) + 44;
 
 					if ($OrignalRIFFheaderSize > $OrignalRIFFdataSize) {
@@ -479,7 +479,7 @@ 
 				if (isset($thisfile_riff_raw['fmt ']['wFormatTag'])) {
 					switch ($thisfile_riff_raw['fmt ']['wFormatTag']) {
 						case 0x0001: // PCM
-							if (!empty($info['ac3'])) {
+							if ( ! empty($info['ac3'])) {
 								// Dolby Digital WAV files masquerade as PCM-WAV, but they're not
 								$thisfile_audio['wformattag']  = 0x2000;
 								$thisfile_audio['codec']       = self::wFormatTagLookup($thisfile_audio['wformattag']);
@@ -487,7 +487,7 @@ 
 								$thisfile_audio['bitrate']     = $info['ac3']['bitrate'];
 								$thisfile_audio['sample_rate'] = $info['ac3']['sample_rate'];
 							}
-							if (!empty($info['dts'])) {
+							if ( ! empty($info['dts'])) {
 								// Dolby DTS files masquerade as PCM-WAV, but they're not
 								$thisfile_audio['wformattag']  = 0x2001;
 								$thisfile_audio['codec']       = self::wFormatTagLookup($thisfile_audio['wformattag']);
@@ -498,7 +498,7 @@ 
 							break;
 						case 0x08AE: // ClearJump LiteWave
 							$thisfile_audio['bitrate_mode'] = 'vbr';
-							$thisfile_audio_dataformat   = 'litewave';
+							$thisfile_audio_dataformat = 'litewave';
 
 							//typedef struct tagSLwFormat {
 							//  WORD    m_wCompFormat;     // low byte defines compression method, high byte is compression flags
@@ -544,7 +544,7 @@ 
 
 							$riff_litewave['flags']['raw_source']    = ($riff_litewave_raw['compression_flags'] & 0x01) ? false : true;
 							$riff_litewave['flags']['vbr_blocksize'] = ($riff_litewave_raw['compression_flags'] & 0x02) ? false : true;
-							$riff_litewave['flags']['seekpoints']    =        (bool) ($riff_litewave_raw['compression_flags'] & 0x04);
+							$riff_litewave['flags']['seekpoints']    = (bool) ($riff_litewave_raw['compression_flags'] & 0x04);
 
 							$thisfile_audio['lossless']        = (($riff_litewave_raw['m_wQuality'] == 100) ? true : false);
 							$thisfile_audio['encoder_options'] = '-q'.$riff_litewave['quality_factor'];
@@ -555,11 +555,11 @@ 
 					}
 				}
 				if ($info['avdataend'] > $info['filesize']) {
-					switch (!empty($thisfile_audio_dataformat) ? $thisfile_audio_dataformat : '') {
-						case 'wavpack': // WavPack
-						case 'lpac':    // LPAC
-						case 'ofr':     // OptimFROG
-						case 'ofs':     // OptimFROG DualStream
+					switch ( ! empty($thisfile_audio_dataformat) ? $thisfile_audio_dataformat : '') {
+						case 'wavpack' : // WavPack
+						case 'lpac' : // LPAC
+						case 'ofr' : // OptimFROG
+						case 'ofs' : // OptimFROG DualStream
 							// lossless compressed audio formats that keep original RIFF headers - skip warning
 							break;
 
@@ -589,7 +589,7 @@ 
 							break;
 					}
 				}
-				if (!empty($info['mpeg']['audio']['LAME']['audio_bytes'])) {
+				if ( ! empty($info['mpeg']['audio']['LAME']['audio_bytes'])) {
 					if ((($info['avdataend'] - $info['avdataoffset']) - $info['mpeg']['audio']['LAME']['audio_bytes']) == 1) {
 						$info['avdataend']--;
 						$info['warning'][] = 'Extra null byte at end of MP3 data assumed to be RIFF padding and therefore ignored';
@@ -597,7 +597,7 @@ 
 				}
 				if (isset($thisfile_audio_dataformat) && ($thisfile_audio_dataformat == 'ac3')) {
 					unset($thisfile_audio['bits_per_sample']);
-					if (!empty($info['ac3']['bitrate']) && ($info['ac3']['bitrate'] != $thisfile_audio['bitrate'])) {
+					if ( ! empty($info['ac3']['bitrate']) && ($info['ac3']['bitrate'] != $thisfile_audio['bitrate'])) {
 						$thisfile_audio['bitrate'] = $info['ac3']['bitrate'];
 					}
 				}
@@ -638,11 +638,11 @@ 
 					foreach ($thisfile_riff['AVI ']['hdrl']['strl']['indx'] as $streamnumber => $steamdataarray) {
 						$ahsisd = &$thisfile_riff['AVI ']['hdrl']['strl']['indx'][$streamnumber]['data'];
 
-						$thisfile_riff_raw['indx'][$streamnumber]['wLongsPerEntry'] = $this->EitherEndian2Int(substr($ahsisd,  0, 2));
-						$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType']  = $this->EitherEndian2Int(substr($ahsisd,  2, 1));
-						$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']     = $this->EitherEndian2Int(substr($ahsisd,  3, 1));
-						$thisfile_riff_raw['indx'][$streamnumber]['nEntriesInUse']  = $this->EitherEndian2Int(substr($ahsisd,  4, 4));
-						$thisfile_riff_raw['indx'][$streamnumber]['dwChunkId']      =                         substr($ahsisd,  8, 4);
+						$thisfile_riff_raw['indx'][$streamnumber]['wLongsPerEntry'] = $this->EitherEndian2Int(substr($ahsisd, 0, 2));
+						$thisfile_riff_raw['indx'][$streamnumber]['bIndexSubType']  = $this->EitherEndian2Int(substr($ahsisd, 2, 1));
+						$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']     = $this->EitherEndian2Int(substr($ahsisd, 3, 1));
+						$thisfile_riff_raw['indx'][$streamnumber]['nEntriesInUse']  = $this->EitherEndian2Int(substr($ahsisd, 4, 4));
+						$thisfile_riff_raw['indx'][$streamnumber]['dwChunkId']      = substr($ahsisd, 8, 4);
 						$thisfile_riff_raw['indx'][$streamnumber]['dwReserved']     = $this->EitherEndian2Int(substr($ahsisd, 12, 4));
 
 						//$thisfile_riff_raw['indx'][$streamnumber]['bIndexType_name']    =    $bIndexType[$thisfile_riff_raw['indx'][$streamnumber]['bIndexType']];
@@ -658,26 +658,26 @@ 
 					$thisfile_riff_raw['avih'] = array();
 					$thisfile_riff_raw_avih = &$thisfile_riff_raw['avih'];
 
-					$thisfile_riff_raw_avih['dwMicroSecPerFrame']    = $this->EitherEndian2Int(substr($avihData,  0, 4)); // frame display rate (or 0L)
+					$thisfile_riff_raw_avih['dwMicroSecPerFrame'] = $this->EitherEndian2Int(substr($avihData, 0, 4)); // frame display rate (or 0L)
 					if ($thisfile_riff_raw_avih['dwMicroSecPerFrame'] == 0) {
 						$info['error'][] = 'Corrupt RIFF file: avih.dwMicroSecPerFrame == zero';
 						return false;
 					}
 
 					$flags = array(
-						'dwMaxBytesPerSec',       // max. transfer rate
-						'dwPaddingGranularity',   // pad to multiples of this size; normally 2K.
-						'dwFlags',                // the ever-present flags
-						'dwTotalFrames',          // # frames in file
-						'dwInitialFrames',        //
-						'dwStreams',              //
-						'dwSuggestedBufferSize',  //
-						'dwWidth',                //
-						'dwHeight',               //
-						'dwScale',                //
-						'dwRate',                 //
-						'dwStart',                //
-						'dwLength',               //
+						'dwMaxBytesPerSec', // max. transfer rate
+						'dwPaddingGranularity', // pad to multiples of this size; normally 2K.
+						'dwFlags', // the ever-present flags
+						'dwTotalFrames', // # frames in file
+						'dwInitialFrames', //
+						'dwStreams', //
+						'dwSuggestedBufferSize', //
+						'dwWidth', //
+						'dwHeight', //
+						'dwScale', //
+						'dwRate', //
+						'dwStart', //
+						'dwLength', //
 					);
 					$avih_offset = 4;
 					foreach ($flags as $flag) {
@@ -722,7 +722,7 @@ 
 						for ($i = 0; $i < count($thisfile_riff['AVI ']['hdrl']['strl']['strh']); $i++) {
 							if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'])) {
 								$strhData = $thisfile_riff['AVI ']['hdrl']['strl']['strh'][$i]['data'];
-								$strhfccType = substr($strhData,  0, 4);
+								$strhfccType = substr($strhData, 0, 4);
 
 								if (isset($thisfile_riff['AVI ']['hdrl']['strl']['strf'][$i]['data'])) {
 									$strfData = $thisfile_riff['AVI ']['hdrl']['strl']['strf'][$i]['data'];
@@ -806,9 +806,9 @@ 
 											$thisfile_riff_raw['strh'][$i]                  = array();
 											$thisfile_riff_raw_strh_current                 = &$thisfile_riff_raw['strh'][$i];
 
-											$thisfile_riff_raw_strh_current['fccType']               =                         substr($strhData,  0, 4);  // same as $strhfccType;
-											$thisfile_riff_raw_strh_current['fccHandler']            =                         substr($strhData,  4, 4);
-											$thisfile_riff_raw_strh_current['dwFlags']               = $this->EitherEndian2Int(substr($strhData,  8, 4)); // Contains AVITF_* flags
+											$thisfile_riff_raw_strh_current['fccType']               = substr($strhData, 0, 4); // same as $strhfccType;
+											$thisfile_riff_raw_strh_current['fccHandler']            = substr($strhData, 4, 4);
+											$thisfile_riff_raw_strh_current['dwFlags']               = $this->EitherEndian2Int(substr($strhData, 8, 4)); // Contains AVITF_* flags
 											$thisfile_riff_raw_strh_current['wPriority']             = $this->EitherEndian2Int(substr($strhData, 12, 2));
 											$thisfile_riff_raw_strh_current['wLanguage']             = $this->EitherEndian2Int(substr($strhData, 14, 2));
 											$thisfile_riff_raw_strh_current['dwInitialFrames']       = $this->EitherEndian2Int(substr($strhData, 16, 4));
@@ -823,7 +823,7 @@ 
 
 											$thisfile_riff_video_current['codec'] = self::fourccLookup($thisfile_riff_raw_strh_current['fccHandler']);
 											$thisfile_video['fourcc']             = $thisfile_riff_raw_strh_current['fccHandler'];
-											if (!$thisfile_riff_video_current['codec'] && isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) && self::fourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
+											if ( ! $thisfile_riff_video_current['codec'] && isset($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']) && self::fourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'])) {
 												$thisfile_riff_video_current['codec'] = self::fourccLookup($thisfile_riff_raw_strf_strhfccType_streamindex['fourcc']);
 												$thisfile_video['fourcc']             = $thisfile_riff_raw_strf_strhfccType_streamindex['fourcc'];
 											}
@@ -877,12 +877,12 @@ 
 									case 'HFYU': // Huffman Lossless Codec
 									case 'IRAW': // Intel YUV Uncompressed
 									case 'YUY2': // Uncompressed YUV 4:2:2
-										$thisfile_video['lossless']        = true;
+										$thisfile_video['lossless'] = true;
 										//$thisfile_video['bits_per_sample'] = 24;
 										break;
 
 									default:
-										$thisfile_video['lossless']        = false;
+										$thisfile_video['lossless'] = false;
 										//$thisfile_video['bits_per_sample'] = 24;
 										break;
 								}
@@ -914,7 +914,7 @@ 
 				$info['fileformat'] = 'cda';
 			    unset($info['mime_type']);
 
-				$thisfile_audio_dataformat      = 'cda';
+				$thisfile_audio_dataformat = 'cda';
 
 				$info['avdataoffset'] = 44;
 
@@ -922,10 +922,10 @@ 
 					// shortcut
 					$thisfile_riff_CDDA_fmt_0 = &$thisfile_riff['CDDA']['fmt '][0];
 
-					$thisfile_riff_CDDA_fmt_0['unknown1']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  0, 2));
-					$thisfile_riff_CDDA_fmt_0['track_num']          = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  2, 2));
-					$thisfile_riff_CDDA_fmt_0['disc_id']            = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  4, 4));
-					$thisfile_riff_CDDA_fmt_0['start_offset_frame'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'],  8, 4));
+					$thisfile_riff_CDDA_fmt_0['unknown1']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 0, 2));
+					$thisfile_riff_CDDA_fmt_0['track_num']          = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 2, 2));
+					$thisfile_riff_CDDA_fmt_0['disc_id']            = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 4, 4));
+					$thisfile_riff_CDDA_fmt_0['start_offset_frame'] = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 8, 4));
 					$thisfile_riff_CDDA_fmt_0['playtime_frames']    = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 12, 4));
 					$thisfile_riff_CDDA_fmt_0['unknown6']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 16, 4));
 					$thisfile_riff_CDDA_fmt_0['unknown7']           = $this->EitherEndian2Int(substr($thisfile_riff_CDDA_fmt_0['data'], 20, 4));
@@ -974,15 +974,15 @@ 
 					// shortcut
 					$thisfile_riff_RIFFsubtype_COMM_0_data = &$thisfile_riff[$RIFFsubtype]['COMM'][0]['data'];
 
-					$thisfile_riff_audio['channels']         =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  0,  2), true);
-					$thisfile_riff_audio['total_samples']    =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  2,  4), false);
-					$thisfile_riff_audio['bits_per_sample']  =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  6,  2), true);
-					$thisfile_riff_audio['sample_rate']      = (int) getid3_lib::BigEndian2Float(substr($thisfile_riff_RIFFsubtype_COMM_0_data,  8, 10));
+					$thisfile_riff_audio['channels']         = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 0, 2), true);
+					$thisfile_riff_audio['total_samples']    = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 2, 4), false);
+					$thisfile_riff_audio['bits_per_sample']  = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 6, 2), true);
+					$thisfile_riff_audio['sample_rate']      = (int) getid3_lib::BigEndian2Float(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 8, 10));
 
 					if ($thisfile_riff[$RIFFsubtype]['COMM'][0]['size'] > 18) {
-						$thisfile_riff_audio['codec_fourcc'] =                                   substr($thisfile_riff_RIFFsubtype_COMM_0_data, 18,  4);
-						$CodecNameSize                       =         getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 22,  1), false);
-						$thisfile_riff_audio['codec_name']   =                                   substr($thisfile_riff_RIFFsubtype_COMM_0_data, 23,  $CodecNameSize);
+						$thisfile_riff_audio['codec_fourcc'] = substr($thisfile_riff_RIFFsubtype_COMM_0_data, 18, 4);
+						$CodecNameSize                       = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_COMM_0_data, 22, 1), false);
+						$thisfile_riff_audio['codec_name']   = substr($thisfile_riff_RIFFsubtype_COMM_0_data, 23, $CodecNameSize);
 						switch ($thisfile_riff_audio['codec_name']) {
 							case 'NONE':
 								$thisfile_audio['codec']    = 'Pulse Code Modulation (PCM)';
@@ -1014,11 +1014,11 @@ 
 						}
 					}
 
-					$thisfile_audio['channels']        = $thisfile_riff_audio['channels'];
+					$thisfile_audio['channels'] = $thisfile_riff_audio['channels'];
 					if ($thisfile_riff_audio['bits_per_sample'] > 0) {
 						$thisfile_audio['bits_per_sample'] = $thisfile_riff_audio['bits_per_sample'];
 					}
-					$thisfile_audio['sample_rate']     = $thisfile_riff_audio['sample_rate'];
+					$thisfile_audio['sample_rate'] = $thisfile_riff_audio['sample_rate'];
 					if ($thisfile_audio['sample_rate'] == 0) {
 						$info['error'][] = 'Corrupted AIFF file: sample_rate == zero';
 						return false;
@@ -1028,7 +1028,7 @@ 
 
 				if (isset($thisfile_riff[$RIFFsubtype]['COMT'])) {
 					$offset = 0;
-					$CommentCount                                   = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
+					$CommentCount = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
 					$offset += 2;
 					for ($i = 0; $i < $CommentCount; $i++) {
 						$info['comments_raw'][$i]['timestamp']      = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 4), false);
@@ -1037,7 +1037,7 @@ 
 						$offset += 2;
 						$CommentLength                              = getid3_lib::BigEndian2Int(substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, 2), false);
 						$offset += 2;
-						$info['comments_raw'][$i]['comment']        =                           substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, $CommentLength);
+						$info['comments_raw'][$i]['comment']        = substr($thisfile_riff[$RIFFsubtype]['COMT'][0]['data'], $offset, $CommentLength);
 						$offset += $CommentLength;
 
 						$info['comments_raw'][$i]['timestamp_unix'] = getid3_lib::DateMac2Unix($info['comments_raw'][$i]['timestamp']);
@@ -1088,12 +1088,12 @@ 
 					// shortcut
 					$thisfile_riff_RIFFsubtype_VHDR_0 = &$thisfile_riff[$RIFFsubtype]['VHDR'][0];
 
-					$thisfile_riff_RIFFsubtype_VHDR_0['oneShotHiSamples']  =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'],  0, 4));
-					$thisfile_riff_RIFFsubtype_VHDR_0['repeatHiSamples']   =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'],  4, 4));
-					$thisfile_riff_RIFFsubtype_VHDR_0['samplesPerHiCycle'] =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'],  8, 4));
-					$thisfile_riff_RIFFsubtype_VHDR_0['samplesPerSec']     =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 12, 2));
-					$thisfile_riff_RIFFsubtype_VHDR_0['ctOctave']          =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 14, 1));
-					$thisfile_riff_RIFFsubtype_VHDR_0['sCompression']      =   getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 15, 1));
+					$thisfile_riff_RIFFsubtype_VHDR_0['oneShotHiSamples']  = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 0, 4));
+					$thisfile_riff_RIFFsubtype_VHDR_0['repeatHiSamples']   = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 4, 4));
+					$thisfile_riff_RIFFsubtype_VHDR_0['samplesPerHiCycle'] = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 8, 4));
+					$thisfile_riff_RIFFsubtype_VHDR_0['samplesPerSec']     = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 12, 2));
+					$thisfile_riff_RIFFsubtype_VHDR_0['ctOctave']          = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 14, 1));
+					$thisfile_riff_RIFFsubtype_VHDR_0['sCompression']      = getid3_lib::BigEndian2Int(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 15, 1));
 					$thisfile_riff_RIFFsubtype_VHDR_0['Volume']            = getid3_lib::FixedPoint16_16(substr($thisfile_riff_RIFFsubtype_VHDR_0['data'], 16, 4));
 
 					$thisfile_audio['sample_rate'] = $thisfile_riff_RIFFsubtype_VHDR_0['samplesPerSec'];
@@ -1144,7 +1144,7 @@ 
 				}
 
 				$thisfile_audio['bitrate'] = $thisfile_audio['sample_rate'] * $ActualBitsPerSample * $thisfile_audio['channels'];
-				if (!empty($thisfile_audio['bitrate'])) {
+				if ( ! empty($thisfile_audio['bitrate'])) {
 					$info['playtime_seconds'] = ($info['avdataend'] - $info['avdataoffset']) / ($thisfile_audio['bitrate'] / 8);
 				}
 				break;
@@ -1153,7 +1153,7 @@ 
 				$info['fileformat'] = 'vcd'; // Asume Video CD
 				$info['mime_type']  = 'video/mpeg';
 
-				if (!empty($thisfile_riff['CDXA']['data'][0]['size'])) {
+				if ( ! empty($thisfile_riff['CDXA']['data'][0]['size'])) {
 					getid3_lib::IncludeDependency(GETID3_INCLUDEPATH.'module.audio-video.mpeg.php', __FILE__, true);
 
 					$getid3_temp = new getID3();
@@ -1183,7 +1183,7 @@ 
 				$ID3v2_key_good = 'id3 ';
 				$ID3v2_keys_bad = array('ID3 ', 'tag ');
 				foreach ($ID3v2_keys_bad as $ID3v2_key_bad) {
-					if (isset($thisfile_riff[$RIFFsubtype][$ID3v2_key_bad]) && !array_key_exists($ID3v2_key_good, $thisfile_riff[$RIFFsubtype])) {
+					if (isset($thisfile_riff[$RIFFsubtype][$ID3v2_key_bad]) && ! array_key_exists($ID3v2_key_good, $thisfile_riff[$RIFFsubtype])) {
 						$thisfile_riff[$RIFFsubtype][$ID3v2_key_good] = $thisfile_riff[$RIFFsubtype][$ID3v2_key_bad];
 						$info['warning'][] = 'mapping "'.$ID3v2_key_bad.'" chunk to "'.$ID3v2_key_good.'"';
 					}
@@ -1214,11 +1214,11 @@ 
 			self::parseComments($thisfile_riff['AVI ']['INFO'], $thisfile_riff['comments']);
 		}
 
-		if (empty($thisfile_audio['encoder']) && !empty($info['mpeg']['audio']['LAME']['short_version'])) {
+		if (empty($thisfile_audio['encoder']) && ! empty($info['mpeg']['audio']['LAME']['short_version'])) {
 			$thisfile_audio['encoder'] = $info['mpeg']['audio']['LAME']['short_version'];
 		}
 
-		if (!isset($info['playtime_seconds'])) {
+		if ( ! isset($info['playtime_seconds'])) {
 			$info['playtime_seconds'] = 0;
 		}
 		if (isset($thisfile_riff_raw['strh'][0]['dwLength']) && isset($thisfile_riff_raw['avih']['dwMicroSecPerFrame'])) {
@@ -1231,19 +1231,19 @@ 
 		if ($info['playtime_seconds'] > 0) {
 			if (isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
 
-				if (!isset($info['bitrate'])) {
+				if ( ! isset($info['bitrate'])) {
 					$info['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
 				}
 
-			} elseif (isset($thisfile_riff_audio) && !isset($thisfile_riff_video)) {
+			} elseif (isset($thisfile_riff_audio) && ! isset($thisfile_riff_video)) {
 
-				if (!isset($thisfile_audio['bitrate'])) {
+				if ( ! isset($thisfile_audio['bitrate'])) {
 					$thisfile_audio['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
 				}
 
-			} elseif (!isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
+			} elseif ( ! isset($thisfile_riff_audio) && isset($thisfile_riff_video)) {
 
-				if (!isset($thisfile_video['bitrate'])) {
+				if ( ! isset($thisfile_video['bitrate'])) {
 					$thisfile_video['bitrate'] = ((($info['avdataend'] - $info['avdataoffset']) / $info['playtime_seconds']) * 8);
 				}
 
@@ -1274,10 +1274,10 @@ 
 			$thisfile_audio['channels']     = $info['mpeg']['audio']['channels'];
 			$thisfile_audio['bitrate']      = $info['mpeg']['audio']['bitrate'];
 			$thisfile_audio['bitrate_mode'] = strtolower($info['mpeg']['audio']['bitrate_mode']);
-			if (!empty($info['mpeg']['audio']['codec'])) {
+			if ( ! empty($info['mpeg']['audio']['codec'])) {
 				$thisfile_audio['codec'] = $info['mpeg']['audio']['codec'].' '.$thisfile_audio['codec'];
 			}
-			if (!empty($thisfile_audio['streams'])) {
+			if ( ! empty($thisfile_audio['streams'])) {
 				foreach ($thisfile_audio['streams'] as $streamnumber => $streamdata) {
 					if ($streamdata['dataformat'] == $thisfile_audio_dataformat) {
 						$thisfile_audio['streams'][$streamnumber]['sample_rate']  = $thisfile_audio['sample_rate'];
@@ -1294,7 +1294,7 @@ 
 		}
 
 
-		if (!empty($thisfile_riff_raw['fmt ']['wBitsPerSample']) && ($thisfile_riff_raw['fmt ']['wBitsPerSample'] > 0)) {
+		if ( ! empty($thisfile_riff_raw['fmt ']['wBitsPerSample']) && ($thisfile_riff_raw['fmt ']['wBitsPerSample'] > 0)) {
 			switch ($thisfile_audio_dataformat) {
 				case 'ac3':
 					// ignore bits_per_sample
@@ -1347,23 +1347,23 @@ 
 			$this->fseek($startoffset);
 			$maxoffset = min($maxoffset, $info['avdataend']);
 			$AMVheader = $this->fread(284);
-			if (substr($AMVheader,   0,  8) != 'hdrlamvh') {
-				throw new Exception('expecting "hdrlamv" at offset '.($startoffset +   0).', found "'.substr($AMVheader,   0, 8).'"');
+			if (substr($AMVheader, 0, 8) != 'hdrlamvh') {
+				throw new Exception('expecting "hdrlamv" at offset '.($startoffset + 0).', found "'.substr($AMVheader, 0, 8).'"');
 			}
-			if (substr($AMVheader,   8,  4) != "\x38\x00\x00\x00") { // "amvh" chunk size, hardcoded to 0x38 = 56 bytes
-				throw new Exception('expecting "0x38000000" at offset '.($startoffset +   8).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader,   8, 4)).'"');
+			if (substr($AMVheader, 8, 4) != "\x38\x00\x00\x00") { // "amvh" chunk size, hardcoded to 0x38 = 56 bytes
+				throw new Exception('expecting "0x38000000" at offset '.($startoffset + 8).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 8, 4)).'"');
 			}
 			$RIFFchunk = array();
-			$RIFFchunk['amvh']['us_per_frame']   = getid3_lib::LittleEndian2Int(substr($AMVheader,  12,  4));
-			$RIFFchunk['amvh']['reserved28']     =                              substr($AMVheader,  16, 28);  // null? reserved?
-			$RIFFchunk['amvh']['resolution_x']   = getid3_lib::LittleEndian2Int(substr($AMVheader,  44,  4));
-			$RIFFchunk['amvh']['resolution_y']   = getid3_lib::LittleEndian2Int(substr($AMVheader,  48,  4));
-			$RIFFchunk['amvh']['frame_rate_int'] = getid3_lib::LittleEndian2Int(substr($AMVheader,  52,  4));
-			$RIFFchunk['amvh']['reserved0']      = getid3_lib::LittleEndian2Int(substr($AMVheader,  56,  4)); // 1? reserved?
-			$RIFFchunk['amvh']['reserved1']      = getid3_lib::LittleEndian2Int(substr($AMVheader,  60,  4)); // 0? reserved?
-			$RIFFchunk['amvh']['runtime_sec']    = getid3_lib::LittleEndian2Int(substr($AMVheader,  64,  1));
-			$RIFFchunk['amvh']['runtime_min']    = getid3_lib::LittleEndian2Int(substr($AMVheader,  65,  1));
-			$RIFFchunk['amvh']['runtime_hrs']    = getid3_lib::LittleEndian2Int(substr($AMVheader,  66,  2));
+			$RIFFchunk['amvh']['us_per_frame']   = getid3_lib::LittleEndian2Int(substr($AMVheader, 12, 4));
+			$RIFFchunk['amvh']['reserved28']     = substr($AMVheader, 16, 28); // null? reserved?
+			$RIFFchunk['amvh']['resolution_x']   = getid3_lib::LittleEndian2Int(substr($AMVheader, 44, 4));
+			$RIFFchunk['amvh']['resolution_y']   = getid3_lib::LittleEndian2Int(substr($AMVheader, 48, 4));
+			$RIFFchunk['amvh']['frame_rate_int'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 52, 4));
+			$RIFFchunk['amvh']['reserved0']      = getid3_lib::LittleEndian2Int(substr($AMVheader, 56, 4)); // 1? reserved?
+			$RIFFchunk['amvh']['reserved1']      = getid3_lib::LittleEndian2Int(substr($AMVheader, 60, 4)); // 0? reserved?
+			$RIFFchunk['amvh']['runtime_sec']    = getid3_lib::LittleEndian2Int(substr($AMVheader, 64, 1));
+			$RIFFchunk['amvh']['runtime_min']    = getid3_lib::LittleEndian2Int(substr($AMVheader, 65, 1));
+			$RIFFchunk['amvh']['runtime_hrs']    = getid3_lib::LittleEndian2Int(substr($AMVheader, 66, 2));
 
 			$info['video']['frame_rate']   = 1000000 / $RIFFchunk['amvh']['us_per_frame'];
 			$info['video']['resolution_x'] = $RIFFchunk['amvh']['resolution_x'];
@@ -1372,12 +1372,12 @@ 
 
 			// the rest is all hardcoded(?) and does not appear to be useful until you get to audio info at offset 256, even then everything is probably hardcoded
 
-			if (substr($AMVheader,  68, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x38\x00\x00\x00") {
-				throw new Exception('expecting "LIST<0x00000000>strlstrh<0x38000000>" at offset '.($startoffset +  68).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader,  68, 20)).'"');
+			if (substr($AMVheader, 68, 20) != 'LIST'."\x00\x00\x00\x00".'strlstrh'."\x38\x00\x00\x00") {
+				throw new Exception('expecting "LIST<0x00000000>strlstrh<0x38000000>" at offset '.($startoffset + 68).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 68, 20)).'"');
 			}
 			// followed by 56 bytes of null: substr($AMVheader,  88, 56) -> 144
-			if (substr($AMVheader, 144,  8) != 'strf'."\x24\x00\x00\x00") {
-				throw new Exception('expecting "strf<0x24000000>" at offset '.($startoffset + 144).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 144,  8)).'"');
+			if (substr($AMVheader, 144, 8) != 'strf'."\x24\x00\x00\x00") {
+				throw new Exception('expecting "strf<0x24000000>" at offset '.($startoffset + 144).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 144, 8)).'"');
 			}
 			// followed by 36 bytes of null: substr($AMVheader, 144, 36) -> 180
 
@@ -1385,8 +1385,8 @@ 
 				throw new Exception('expecting "LIST<0x00000000>strlstrh<0x30000000>" at offset '.($startoffset + 188).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 188, 20)).'"');
 			}
 			// followed by 48 bytes of null: substr($AMVheader, 208, 48) -> 256
-			if (substr($AMVheader, 256,  8) != 'strf'."\x14\x00\x00\x00") {
-				throw new Exception('expecting "strf<0x14000000>" at offset '.($startoffset + 256).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 256,  8)).'"');
+			if (substr($AMVheader, 256, 8) != 'strf'."\x14\x00\x00\x00") {
+				throw new Exception('expecting "strf<0x14000000>" at offset '.($startoffset + 256).', found "'.getid3_lib::PrintHexBytes(substr($AMVheader, 256, 8)).'"');
 			}
 			// followed by 20 bytes of a modified WAVEFORMATEX:
 			// typedef struct {
@@ -1399,14 +1399,14 @@ 
 			// WORD cbSize;           //(Fixme: this seems to be 0 in AMV files)
 			// WORD reserved;
 			// } WAVEFORMATEX;
-			$RIFFchunk['strf']['wformattag']      = getid3_lib::LittleEndian2Int(substr($AMVheader,  264,  2));
-			$RIFFchunk['strf']['nchannels']       = getid3_lib::LittleEndian2Int(substr($AMVheader,  266,  2));
-			$RIFFchunk['strf']['nsamplespersec']  = getid3_lib::LittleEndian2Int(substr($AMVheader,  268,  4));
-			$RIFFchunk['strf']['navgbytespersec'] = getid3_lib::LittleEndian2Int(substr($AMVheader,  272,  4));
-			$RIFFchunk['strf']['nblockalign']     = getid3_lib::LittleEndian2Int(substr($AMVheader,  276,  2));
-			$RIFFchunk['strf']['wbitspersample']  = getid3_lib::LittleEndian2Int(substr($AMVheader,  278,  2));
-			$RIFFchunk['strf']['cbsize']          = getid3_lib::LittleEndian2Int(substr($AMVheader,  280,  2));
-			$RIFFchunk['strf']['reserved']        = getid3_lib::LittleEndian2Int(substr($AMVheader,  282,  2));
+			$RIFFchunk['strf']['wformattag']      = getid3_lib::LittleEndian2Int(substr($AMVheader, 264, 2));
+			$RIFFchunk['strf']['nchannels']       = getid3_lib::LittleEndian2Int(substr($AMVheader, 266, 2));
+			$RIFFchunk['strf']['nsamplespersec']  = getid3_lib::LittleEndian2Int(substr($AMVheader, 268, 4));
+			$RIFFchunk['strf']['navgbytespersec'] = getid3_lib::LittleEndian2Int(substr($AMVheader, 272, 4));
+			$RIFFchunk['strf']['nblockalign']     = getid3_lib::LittleEndian2Int(substr($AMVheader, 276, 2));
+			$RIFFchunk['strf']['wbitspersample']  = getid3_lib::LittleEndian2Int(substr($AMVheader, 278, 2));
+			$RIFFchunk['strf']['cbsize']          = getid3_lib::LittleEndian2Int(substr($AMVheader, 280, 2));
+			$RIFFchunk['strf']['reserved']        = getid3_lib::LittleEndian2Int(substr($AMVheader, 282, 2));
 
 
 			$info['audio']['lossless']        = false;
@@ -1441,8 +1441,8 @@ 
 			while ($this->ftell() < $maxoffset) {
 				$chunknamesize = $this->fread(8);
 				//$chunkname =                          substr($chunknamesize, 0, 4);
-				$chunkname = str_replace("\x00", '_', substr($chunknamesize, 0, 4));  // note: chunk names of 4 null bytes do appear to be legal (has been observed inside INFO and PRMI chunks, for example), but makes traversing array keys more difficult
-				$chunksize =  $this->EitherEndian2Int(substr($chunknamesize, 4, 4));
+				$chunkname = str_replace("\x00", '_', substr($chunknamesize, 0, 4)); // note: chunk names of 4 null bytes do appear to be legal (has been observed inside INFO and PRMI chunks, for example), but makes traversing array keys more difficult
+				$chunksize = $this->EitherEndian2Int(substr($chunknamesize, 4, 4));
 				//if (strlen(trim($chunkname, "\x00")) < 4) {
 				if (strlen($chunkname) < 4) {
 					$this->error('Expecting chunk name at offset '.($this->ftell() - 8).' but found nothing. Aborting RIFF parsing.');
@@ -1464,11 +1464,11 @@ 
 							$RIFFchunk[$listname]['offset'] = $this->ftell() - 4;
 							$RIFFchunk[$listname]['size']   = $chunksize;
 
-							if (!$FoundAllChunksWeNeed) {
+							if ( ! $FoundAllChunksWeNeed) {
 								$WhereWeWere      = $this->ftell();
 								$AudioChunkHeader = $this->fread(12);
-								$AudioChunkStreamNum  =                              substr($AudioChunkHeader, 0, 2);
-								$AudioChunkStreamType =                              substr($AudioChunkHeader, 2, 2);
+								$AudioChunkStreamNum  = substr($AudioChunkHeader, 0, 2);
+								$AudioChunkStreamType = substr($AudioChunkHeader, 2, 2);
 								$AudioChunkSize       = getid3_lib::LittleEndian2Int(substr($AudioChunkHeader, 4, 4));
 
 								if ($AudioChunkStreamType == 'wb') {
@@ -1507,7 +1507,7 @@ 
 										if (empty($getid3_temp->info['error'])) {
 											$info['audio']   = $getid3_temp->info['audio'];
 											$info['ac3']     = $getid3_temp->info['ac3'];
-											if (!empty($getid3_temp->info['warning'])) {
+											if ( ! empty($getid3_temp->info['warning'])) {
 												foreach ($getid3_temp->info['warning'] as $key => $value) {
 													$info['warning'][] = $value;
 												}
@@ -1523,7 +1523,7 @@ 
 
 						} else {
 
-							if (!isset($RIFFchunk[$listname])) {
+							if ( ! isset($RIFFchunk[$listname])) {
 								$RIFFchunk[$listname] = array();
 							}
 							$LISTchunkParent    = $listname;
@@ -1599,7 +1599,7 @@ 
 									if (empty($getid3_temp->info['error'])) {
 										$info['audio'] = $getid3_temp->info['audio'];
 										$info['ac3']   = $getid3_temp->info['ac3'];
-										if (!empty($getid3_temp->info['warning'])) {
+										if ( ! empty($getid3_temp->info['warning'])) {
 											foreach ($getid3_temp->info['warning'] as $newerror) {
 												$this->warning('getid3_ac3() says: ['.$newerror.']');
 											}
@@ -1619,7 +1619,7 @@ 
 										$info['audio']            = $getid3_temp->info['audio'];
 										$info['dts']              = $getid3_temp->info['dts'];
 										$info['playtime_seconds'] = $getid3_temp->info['playtime_seconds']; // may not match RIFF calculations since DTS-WAV often used 14/16 bit-word packing
-										if (!empty($getid3_temp->info['warning'])) {
+										if ( ! empty($getid3_temp->info['warning'])) {
 											foreach ($getid3_temp->info['warning'] as $newerror) {
 												$this->warning('getid3_dts() says: ['.$newerror.']');
 											}
@@ -1680,7 +1680,7 @@ 
 							//	break;
 
 							default:
-								if (!empty($LISTchunkParent) && (($RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size']) <= $LISTchunkMaxOffset)) {
+								if ( ! empty($LISTchunkParent) && (($RIFFchunk[$chunkname][$thisindex]['offset'] + $RIFFchunk[$chunkname][$thisindex]['size']) <= $LISTchunkMaxOffset)) {
 									$RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['offset'] = $RIFFchunk[$chunkname][$thisindex]['offset'];
 									$RIFFchunk[$LISTchunkParent][$chunkname][$thisindex]['size']   = $RIFFchunk[$chunkname][$thisindex]['size'];
 									unset($RIFFchunk[$chunkname][$thisindex]['offset']);
@@ -1800,7 +1800,7 @@ 
 				foreach ($RIFFinfoArray[$key] as $commentid => $commentdata) {
 					if (trim($commentdata['data']) != '') {
 						if (isset($CommentsTargetArray[$value])) {
-							$CommentsTargetArray[$value][] =     trim($commentdata['data']);
+							$CommentsTargetArray[$value][] = trim($commentdata['data']);
 						} else {
 							$CommentsTargetArray[$value] = array(trim($commentdata['data']));
 						}
@@ -1816,14 +1816,14 @@ 
 		$WaveFormatEx['raw'] = array();
 		$WaveFormatEx_raw    = &$WaveFormatEx['raw'];
 
-		$WaveFormatEx_raw['wFormatTag']      = substr($WaveFormatExData,  0, 2);
-		$WaveFormatEx_raw['nChannels']       = substr($WaveFormatExData,  2, 2);
-		$WaveFormatEx_raw['nSamplesPerSec']  = substr($WaveFormatExData,  4, 4);
-		$WaveFormatEx_raw['nAvgBytesPerSec'] = substr($WaveFormatExData,  8, 4);
+		$WaveFormatEx_raw['wFormatTag']      = substr($WaveFormatExData, 0, 2);
+		$WaveFormatEx_raw['nChannels']       = substr($WaveFormatExData, 2, 2);
+		$WaveFormatEx_raw['nSamplesPerSec']  = substr($WaveFormatExData, 4, 4);
+		$WaveFormatEx_raw['nAvgBytesPerSec'] = substr($WaveFormatExData, 8, 4);
 		$WaveFormatEx_raw['nBlockAlign']     = substr($WaveFormatExData, 12, 2);
 		$WaveFormatEx_raw['wBitsPerSample']  = substr($WaveFormatExData, 14, 2);
 		if (strlen($WaveFormatExData) > 16) {
-			$WaveFormatEx_raw['cbSize']      = substr($WaveFormatExData, 16, 2);
+			$WaveFormatEx_raw['cbSize'] = substr($WaveFormatExData, 16, 2);
 		}
 		$WaveFormatEx_raw = array_map('getid3_lib::LittleEndian2Int', $WaveFormatEx_raw);
 
@@ -1852,20 +1852,20 @@ 
 		$info['wavpack']  = array();
 		$thisfile_wavpack = &$info['wavpack'];
 
-		$thisfile_wavpack['version']           = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  0, 2));
+		$thisfile_wavpack['version'] = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 0, 2));
 		if ($thisfile_wavpack['version'] >= 2) {
-			$thisfile_wavpack['bits']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  2, 2));
+			$thisfile_wavpack['bits']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 2, 2));
 		}
 		if ($thisfile_wavpack['version'] >= 3) {
-			$thisfile_wavpack['flags_raw']     = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  4, 2));
-			$thisfile_wavpack['shift']         = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  6, 2));
-			$thisfile_wavpack['total_samples'] = getid3_lib::LittleEndian2Int(substr($WavPackChunkData,  8, 4));
+			$thisfile_wavpack['flags_raw']     = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 4, 2));
+			$thisfile_wavpack['shift']         = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 6, 2));
+			$thisfile_wavpack['total_samples'] = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 8, 4));
 			$thisfile_wavpack['crc1']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 12, 4));
 			$thisfile_wavpack['crc2']          = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 16, 4));
-			$thisfile_wavpack['extension']     =                              substr($WavPackChunkData, 20, 4);
+			$thisfile_wavpack['extension']     = substr($WavPackChunkData, 20, 4);
 			$thisfile_wavpack['extra_bc']      = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 24, 1));
 			for ($i = 0; $i <= 2; $i++) {
-				$thisfile_wavpack['extras'][]  = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 25 + $i, 1));
+				$thisfile_wavpack['extras'][] = getid3_lib::LittleEndian2Int(substr($WavPackChunkData, 25 + $i, 1));
 			}
 
 			// shortcut
@@ -1897,11 +1897,11 @@ 
 		return true;
 	}
 
-	public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian=true) {
+	public static function ParseBITMAPINFOHEADER($BITMAPINFOHEADER, $littleEndian = true) {
 
-		$parsed['biSize']          = substr($BITMAPINFOHEADER,  0, 4); // number of bytes required by the BITMAPINFOHEADER structure
-		$parsed['biWidth']         = substr($BITMAPINFOHEADER,  4, 4); // width of the bitmap in pixels
-		$parsed['biHeight']        = substr($BITMAPINFOHEADER,  8, 4); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
+		$parsed['biSize']          = substr($BITMAPINFOHEADER, 0, 4); // number of bytes required by the BITMAPINFOHEADER structure
+		$parsed['biWidth']         = substr($BITMAPINFOHEADER, 4, 4); // width of the bitmap in pixels
+		$parsed['biHeight']        = substr($BITMAPINFOHEADER, 8, 4); // height of the bitmap in pixels. If biHeight is positive, the bitmap is a 'bottom-up' DIB and its origin is the lower left corner. If biHeight is negative, the bitmap is a 'top-down' DIB and its origin is the upper left corner
 		$parsed['biPlanes']        = substr($BITMAPINFOHEADER, 12, 2); // number of color planes on the target device. In most cases this value must be set to 1
 		$parsed['biBitCount']      = substr($BITMAPINFOHEADER, 14, 2); // Specifies the number of bits per pixels
 		$parsed['biSizeImage']     = substr($BITMAPINFOHEADER, 20, 4); // size of the bitmap data section of the image (the actual pixel data, excluding BITMAPINFOHEADER and RGBQUAD structures)
@@ -1911,12 +1911,12 @@ 
 		$parsed['biClrImportant']  = substr($BITMAPINFOHEADER, 36, 4); // number of color indices that are considered important for displaying the bitmap. If this value is zero, all colors are important
 		$parsed = array_map('getid3_lib::'.($littleEndian ? 'Little' : 'Big').'Endian2Int', $parsed);
 
-		$parsed['fourcc']          = substr($BITMAPINFOHEADER, 16, 4);  // compression identifier
+		$parsed['fourcc']          = substr($BITMAPINFOHEADER, 16, 4); // compression identifier
 
 		return $parsed;
 	}
 
-	public static function ParseDIVXTAG($DIVXTAG, $raw=false) {
+	public static function ParseDIVXTAG($DIVXTAG, $raw = false) {
 		// structure from "IDivX" source, Form1.frm, by "Greg Frazier of Daemonic Software Group", email: gfrazier@icestorm.net, web: http://dsg.cjb.net/
 		// source available at http://files.divx-digest.com/download/c663efe7ef8ad2e90bf4af4d3ea6188a/on0SWN2r/edit/IDivX.zip
 		// 'Byte Layout:                   '1111111111111111
@@ -1929,7 +1929,7 @@ 
 		// '5  for Future Additions - 0    '333400000DIVXTAG
 		// '128 bytes total
 
-		static $DIVXTAGgenre  = array(
+		static $DIVXTAGgenre = array(
 			 0 => 'Action',
 			 1 => 'Action/Adventure',
 			 2 => 'Adventure',
@@ -1962,22 +1962,22 @@ 
 			 5 => 'NC-17',
 		);
 
-		$parsed['title']     =        trim(substr($DIVXTAG,   0, 32));
-		$parsed['artist']    =        trim(substr($DIVXTAG,  32, 28));
-		$parsed['year']      = intval(trim(substr($DIVXTAG,  60,  4)));
-		$parsed['comment']   =        trim(substr($DIVXTAG,  64, 48));
-		$parsed['genre_id']  = intval(trim(substr($DIVXTAG, 112,  3)));
-		$parsed['rating_id'] =         ord(substr($DIVXTAG, 115,  1));
+		$parsed['title']     = trim(substr($DIVXTAG, 0, 32));
+		$parsed['artist']    = trim(substr($DIVXTAG, 32, 28));
+		$parsed['year']      = intval(trim(substr($DIVXTAG, 60, 4)));
+		$parsed['comment']   = trim(substr($DIVXTAG, 64, 48));
+		$parsed['genre_id']  = intval(trim(substr($DIVXTAG, 112, 3)));
+		$parsed['rating_id'] = ord(substr($DIVXTAG, 115, 1));
 		//$parsed['padding'] =             substr($DIVXTAG, 116,  5);  // 5-byte null
 		//$parsed['magic']   =             substr($DIVXTAG, 121,  7);  // "DIVXTAG"
 
-		$parsed['genre']  = (isset($DIVXTAGgenre[$parsed['genre_id']])   ? $DIVXTAGgenre[$parsed['genre_id']]   : $parsed['genre_id']);
+		$parsed['genre']  = (isset($DIVXTAGgenre[$parsed['genre_id']]) ? $DIVXTAGgenre[$parsed['genre_id']] : $parsed['genre_id']);
 		$parsed['rating'] = (isset($DIVXTAGrating[$parsed['rating_id']]) ? $DIVXTAGrating[$parsed['rating_id']] : $parsed['rating_id']);
 
-		if (!$raw) {
+		if ( ! $raw) {
 			unset($parsed['genre_id'], $parsed['rating_id']);
 			foreach ($parsed as $key => $value) {
-				if (!$value === '') {
+				if ( ! $value === '') {
 					unset($parsed['key']);
 				}
 			}
@@ -2576,7 +2576,7 @@ 
 		return getid3_lib::EmbeddedLookup($fourcc, $begin, __LINE__, __FILE__, 'riff-fourcc');
 	}
 
-	private function EitherEndian2Int($byteword, $signed=false) {
+	private function EitherEndian2Int($byteword, $signed = false) {
 		if ($this->container == 'riff') {
 			return getid3_lib::LittleEndian2Int($byteword, $signed);
 		}

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

Doc Comments +6 added lines

@@ -234,6 +234,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param integer $length
+	 */
 	private function readHeaderBSI($length) {
 		$data = substr($this->AC3header['bsi'], $this->BSIoffset, $length);
 		$this->BSIoffset += $length;
@@ -323,6 +326,9 @@ 
 		return (isset($dolbySurroundModeLookup[$dsurmod]) ? $dolbySurroundModeLookup[$dsurmod] : false);
 	}
 
+	/**
+	 * @param boolean $lfeon
+	 */
 	public static function channelsEnabledLookup($acmod, $lfeon) {
 		$lookup = array(
 			'ch1'=>(bool) ($acmod == 0),

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@ 
 
 class getid3_ac3 extends getid3_handler
 {
-    private $AC3header = array();
-    private $BSIoffset = 0;
+	private $AC3header = array();
+	private $BSIoffset = 0;
 
-    const syncword = "\x0B\x77";
+	const syncword = "\x0B\x77";
 
 	public function Analyze() {
 		$info = &$this->getid3->info;
@@ -96,7 +96,7 @@ 
 			// If this standard is extended by the addition of additional elements or features, a value of bsid greater than 8 will be used.
 			// Decoders built to this version of the standard will not be able to decode versions with bsid greater than 8.
 			$this->error('Bit stream identification is version '.$thisfile_ac3_raw_bsi['bsid'].', but getID3() only understands up to version 8');
-		    unset($info['ac3']);
+			unset($info['ac3']);
 			return false;
 		}
 

Spacing +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
 			$thisfile_ac3_raw['synchinfo']['synchword'] = self::syncword;
 			$offset = 2;
 		} else {
-			if (!$this->isDependencyFor('matroska')) {
+			if ( ! $this->isDependencyFor('matroska')) {
 				unset($info['fileformat'], $info['ac3']);
 				return $this->error('Expecting "'.getid3_lib::PrintHexBytes(self::syncword).'" at offset '.$info['avdataoffset'].', found "'.getid3_lib::PrintHexBytes(substr($this->AC3header['syncinfo'], 0, 2)).'"');
 			}
@@ -105,7 +105,7 @@ 
 
 		$thisfile_ac3['service_type'] = self::serviceTypeLookup($thisfile_ac3_raw_bsi['bsmod'], $thisfile_ac3_raw_bsi['acmod']);
 		$ac3_coding_mode = self::audioCodingModeLookup($thisfile_ac3_raw_bsi['acmod']);
-		foreach($ac3_coding_mode as $key => $value) {
+		foreach ($ac3_coding_mode as $key => $value) {
 			$thisfile_ac3[$key] = $value;
 		}
 		switch ($thisfile_ac3_raw_bsi['acmod']) {
@@ -264,7 +264,7 @@ 
 				$serviceTypeLookup[6][$i] = 'associated service: emergency (E)';
 			}
 
-			$serviceTypeLookup[7][1]      = 'associated service: voice over (VO)';
+			$serviceTypeLookup[7][1] = 'associated service: voice over (VO)';
 			for ($i = 2; $i <= 7; $i++) {
 				$serviceTypeLookup[7][$i] = 'main audio service: karaoke';
 			}
@@ -274,7 +274,7 @@ 
 
 	public static function audioCodingModeLookup($acmod) {
 		// array(channel configuration, # channels (not incl LFE), channel order)
-		static $audioCodingModeLookup = array (
+		static $audioCodingModeLookup = array(
 			0 => array('channel_config'=>'1+1', 'num_channels'=>2, 'channel_order'=>'Ch1,Ch2'),
 			1 => array('channel_config'=>'1/0', 'num_channels'=>1, 'channel_order'=>'C'),
 			2 => array('channel_config'=>'2/0', 'num_channels'=>2, 'channel_order'=>'L,R'),
@@ -337,7 +337,7 @@ 
 		switch ($acmod) {
 			case 4:
 			case 5:
-				$lookup['surround_mono']  = true;
+				$lookup['surround_mono'] = true;
 				break;
 			case 6:
 			case 7:
@@ -410,11 +410,11 @@ 
 
 	public static function frameSizeLookup($frmsizecod, $fscod) {
 		$padding     = (bool) ($frmsizecod % 2);
-		$framesizeid =   floor($frmsizecod / 2);
+		$framesizeid = floor($frmsizecod / 2);
 
 		static $frameSizeLookup = array();
 		if (empty($frameSizeLookup)) {
-			$frameSizeLookup = array (
+			$frameSizeLookup = array(
 				0  => array(128, 138, 192),
 				1  => array(40, 160, 174, 240),
 				2  => array(48, 192, 208, 288),
@@ -444,7 +444,7 @@ 
 	}
 
 	public static function bitrateLookup($frmsizecod) {
-		$framesizeid =   floor($frmsizecod / 2);
+		$framesizeid = floor($frmsizecod / 2);
 
 		static $bitrateLookup = array(
 			0  => 32000,