futtta / autoptimize

config/default.php

Indentation +42 added lines, -42 removed lines

@@ -2,9 +2,9 @@ 
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,30 +15,30 @@ 
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') &&
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
 {
-	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
-	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
+    $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
+    $code = file_get_contents(__FILE__.'.none');
+    $contents = gzencode($code,9,$flag);
 }else{
-	//Get data
-	$contents = file_get_contents(__FILE__.'.'.$encoding);
+    //Get data
+    $contents = file_get_contents(__FILE__.'.'.$encoding);
 }
 
 // first check if we have to send 304
@@ -52,36 +52,36 @@ 
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
-	if ($encoding != 'none') {
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    // send all sorts of headers
+    $expireTime=60*60*24*355; // 1y max according to RFC
+    if ($encoding != 'none') {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 
-	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
-	{
-		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+    //And write to filesystem cache if not done yet
+    if($encoding != 'none' && $iscompressed == false)
+    {
+        //Write the content we sent
+        file_put_contents(__FILE__.'.'.$encoding,$contents);
 
-		//And write the new content
-		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
-		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
-	}
+        //And write the new content
+        $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
+        $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
+        $contents = gzencode($code,9,$flag);
+        file_put_contents(__FILE__.'.'.$ext,$contents);
+    }
 }

classes/autoptimizeBase.php

Indentation +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
          * First element is the filepath, second is the md5 hash of contents
          * the filepath had when it was being processed.
          * If we don't have those, we'll bail out early.
-        */
+         */
         $filepath = null;
         $filehash = null;
 

classes/external/php/persist-admin-notices-dismissal/persist-admin-notices-dismissal.php

Indentation +122 added lines, -122 removed lines

@@ -29,131 +29,131 @@
  * Exit if called directly.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	die;
+    die;
 }
 
 if ( ! class_exists( 'PAnD' ) ) {
 
-	/**
-	 * Class PAnD
-	 */
-	class PAnD {
-
-		/**
-		 * Init hooks.
-		 */
-		public static function init() {
-			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
-			add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
-		}
-
-		/**
-		 * Enqueue javascript and variables.
-		 */
-		public static function load_script() {
-
-			if ( is_customize_preview() ) {
-				return;
-			}
-
-			wp_enqueue_script(
-				'dismissible-notices',
-				plugins_url( 'dismiss-notice.js', __FILE__ ),
-				array( 'jquery', 'common' ),
-				false,
-				true
-			);
-
-			wp_localize_script(
-				'dismissible-notices',
-				'dismissible_notice',
-				array(
-					'nonce' => wp_create_nonce( 'dismissible-notice' ),
-				)
-			);
-		}
-
-		/**
-		 * Handles Ajax request to persist notices dismissal.
-		 * Uses check_ajax_referer to verify nonce.
-		 */
-		public static function dismiss_admin_notice() {
-			$option_name        = sanitize_text_field( $_POST['option_name'] );
-			$dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
-
-			if ( 'forever' != $dismissible_length ) {
-				// If $dismissible_length is not an integer default to 1
-				$dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
-				$dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
-			}
-
-			check_ajax_referer( 'dismissible-notice', 'nonce' );
-			self::set_admin_notice_cache( $option_name, $dismissible_length );
-			wp_die();
-		}
-
-		/**
-		 * Is admin notice active?
-		 *
-		 * @param string $arg data-dismissible content of notice.
-		 *
-		 * @return bool
-		 */
-		public static function is_admin_notice_active( $arg ) {
-			$array       = explode( '-', $arg );
-			$length      = array_pop( $array );
-			$option_name = implode( '-', $array );
-			$db_record   = self::get_admin_notice_cache( $option_name );
-			if ( 'forever' == $db_record ) {
-				return false;
-			} elseif ( absint( $db_record ) >= time() ) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-
-		/**
-		 * Returns admin notice cached timeout.
-		 *
-		 * @access public
-		 *
-		 * @param string|bool $id admin notice name or false.
-		 *
-		 * @return array|bool The timeout. False if expired.
-		 */
-		public static function get_admin_notice_cache( $id = false ) {
-			if ( ! $id ) {
-				return false;
-			}
-			$cache_key = 'pand-' . md5( $id );
-			$timeout   = get_site_option( $cache_key );
-			$timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
-
-			if ( empty( $timeout ) || time() > $timeout ) {
-				return false;
-			}
-
-			return $timeout;
-		}
-
-		/**
-		 * Sets admin notice timeout in site option.
-		 *
-		 * @access public
-		 *
-		 * @param string      $id       Data Identifier.
-		 * @param string|bool $timeout  Timeout for admin notice.
-		 *
-		 * @return bool
-		 */
-		public static function set_admin_notice_cache( $id, $timeout ) {
-			$cache_key = 'pand-' . md5( $id );
-			update_site_option( $cache_key, $timeout );
-
-			return true;
-		}
-
-	}
+    /**
+     * Class PAnD
+     */
+    class PAnD {
+
+        /**
+         * Init hooks.
+         */
+        public static function init() {
+            add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
+            add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
+        }
+
+        /**
+         * Enqueue javascript and variables.
+         */
+        public static function load_script() {
+
+            if ( is_customize_preview() ) {
+                return;
+            }
+
+            wp_enqueue_script(
+                'dismissible-notices',
+                plugins_url( 'dismiss-notice.js', __FILE__ ),
+                array( 'jquery', 'common' ),
+                false,
+                true
+            );
+
+            wp_localize_script(
+                'dismissible-notices',
+                'dismissible_notice',
+                array(
+                    'nonce' => wp_create_nonce( 'dismissible-notice' ),
+                )
+            );
+        }
+
+        /**
+         * Handles Ajax request to persist notices dismissal.
+         * Uses check_ajax_referer to verify nonce.
+         */
+        public static function dismiss_admin_notice() {
+            $option_name        = sanitize_text_field( $_POST['option_name'] );
+            $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
+
+            if ( 'forever' != $dismissible_length ) {
+                // If $dismissible_length is not an integer default to 1
+                $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
+                $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
+            }
+
+            check_ajax_referer( 'dismissible-notice', 'nonce' );
+            self::set_admin_notice_cache( $option_name, $dismissible_length );
+            wp_die();
+        }
+
+        /**
+         * Is admin notice active?
+         *
+         * @param string $arg data-dismissible content of notice.
+         *
+         * @return bool
+         */
+        public static function is_admin_notice_active( $arg ) {
+            $array       = explode( '-', $arg );
+            $length      = array_pop( $array );
+            $option_name = implode( '-', $array );
+            $db_record   = self::get_admin_notice_cache( $option_name );
+            if ( 'forever' == $db_record ) {
+                return false;
+            } elseif ( absint( $db_record ) >= time() ) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        /**
+         * Returns admin notice cached timeout.
+         *
+         * @access public
+         *
+         * @param string|bool $id admin notice name or false.
+         *
+         * @return array|bool The timeout. False if expired.
+         */
+        public static function get_admin_notice_cache( $id = false ) {
+            if ( ! $id ) {
+                return false;
+            }
+            $cache_key = 'pand-' . md5( $id );
+            $timeout   = get_site_option( $cache_key );
+            $timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
+
+            if ( empty( $timeout ) || time() > $timeout ) {
+                return false;
+            }
+
+            return $timeout;
+        }
+
+        /**
+         * Sets admin notice timeout in site option.
+         *
+         * @access public
+         *
+         * @param string      $id       Data Identifier.
+         * @param string|bool $timeout  Timeout for admin notice.
+         *
+         * @return bool
+         */
+        public static function set_admin_notice_cache( $id, $timeout ) {
+            $cache_key = 'pand-' . md5( $id );
+            update_site_option( $cache_key, $timeout );
+
+            return true;
+        }
+
+    }
 
 }

classes/external/php/plugin-update-checker/vendor/ParsedownLegacy.php

Indentation +3 added lines, -3 removed lines

@@ -1528,8 +1528,8 @@
         'q', 'rt', 'ins', 'font',          'strong',
         's', 'tt', 'sub', 'mark',
         'u', 'xm', 'sup', 'nobr',
-                   'var', 'ruby',
-                   'wbr', 'span',
-                          'time',
+                    'var', 'ruby',
+                    'wbr', 'span',
+                            'time',
     );
 }

classes/external/php/plugin-update-checker/vendor/Parsedown.php

Indentation +3 added lines, -3 removed lines

@@ -1531,8 +1531,8 @@
         'q', 'rt', 'ins', 'font',          'strong',
         's', 'tt', 'sub', 'mark',
         'u', 'xm', 'sup', 'nobr',
-                   'var', 'ruby',
-                   'wbr', 'span',
-                          'time',
+                    'var', 'ruby',
+                    'wbr', 'span',
+                            'time',
     );
 }
\ No newline at end of file

classes/external/php/plugin-update-checker/vendor/readme-parser.php

Indentation +318 added lines, -318 removed lines

@@ -9,325 +9,325 @@
 
 class PucReadmeParser {
 
-	function __construct() {
-		// This space intentionally blank
-	}
-
-	function parse_readme( $file ) {
-		$file_contents = @implode('', @file($file));
-		return $this->parse_readme_contents( $file_contents );
-	}
-
-	function parse_readme_contents( $file_contents ) {
-		$file_contents = str_replace(array("\r\n", "\r"), "\n", $file_contents);
-		$file_contents = trim($file_contents);
-		if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) )
-			$file_contents = substr( $file_contents, 3 );
-
-		// Markdown transformations
-		$file_contents = preg_replace( "|^###([^#]+)#*?\s*?\n|im", '=$1='."\n",     $file_contents );
-		$file_contents = preg_replace( "|^##([^#]+)#*?\s*?\n|im",  '==$1=='."\n",   $file_contents );
-		$file_contents = preg_replace( "|^#([^#]+)#*?\s*?\n|im",   '===$1==='."\n", $file_contents );
-
-		// === Plugin Name ===
-		// Must be the very first thing.
-		if ( !preg_match('|^===(.*)===|', $file_contents, $_name) )
-			return array(); // require a name
-		$name = trim($_name[1], '=');
-		$name = $this->sanitize_text( $name );
-
-		$file_contents = $this->chop_string( $file_contents, $_name[0] );
-
-
-		// Requires at least: 1.5
-		if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) )
-			$requires_at_least = $this->sanitize_text($_requires_at_least[1]);
-		else
-			$requires_at_least = NULL;
-
-
-		// Tested up to: 2.1
-		if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) )
-			$tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
-		else
-			$tested_up_to = NULL;
-
-
-		// Stable tag: 10.4-ride-the-fire-eagle-danger-day
-		if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) )
-			$stable_tag = $this->sanitize_text( $_stable_tag[1] );
-		else
-			$stable_tag = NULL; // we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
-
-
-		// Tags: some tag, another tag, we like tags
-		if ( preg_match('|Tags:(.*)|i', $file_contents, $_tags) ) {
-			$tags = preg_split('|,[\s]*?|', trim($_tags[1]));
-			foreach ( array_keys($tags) as $t )
-				$tags[$t] = $this->sanitize_text( $tags[$t] );
-		} else {
-			$tags = array();
-		}
-
-
-		// Contributors: markjaquith, mdawaffe, zefrank
-		$contributors = array();
-		if ( preg_match('|Contributors:(.*)|i', $file_contents, $_contributors) ) {
-			$temp_contributors = preg_split('|,[\s]*|', trim($_contributors[1]));
-			foreach ( array_keys($temp_contributors) as $c ) {
-				$tmp_sanitized = $this->user_sanitize( $temp_contributors[$c] );
-				if ( strlen(trim($tmp_sanitized)) > 0 )
-					$contributors[$c] = $tmp_sanitized;
-				unset($tmp_sanitized);
-			}
-		}
-
-
-		// Donate Link: URL
-		if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) )
-			$donate_link = esc_url( $_donate_link[1] );
-		else
-			$donate_link = NULL;
-
-
-		// togs, conts, etc are optional and order shouldn't matter.  So we chop them only after we've grabbed their values.
-		foreach ( array('tags', 'contributors', 'requires_at_least', 'tested_up_to', 'stable_tag', 'donate_link') as $chop ) {
-			if ( $$chop ) {
-				$_chop = '_' . $chop;
-				$file_contents = $this->chop_string( $file_contents, ${$_chop}[0] );
-			}
-		}
-
-		$file_contents = trim($file_contents);
-
-
-		// short-description fu
-		if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) )
-			$_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
-		$short_desc_filtered = $this->sanitize_text( $_short_description[2] );
-		$short_desc_length = strlen($short_desc_filtered);
-		$short_description = substr($short_desc_filtered, 0, 150);
-		if ( $short_desc_length > strlen($short_description) )
-			$truncated = true;
-		else
-			$truncated = false;
-		if ( $_short_description[1] )
-			$file_contents = $this->chop_string( $file_contents, $_short_description[1] ); // yes, the [1] is intentional
-
-		// == Section ==
-		// Break into sections
-		// $_sections[0] will be the title of the first section, $_sections[1] will be the content of the first section
-		// the array alternates from there:  title2, content2, title3, content3... and so forth
-		$_sections = preg_split('/^[\s]*==[\s]*(.+?)[\s]*==/m', $file_contents, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
-
-		$sections = array();
-		for ( $i=1; $i <= count($_sections); $i +=2 ) {
-			$_sections[$i] = preg_replace('/(^[\s]*)=[\s]+(.+?)[\s]+=/m', '$1<h4>$2</h4>', $_sections[$i]);
-			$_sections[$i] = $this->filter_text( $_sections[$i], true );
-			$title = $this->sanitize_text( $_sections[$i-1] );
-			$sections[str_replace(' ', '_', strtolower($title))] = array('title' => $title, 'content' => $_sections[$i]);
-		}
-
-
-		// Special sections
-		// This is where we nab our special sections, so we can enforce their order and treat them differently, if needed
-		// upgrade_notice is not a section, but parse it like it is for now
-		$final_sections = array();
-		foreach ( array('description', 'installation', 'frequently_asked_questions', 'screenshots', 'changelog', 'change_log', 'upgrade_notice') as $special_section ) {
-			if ( isset($sections[$special_section]) ) {
-				$final_sections[$special_section] = $sections[$special_section]['content'];
-				unset($sections[$special_section]);
-			}
-		}
-		if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) )
-			$final_sections['changelog'] = $final_sections['change_log'];
-
-
-		$final_screenshots = array();
-		if ( isset($final_sections['screenshots']) ) {
-			preg_match_all('|<li>(.*?)</li>|s', $final_sections['screenshots'], $screenshots, PREG_SET_ORDER);
-			if ( $screenshots ) {
-				foreach ( (array) $screenshots as $ss )
-					$final_screenshots[] = $ss[1];
-			}
-		}
-
-		// Parse the upgrade_notice section specially:
-		// 1.0 => blah, 1.1 => fnord
-		$upgrade_notice = array();
-		if ( isset($final_sections['upgrade_notice']) ) {
-			$split = preg_split( '#<h4>(.*?)</h4>#', $final_sections['upgrade_notice'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-			for ( $i = 0; $i < count( $split ); $i += 2 )
-				$upgrade_notice[$this->sanitize_text( $split[$i] )] = substr( $this->sanitize_text( $split[$i + 1] ), 0, 300 );
-			unset( $final_sections['upgrade_notice'] );
-		}
-
-		// No description?
-		// No problem... we'll just fall back to the old style of description
-		// We'll even let you use markup this time!
-		$excerpt = false;
-		if ( !isset($final_sections['description']) ) {
-			$final_sections = array_merge(array('description' => $this->filter_text( $_short_description[2], true )), $final_sections);
-			$excerpt = true;
-		}
-
-
-		// dump the non-special sections into $remaining_content
-		// their order will be determined by their original order in the readme.txt
-		$remaining_content = '';
-		foreach ( $sections as $s_name => $s_data ) {
-			$remaining_content .= "\n<h3>{$s_data['title']}</h3>\n{$s_data['content']}";
-		}
-		$remaining_content = trim($remaining_content);
-
-
-		// All done!
-		// $r['tags'] and $r['contributors'] are simple arrays
-		// $r['sections'] is an array with named elements
-		$r = array(
-			'name' => $name,
-			'tags' => $tags,
-			'requires_at_least' => $requires_at_least,
-			'tested_up_to' => $tested_up_to,
-			'stable_tag' => $stable_tag,
-			'contributors' => $contributors,
-			'donate_link' => $donate_link,
-			'short_description' => $short_description,
-			'screenshots' => $final_screenshots,
-			'is_excerpt' => $excerpt,
-			'is_truncated' => $truncated,
-			'sections' => $final_sections,
-			'remaining_content' => $remaining_content,
-			'upgrade_notice' => $upgrade_notice
-		);
-
-		return $r;
-	}
-
-	function chop_string( $string, $chop ) { // chop a "prefix" from a string: Agressive! uses strstr not 0 === strpos
-		if ( $_string = strstr($string, $chop) ) {
-			$_string = substr($_string, strlen($chop));
-			return trim($_string);
-		} else {
-			return trim($string);
-		}
-	}
-
-	function user_sanitize( $text, $strict = false ) { // whitelisted chars
-		if ( function_exists('user_sanitize') ) // bbPress native
-			return user_sanitize( $text, $strict );
-
-		if ( $strict ) {
-			$text = preg_replace('/[^a-z0-9-]/i', '', $text);
-			$text = preg_replace('|-+|', '-', $text);
-		} else {
-			$text = preg_replace('/[^a-z0-9_-]/i', '', $text);
-		}
-		return $text;
-	}
-
-	function sanitize_text( $text ) { // not fancy
-		$text = strip_tags($text);
-		$text = esc_html($text);
-		$text = trim($text);
-		return $text;
-	}
-
-	function filter_text( $text, $markdown = false ) { // fancy, Markdown
-		$text = trim($text);
-
-		$text = call_user_func( array( __CLASS__, 'code_trick' ), $text, $markdown ); // A better parser than Markdown's for: backticks -> CODE
-
-		if ( $markdown ) { // Parse markdown.
-			if ( !class_exists('Parsedown', false) ) {
-				/** @noinspection PhpIncludeInspection */
-				require_once(dirname(__FILE__) . '/Parsedown' . (version_compare(PHP_VERSION, '5.3.0', '>=') ? '' : 'Legacy') . '.php');
-			}
-			$instance = Parsedown::instance();
-			$text = $instance->text($text);
-		}
-
-		$allowed = array(
-			'a' => array(
-				'href' => array(),
-				'title' => array(),
-				'rel' => array()),
-			'blockquote' => array('cite' => array()),
-			'br' => array(),
-			'p' => array(),
-			'code' => array(),
-			'pre' => array(),
-			'em' => array(),
-			'strong' => array(),
-			'ul' => array(),
-			'ol' => array(),
-			'li' => array(),
-			'h3' => array(),
-			'h4' => array()
-		);
-
-		$text = balanceTags($text);
+    function __construct() {
+        // This space intentionally blank
+    }
+
+    function parse_readme( $file ) {
+        $file_contents = @implode('', @file($file));
+        return $this->parse_readme_contents( $file_contents );
+    }
+
+    function parse_readme_contents( $file_contents ) {
+        $file_contents = str_replace(array("\r\n", "\r"), "\n", $file_contents);
+        $file_contents = trim($file_contents);
+        if ( 0 === strpos( $file_contents, "\xEF\xBB\xBF" ) )
+            $file_contents = substr( $file_contents, 3 );
+
+        // Markdown transformations
+        $file_contents = preg_replace( "|^###([^#]+)#*?\s*?\n|im", '=$1='."\n",     $file_contents );
+        $file_contents = preg_replace( "|^##([^#]+)#*?\s*?\n|im",  '==$1=='."\n",   $file_contents );
+        $file_contents = preg_replace( "|^#([^#]+)#*?\s*?\n|im",   '===$1==='."\n", $file_contents );
+
+        // === Plugin Name ===
+        // Must be the very first thing.
+        if ( !preg_match('|^===(.*)===|', $file_contents, $_name) )
+            return array(); // require a name
+        $name = trim($_name[1], '=');
+        $name = $this->sanitize_text( $name );
+
+        $file_contents = $this->chop_string( $file_contents, $_name[0] );
+
+
+        // Requires at least: 1.5
+        if ( preg_match('|Requires at least:(.*)|i', $file_contents, $_requires_at_least) )
+            $requires_at_least = $this->sanitize_text($_requires_at_least[1]);
+        else
+            $requires_at_least = NULL;
+
+
+        // Tested up to: 2.1
+        if ( preg_match('|Tested up to:(.*)|i', $file_contents, $_tested_up_to) )
+            $tested_up_to = $this->sanitize_text( $_tested_up_to[1] );
+        else
+            $tested_up_to = NULL;
+
+
+        // Stable tag: 10.4-ride-the-fire-eagle-danger-day
+        if ( preg_match('|Stable tag:(.*)|i', $file_contents, $_stable_tag) )
+            $stable_tag = $this->sanitize_text( $_stable_tag[1] );
+        else
+            $stable_tag = NULL; // we assume trunk, but don't set it here to tell the difference between specified trunk and default trunk
+
+
+        // Tags: some tag, another tag, we like tags
+        if ( preg_match('|Tags:(.*)|i', $file_contents, $_tags) ) {
+            $tags = preg_split('|,[\s]*?|', trim($_tags[1]));
+            foreach ( array_keys($tags) as $t )
+                $tags[$t] = $this->sanitize_text( $tags[$t] );
+        } else {
+            $tags = array();
+        }
+
+
+        // Contributors: markjaquith, mdawaffe, zefrank
+        $contributors = array();
+        if ( preg_match('|Contributors:(.*)|i', $file_contents, $_contributors) ) {
+            $temp_contributors = preg_split('|,[\s]*|', trim($_contributors[1]));
+            foreach ( array_keys($temp_contributors) as $c ) {
+                $tmp_sanitized = $this->user_sanitize( $temp_contributors[$c] );
+                if ( strlen(trim($tmp_sanitized)) > 0 )
+                    $contributors[$c] = $tmp_sanitized;
+                unset($tmp_sanitized);
+            }
+        }
+
+
+        // Donate Link: URL
+        if ( preg_match('|Donate link:(.*)|i', $file_contents, $_donate_link) )
+            $donate_link = esc_url( $_donate_link[1] );
+        else
+            $donate_link = NULL;
+
+
+        // togs, conts, etc are optional and order shouldn't matter.  So we chop them only after we've grabbed their values.
+        foreach ( array('tags', 'contributors', 'requires_at_least', 'tested_up_to', 'stable_tag', 'donate_link') as $chop ) {
+            if ( $$chop ) {
+                $_chop = '_' . $chop;
+                $file_contents = $this->chop_string( $file_contents, ${$_chop}[0] );
+            }
+        }
+
+        $file_contents = trim($file_contents);
+
+
+        // short-description fu
+        if ( !preg_match('/(^(.*?))^[\s]*=+?[\s]*.+?[\s]*=+?/ms', $file_contents, $_short_description) )
+            $_short_description = array( 1 => &$file_contents, 2 => &$file_contents );
+        $short_desc_filtered = $this->sanitize_text( $_short_description[2] );
+        $short_desc_length = strlen($short_desc_filtered);
+        $short_description = substr($short_desc_filtered, 0, 150);
+        if ( $short_desc_length > strlen($short_description) )
+            $truncated = true;
+        else
+            $truncated = false;
+        if ( $_short_description[1] )
+            $file_contents = $this->chop_string( $file_contents, $_short_description[1] ); // yes, the [1] is intentional
+
+        // == Section ==
+        // Break into sections
+        // $_sections[0] will be the title of the first section, $_sections[1] will be the content of the first section
+        // the array alternates from there:  title2, content2, title3, content3... and so forth
+        $_sections = preg_split('/^[\s]*==[\s]*(.+?)[\s]*==/m', $file_contents, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+
+        $sections = array();
+        for ( $i=1; $i <= count($_sections); $i +=2 ) {
+            $_sections[$i] = preg_replace('/(^[\s]*)=[\s]+(.+?)[\s]+=/m', '$1<h4>$2</h4>', $_sections[$i]);
+            $_sections[$i] = $this->filter_text( $_sections[$i], true );
+            $title = $this->sanitize_text( $_sections[$i-1] );
+            $sections[str_replace(' ', '_', strtolower($title))] = array('title' => $title, 'content' => $_sections[$i]);
+        }
+
+
+        // Special sections
+        // This is where we nab our special sections, so we can enforce their order and treat them differently, if needed
+        // upgrade_notice is not a section, but parse it like it is for now
+        $final_sections = array();
+        foreach ( array('description', 'installation', 'frequently_asked_questions', 'screenshots', 'changelog', 'change_log', 'upgrade_notice') as $special_section ) {
+            if ( isset($sections[$special_section]) ) {
+                $final_sections[$special_section] = $sections[$special_section]['content'];
+                unset($sections[$special_section]);
+            }
+        }
+        if ( isset($final_sections['change_log']) && empty($final_sections['changelog']) )
+            $final_sections['changelog'] = $final_sections['change_log'];
+
+
+        $final_screenshots = array();
+        if ( isset($final_sections['screenshots']) ) {
+            preg_match_all('|<li>(.*?)</li>|s', $final_sections['screenshots'], $screenshots, PREG_SET_ORDER);
+            if ( $screenshots ) {
+                foreach ( (array) $screenshots as $ss )
+                    $final_screenshots[] = $ss[1];
+            }
+        }
+
+        // Parse the upgrade_notice section specially:
+        // 1.0 => blah, 1.1 => fnord
+        $upgrade_notice = array();
+        if ( isset($final_sections['upgrade_notice']) ) {
+            $split = preg_split( '#<h4>(.*?)</h4>#', $final_sections['upgrade_notice'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+            for ( $i = 0; $i < count( $split ); $i += 2 )
+                $upgrade_notice[$this->sanitize_text( $split[$i] )] = substr( $this->sanitize_text( $split[$i + 1] ), 0, 300 );
+            unset( $final_sections['upgrade_notice'] );
+        }
+
+        // No description?
+        // No problem... we'll just fall back to the old style of description
+        // We'll even let you use markup this time!
+        $excerpt = false;
+        if ( !isset($final_sections['description']) ) {
+            $final_sections = array_merge(array('description' => $this->filter_text( $_short_description[2], true )), $final_sections);
+            $excerpt = true;
+        }
+
+
+        // dump the non-special sections into $remaining_content
+        // their order will be determined by their original order in the readme.txt
+        $remaining_content = '';
+        foreach ( $sections as $s_name => $s_data ) {
+            $remaining_content .= "\n<h3>{$s_data['title']}</h3>\n{$s_data['content']}";
+        }
+        $remaining_content = trim($remaining_content);
+
+
+        // All done!
+        // $r['tags'] and $r['contributors'] are simple arrays
+        // $r['sections'] is an array with named elements
+        $r = array(
+            'name' => $name,
+            'tags' => $tags,
+            'requires_at_least' => $requires_at_least,
+            'tested_up_to' => $tested_up_to,
+            'stable_tag' => $stable_tag,
+            'contributors' => $contributors,
+            'donate_link' => $donate_link,
+            'short_description' => $short_description,
+            'screenshots' => $final_screenshots,
+            'is_excerpt' => $excerpt,
+            'is_truncated' => $truncated,
+            'sections' => $final_sections,
+            'remaining_content' => $remaining_content,
+            'upgrade_notice' => $upgrade_notice
+        );
+
+        return $r;
+    }
+
+    function chop_string( $string, $chop ) { // chop a "prefix" from a string: Agressive! uses strstr not 0 === strpos
+        if ( $_string = strstr($string, $chop) ) {
+            $_string = substr($_string, strlen($chop));
+            return trim($_string);
+        } else {
+            return trim($string);
+        }
+    }
+
+    function user_sanitize( $text, $strict = false ) { // whitelisted chars
+        if ( function_exists('user_sanitize') ) // bbPress native
+            return user_sanitize( $text, $strict );
+
+        if ( $strict ) {
+            $text = preg_replace('/[^a-z0-9-]/i', '', $text);
+            $text = preg_replace('|-+|', '-', $text);
+        } else {
+            $text = preg_replace('/[^a-z0-9_-]/i', '', $text);
+        }
+        return $text;
+    }
+
+    function sanitize_text( $text ) { // not fancy
+        $text = strip_tags($text);
+        $text = esc_html($text);
+        $text = trim($text);
+        return $text;
+    }
+
+    function filter_text( $text, $markdown = false ) { // fancy, Markdown
+        $text = trim($text);
+
+        $text = call_user_func( array( __CLASS__, 'code_trick' ), $text, $markdown ); // A better parser than Markdown's for: backticks -> CODE
+
+        if ( $markdown ) { // Parse markdown.
+            if ( !class_exists('Parsedown', false) ) {
+                /** @noinspection PhpIncludeInspection */
+                require_once(dirname(__FILE__) . '/Parsedown' . (version_compare(PHP_VERSION, '5.3.0', '>=') ? '' : 'Legacy') . '.php');
+            }
+            $instance = Parsedown::instance();
+            $text = $instance->text($text);
+        }
+
+        $allowed = array(
+            'a' => array(
+                'href' => array(),
+                'title' => array(),
+                'rel' => array()),
+            'blockquote' => array('cite' => array()),
+            'br' => array(),
+            'p' => array(),
+            'code' => array(),
+            'pre' => array(),
+            'em' => array(),
+            'strong' => array(),
+            'ul' => array(),
+            'ol' => array(),
+            'li' => array(),
+            'h3' => array(),
+            'h4' => array()
+        );
+
+        $text = balanceTags($text);
 		
-		$text = wp_kses( $text, $allowed );
-		$text = trim($text);
-		return $text;
-	}
-
-	function code_trick( $text, $markdown ) { // Don't use bbPress native function - it's incompatible with Markdown
-		// If doing markdown, first take any user formatted code blocks and turn them into backticks so that
-		// markdown will preserve things like underscores in code blocks
-		if ( $markdown )
-			$text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
-
-		$text = str_replace(array("\r\n", "\r"), "\n", $text);
-		if ( !$markdown ) {
-			// This gets the "inline" code blocks, but can't be used with Markdown.
-			$text = preg_replace_callback("|(`)(.*?)`|", array( __CLASS__, 'encodeit'), $text);
-			// This gets the "block level" code blocks and converts them to PRE CODE
-			$text = preg_replace_callback("!(^|\n)`(.*?)`!s", array( __CLASS__, 'encodeit'), $text);
-		} else {
-			// Markdown can do inline code, we convert bbPress style block level code to Markdown style
-			$text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array( __CLASS__, 'indent'), $text);
-		}
-		return $text;
-	}
-
-	function indent( $matches ) {
-		$text = $matches[3];
-		$text = preg_replace('|^|m', $matches[2] . '    ', $text);
-		return $matches[1] . $text;
-	}
-
-	function encodeit( $matches ) {
-		if ( function_exists('encodeit') ) // bbPress native
-			return encodeit( $matches );
-
-		$text = trim($matches[2]);
-		$text = htmlspecialchars($text, ENT_QUOTES);
-		$text = str_replace(array("\r\n", "\r"), "\n", $text);
-		$text = preg_replace("|\n\n\n+|", "\n\n", $text);
-		$text = str_replace('&amp;lt;', '&lt;', $text);
-		$text = str_replace('&amp;gt;', '&gt;', $text);
-		$text = "<code>$text</code>";
-		if ( "`" != $matches[1] )
-			$text = "<pre>$text</pre>";
-		return $text;
-	}
-
-	function decodeit( $matches ) {
-		if ( function_exists('decodeit') ) // bbPress native
-			return decodeit( $matches );
-
-		$text = $matches[2];
-		$trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
-		$text = strtr($text, $trans_table);
-		$text = str_replace('<br />', '', $text);
-		$text = str_replace('&#38;', '&', $text);
-		$text = str_replace('&#39;', "'", $text);
-		if ( '<pre><code>' == $matches[1] )
-			$text = "\n$text\n";
-		return "`$text`";
-	}
+        $text = wp_kses( $text, $allowed );
+        $text = trim($text);
+        return $text;
+    }
+
+    function code_trick( $text, $markdown ) { // Don't use bbPress native function - it's incompatible with Markdown
+        // If doing markdown, first take any user formatted code blocks and turn them into backticks so that
+        // markdown will preserve things like underscores in code blocks
+        if ( $markdown )
+            $text = preg_replace_callback("!(<pre><code>|<code>)(.*?)(</code></pre>|</code>)!s", array( __CLASS__,'decodeit'), $text);
+
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+        if ( !$markdown ) {
+            // This gets the "inline" code blocks, but can't be used with Markdown.
+            $text = preg_replace_callback("|(`)(.*?)`|", array( __CLASS__, 'encodeit'), $text);
+            // This gets the "block level" code blocks and converts them to PRE CODE
+            $text = preg_replace_callback("!(^|\n)`(.*?)`!s", array( __CLASS__, 'encodeit'), $text);
+        } else {
+            // Markdown can do inline code, we convert bbPress style block level code to Markdown style
+            $text = preg_replace_callback("!(^|\n)([ \t]*?)`(.*?)`!s", array( __CLASS__, 'indent'), $text);
+        }
+        return $text;
+    }
+
+    function indent( $matches ) {
+        $text = $matches[3];
+        $text = preg_replace('|^|m', $matches[2] . '    ', $text);
+        return $matches[1] . $text;
+    }
+
+    function encodeit( $matches ) {
+        if ( function_exists('encodeit') ) // bbPress native
+            return encodeit( $matches );
+
+        $text = trim($matches[2]);
+        $text = htmlspecialchars($text, ENT_QUOTES);
+        $text = str_replace(array("\r\n", "\r"), "\n", $text);
+        $text = preg_replace("|\n\n\n+|", "\n\n", $text);
+        $text = str_replace('&amp;lt;', '&lt;', $text);
+        $text = str_replace('&amp;gt;', '&gt;', $text);
+        $text = "<code>$text</code>";
+        if ( "`" != $matches[1] )
+            $text = "<pre>$text</pre>";
+        return $text;
+    }
+
+    function decodeit( $matches ) {
+        if ( function_exists('decodeit') ) // bbPress native
+            return decodeit( $matches );
+
+        $text = $matches[2];
+        $trans_table = array_flip(get_html_translation_table(HTML_ENTITIES));
+        $text = strtr($text, $trans_table);
+        $text = str_replace('<br />', '', $text);
+        $text = str_replace('&#38;', '&', $text);
+        $text = str_replace('&#39;', "'", $text);
+        if ( '<pre><code>' == $matches[1] )
+            $text = "\n$text\n";
+        return "`$text`";
+    }
 
 } // end class
 

classes/external/php/plugin-update-checker/Puc/v4p4/Utils.php

Indentation +57 added lines, -57 removed lines

@@ -2,68 +2,68 @@
 
 if ( !class_exists('Puc_v4p4_Utils', false) ):
 
-	class Puc_v4p4_Utils {
-		/**
-		 * Get a value from a nested array or object based on a path.
-		 *
-		 * @param array|object|null $collection Get an entry from this array.
-		 * @param array|string $path A list of array keys in hierarchy order, or a string path like "foo.bar.baz".
-		 * @param mixed $default The value to return if the specified path is not found.
-		 * @param string $separator Path element separator. Only applies to string paths.
-		 * @return mixed
-		 */
-		public static function get($collection, $path, $default = null, $separator = '.') {
-			if ( is_string($path) ) {
-				$path = explode($separator, $path);
-			}
+    class Puc_v4p4_Utils {
+        /**
+         * Get a value from a nested array or object based on a path.
+         *
+         * @param array|object|null $collection Get an entry from this array.
+         * @param array|string $path A list of array keys in hierarchy order, or a string path like "foo.bar.baz".
+         * @param mixed $default The value to return if the specified path is not found.
+         * @param string $separator Path element separator. Only applies to string paths.
+         * @return mixed
+         */
+        public static function get($collection, $path, $default = null, $separator = '.') {
+            if ( is_string($path) ) {
+                $path = explode($separator, $path);
+            }
 
-			//Follow the $path into $input as far as possible.
-			$currentValue = $collection;
-			foreach ($path as $node) {
-				if ( is_array($currentValue) && isset($currentValue[$node]) ) {
-					$currentValue = $currentValue[$node];
-				} else if ( is_object($currentValue) && isset($currentValue->$node) ) {
-					$currentValue = $currentValue->$node;
-				} else {
-					return $default;
-				}
-			}
+            //Follow the $path into $input as far as possible.
+            $currentValue = $collection;
+            foreach ($path as $node) {
+                if ( is_array($currentValue) && isset($currentValue[$node]) ) {
+                    $currentValue = $currentValue[$node];
+                } else if ( is_object($currentValue) && isset($currentValue->$node) ) {
+                    $currentValue = $currentValue->$node;
+                } else {
+                    return $default;
+                }
+            }
 
-			return $currentValue;
-		}
+            return $currentValue;
+        }
 
-		/**
-		 * Get the first array element that is not empty.
-		 *
-		 * @param array $values
-		 * @param mixed|null $default Returns this value if there are no non-empty elements.
-		 * @return mixed|null
-		 */
-		public static function findNotEmpty($values, $default = null) {
-			if ( empty($values) ) {
-				return $default;
-			}
+        /**
+         * Get the first array element that is not empty.
+         *
+         * @param array $values
+         * @param mixed|null $default Returns this value if there are no non-empty elements.
+         * @return mixed|null
+         */
+        public static function findNotEmpty($values, $default = null) {
+            if ( empty($values) ) {
+                return $default;
+            }
 
-			foreach ($values as $value) {
-				if ( !empty($value) ) {
-					return $value;
-				}
-			}
+            foreach ($values as $value) {
+                if ( !empty($value) ) {
+                    return $value;
+                }
+            }
 
-			return $default;
-		}
+            return $default;
+        }
 
-		/**
-		 * Check if the input string starts with the specified prefix.
-		 *
-		 * @param string $input
-		 * @param string $prefix
-		 * @return bool
-		 */
-		public static function startsWith($input, $prefix) {
-			$length = strlen($prefix);
-			return (substr($input, 0, $length) === $prefix);
-		}
-	}
+        /**
+         * Check if the input string starts with the specified prefix.
+         *
+         * @param string $input
+         * @param string $prefix
+         * @return bool
+         */
+        public static function startsWith($input, $prefix) {
+            $length = strlen($prefix);
+            return (substr($input, 0, $length) === $prefix);
+        }
+    }
 
 endif;
\ No newline at end of file

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/BaseChecker.php

Indentation +20 added lines, -20 removed lines

@@ -1,27 +1,27 @@
 <?php
 if ( !interface_exists('Puc_v4p4_Vcs_BaseChecker', false) ):
 
-	interface Puc_v4p4_Vcs_BaseChecker {
-		/**
-		 * Set the repository branch to use for updates. Defaults to 'master'.
-		 *
-		 * @param string $branch
-		 * @return $this
-		 */
-		public function setBranch($branch);
+    interface Puc_v4p4_Vcs_BaseChecker {
+        /**
+         * Set the repository branch to use for updates. Defaults to 'master'.
+         *
+         * @param string $branch
+         * @return $this
+         */
+        public function setBranch($branch);
 
-		/**
-		 * Set authentication credentials.
-		 *
-		 * @param array|string $credentials
-		 * @return $this
-		 */
-		public function setAuthentication($credentials);
+        /**
+         * Set authentication credentials.
+         *
+         * @param array|string $credentials
+         * @return $this
+         */
+        public function setAuthentication($credentials);
 
-		/**
-		 * @return Puc_v4p4_Vcs_Api
-		 */
-		public function getVcsApi();
-	}
+        /**
+         * @return Puc_v4p4_Vcs_Api
+         */
+        public function getVcsApi();
+    }
 
 endif;
\ No newline at end of file

classes/external/php/plugin-update-checker/Puc/v4p4/Vcs/ThemeUpdateChecker.php

Indentation +112 added lines, -112 removed lines

@@ -2,117 +2,117 @@
 
 if ( !class_exists('Puc_v4p4_Vcs_ThemeUpdateChecker', false) ):
 
-	class Puc_v4p4_Vcs_ThemeUpdateChecker extends Puc_v4p4_Theme_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
-		/**
-		 * @var string The branch where to look for updates. Defaults to "master".
-		 */
-		protected $branch = 'master';
-
-		/**
-		 * @var Puc_v4p4_Vcs_Api Repository API client.
-		 */
-		protected $api = null;
-
-		/**
-		 * Puc_v4p4_Vcs_ThemeUpdateChecker constructor.
-		 *
-		 * @param Puc_v4p4_Vcs_Api $api
-		 * @param null $stylesheet
-		 * @param null $customSlug
-		 * @param int $checkPeriod
-		 * @param string $optionName
-		 */
-		public function __construct($api, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
-			$this->api = $api;
-			$this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
-
-			parent::__construct($api->getRepositoryUrl(), $stylesheet, $customSlug, $checkPeriod, $optionName);
-
-			$this->api->setSlug($this->slug);
-		}
-
-		public function requestUpdate() {
-			$api = $this->api;
-			$api->setLocalDirectory($this->getAbsoluteDirectoryPath());
-
-			$update = new Puc_v4p4_Theme_Update();
-			$update->slug = $this->slug;
-
-			//Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
-			$updateSource = $api->chooseReference($this->branch);
-			if ( $updateSource ) {
-				$ref = $updateSource->name;
-				$update->download_url = $updateSource->downloadUrl;
-			} else {
-				do_action(
-					'puc_api_error',
-					new WP_Error(
-						'puc-no-update-source',
-						'Could not retrieve version information from the repository. '
-						. 'This usually means that the update checker either can\'t connect '
-						. 'to the repository or it\'s configured incorrectly.'
-					),
-					null, null, $this->slug
-				);
-				$ref = $this->branch;
-			}
-
-			//Get headers from the main stylesheet in this branch/tag. Its "Version" header and other metadata
-			//are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
-			$remoteHeader = $this->getFileHeader($api->getRemoteFile('style.css', $ref));
-			$update->version = Puc_v4p4_Utils::findNotEmpty(array(
-				$remoteHeader['Version'],
-				Puc_v4p4_Utils::get($updateSource, 'version'),
-			));
-
-			//The details URL defaults to the Theme URI header or the repository URL.
-			$update->details_url = Puc_v4p4_Utils::findNotEmpty(array(
-				$remoteHeader['ThemeURI'],
-				$this->theme->get('ThemeURI'),
-				$this->metadataUrl,
-			));
-
-			if ( empty($update->version) ) {
-				//It looks like we didn't find a valid update after all.
-				$update = null;
-			}
-
-			$update = $this->filterUpdateResult($update);
-			return $update;
-		}
-
-		//FIXME: This is duplicated code. Both theme and plugin subclasses that use VCS share these methods.
-
-		public function setBranch($branch) {
-			$this->branch = $branch;
-			return $this;
-		}
-
-		public function setAuthentication($credentials) {
-			$this->api->setAuthentication($credentials);
-			return $this;
-		}
-
-		public function getVcsApi() {
-			return $this->api;
-		}
-
-		public function getUpdate() {
-			$update = parent::getUpdate();
-
-			if ( isset($update) && !empty($update->download_url) ) {
-				$update->download_url = $this->api->signDownloadUrl($update->download_url);
-			}
-
-			return $update;
-		}
-
-		public function onDisplayConfiguration($panel) {
-			parent::onDisplayConfiguration($panel);
-			$panel->row('Branch', $this->branch);
-			$panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
-			$panel->row('API client', get_class($this->api));
-		}
-	}
+    class Puc_v4p4_Vcs_ThemeUpdateChecker extends Puc_v4p4_Theme_UpdateChecker implements Puc_v4p4_Vcs_BaseChecker {
+        /**
+         * @var string The branch where to look for updates. Defaults to "master".
+         */
+        protected $branch = 'master';
+
+        /**
+         * @var Puc_v4p4_Vcs_Api Repository API client.
+         */
+        protected $api = null;
+
+        /**
+         * Puc_v4p4_Vcs_ThemeUpdateChecker constructor.
+         *
+         * @param Puc_v4p4_Vcs_Api $api
+         * @param null $stylesheet
+         * @param null $customSlug
+         * @param int $checkPeriod
+         * @param string $optionName
+         */
+        public function __construct($api, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
+            $this->api = $api;
+            $this->api->setHttpFilterName($this->getUniqueName('request_update_options'));
+
+            parent::__construct($api->getRepositoryUrl(), $stylesheet, $customSlug, $checkPeriod, $optionName);
+
+            $this->api->setSlug($this->slug);
+        }
+
+        public function requestUpdate() {
+            $api = $this->api;
+            $api->setLocalDirectory($this->getAbsoluteDirectoryPath());
+
+            $update = new Puc_v4p4_Theme_Update();
+            $update->slug = $this->slug;
+
+            //Figure out which reference (tag or branch) we'll use to get the latest version of the theme.
+            $updateSource = $api->chooseReference($this->branch);
+            if ( $updateSource ) {
+                $ref = $updateSource->name;
+                $update->download_url = $updateSource->downloadUrl;
+            } else {
+                do_action(
+                    'puc_api_error',
+                    new WP_Error(
+                        'puc-no-update-source',
+                        'Could not retrieve version information from the repository. '
+                        . 'This usually means that the update checker either can\'t connect '
+                        . 'to the repository or it\'s configured incorrectly.'
+                    ),
+                    null, null, $this->slug
+                );
+                $ref = $this->branch;
+            }
+
+            //Get headers from the main stylesheet in this branch/tag. Its "Version" header and other metadata
+            //are what the WordPress install will actually see after upgrading, so they take precedence over releases/tags.
+            $remoteHeader = $this->getFileHeader($api->getRemoteFile('style.css', $ref));
+            $update->version = Puc_v4p4_Utils::findNotEmpty(array(
+                $remoteHeader['Version'],
+                Puc_v4p4_Utils::get($updateSource, 'version'),
+            ));
+
+            //The details URL defaults to the Theme URI header or the repository URL.
+            $update->details_url = Puc_v4p4_Utils::findNotEmpty(array(
+                $remoteHeader['ThemeURI'],
+                $this->theme->get('ThemeURI'),
+                $this->metadataUrl,
+            ));
+
+            if ( empty($update->version) ) {
+                //It looks like we didn't find a valid update after all.
+                $update = null;
+            }
+
+            $update = $this->filterUpdateResult($update);
+            return $update;
+        }
+
+        //FIXME: This is duplicated code. Both theme and plugin subclasses that use VCS share these methods.
+
+        public function setBranch($branch) {
+            $this->branch = $branch;
+            return $this;
+        }
+
+        public function setAuthentication($credentials) {
+            $this->api->setAuthentication($credentials);
+            return $this;
+        }
+
+        public function getVcsApi() {
+            return $this->api;
+        }
+
+        public function getUpdate() {
+            $update = parent::getUpdate();
+
+            if ( isset($update) && !empty($update->download_url) ) {
+                $update->download_url = $this->api->signDownloadUrl($update->download_url);
+            }
+
+            return $update;
+        }
+
+        public function onDisplayConfiguration($panel) {
+            parent::onDisplayConfiguration($panel);
+            $panel->row('Branch', $this->branch);
+            $panel->row('Authentication enabled', $this->api->isAuthenticationEnabled() ? 'Yes' : 'No');
+            $panel->row('API client', get_class($this->api));
+        }
+    }
 
 endif;
\ No newline at end of file