futtta / autoptimize

classes/external/php/plugin-update-checker/Puc/v4p4/DebugBar/PluginExtension.php

Indentation +25 added lines, -25 removed lines

@@ -1,33 +1,33 @@
 <?php
 if ( !class_exists('Puc_v4p4_DebugBar_PluginExtension', false) ):
 
-	class Puc_v4p4_DebugBar_PluginExtension extends Puc_v4p4_DebugBar_Extension {
-		/** @var Puc_v4p4_Plugin_UpdateChecker */
-		protected $updateChecker;
+    class Puc_v4p4_DebugBar_PluginExtension extends Puc_v4p4_DebugBar_Extension {
+        /** @var Puc_v4p4_Plugin_UpdateChecker */
+        protected $updateChecker;
 
-		public function __construct($updateChecker) {
-			parent::__construct($updateChecker, 'Puc_v4p4_DebugBar_PluginPanel');
+        public function __construct($updateChecker) {
+            parent::__construct($updateChecker, 'Puc_v4p4_DebugBar_PluginPanel');
 
-			add_action('wp_ajax_puc_v4_debug_request_info', array($this, 'ajaxRequestInfo'));
-		}
+            add_action('wp_ajax_puc_v4_debug_request_info', array($this, 'ajaxRequestInfo'));
+        }
 
-		/**
-		 * Request plugin info and output it.
-		 */
-		public function ajaxRequestInfo() {
-			if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
-				return;
-			}
-			$this->preAjaxRequest();
-			$info = $this->updateChecker->requestInfo();
-			if ( $info !== null ) {
-				echo 'Successfully retrieved plugin info from the metadata URL:';
-				echo '<pre>', htmlentities(print_r($info, true)), '</pre>';
-			} else {
-				echo 'Failed to retrieve plugin info from the metadata URL.';
-			}
-			exit;
-		}
-	}
+        /**
+         * Request plugin info and output it.
+         */
+        public function ajaxRequestInfo() {
+            if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
+                return;
+            }
+            $this->preAjaxRequest();
+            $info = $this->updateChecker->requestInfo();
+            if ( $info !== null ) {
+                echo 'Successfully retrieved plugin info from the metadata URL:';
+                echo '<pre>', htmlentities(print_r($info, true)), '</pre>';
+            } else {
+                echo 'Failed to retrieve plugin info from the metadata URL.';
+            }
+            exit;
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_DebugBar_PluginExtension', false) ):
+if (!class_exists('Puc_v4p4_DebugBar_PluginExtension', false)):
 
 	class Puc_v4p4_DebugBar_PluginExtension extends Puc_v4p4_DebugBar_Extension {
 		/** @var Puc_v4p4_Plugin_UpdateChecker */
@@ -15,12 +15,12 @@ 
 		 * Request plugin info and output it.
 		 */
 		public function ajaxRequestInfo() {
-			if ( $_POST['uid'] !== $this->updateChecker->getUniqueName('uid') ) {
+			if ($_POST['uid'] !== $this->updateChecker->getUniqueName('uid')) {
 				return;
 			}
 			$this->preAjaxRequest();
 			$info = $this->updateChecker->requestInfo();
-			if ( $info !== null ) {
+			if ($info !== null) {
 				echo 'Successfully retrieved plugin info from the metadata URL:';
 				echo '<pre>', htmlentities(print_r($info, true)), '</pre>';
 			} else {

classes/external/php/plugin-update-checker/Puc/v4p4/DebugBar/PluginPanel.php

Indentation +29 added lines, -29 removed lines

@@ -2,37 +2,37 @@
 
 if ( !class_exists('Puc_v4p4_DebugBar_PluginPanel', false) ):
 
-	class Puc_v4p4_DebugBar_PluginPanel extends Puc_v4p4_DebugBar_Panel {
-		/**
-		 * @var Puc_v4p4_Plugin_UpdateChecker
-		 */
-		protected $updateChecker;
+    class Puc_v4p4_DebugBar_PluginPanel extends Puc_v4p4_DebugBar_Panel {
+        /**
+         * @var Puc_v4p4_Plugin_UpdateChecker
+         */
+        protected $updateChecker;
 
-		protected function displayConfigHeader() {
-			$this->row('Plugin file', htmlentities($this->updateChecker->pluginFile));
-			parent::displayConfigHeader();
-		}
+        protected function displayConfigHeader() {
+            $this->row('Plugin file', htmlentities($this->updateChecker->pluginFile));
+            parent::displayConfigHeader();
+        }
 
-		protected function getMetadataButton() {
-			$requestInfoButton = '';
-			if ( function_exists('get_submit_button') ) {
-				$requestInfoButton = get_submit_button(
-					'Request Info',
-					'secondary',
-					'puc-request-info-button',
-					false,
-					array('id' => $this->updateChecker->getUniqueName('request-info-button'))
-				);
-			}
-			return $requestInfoButton;
-		}
+        protected function getMetadataButton() {
+            $requestInfoButton = '';
+            if ( function_exists('get_submit_button') ) {
+                $requestInfoButton = get_submit_button(
+                    'Request Info',
+                    'secondary',
+                    'puc-request-info-button',
+                    false,
+                    array('id' => $this->updateChecker->getUniqueName('request-info-button'))
+                );
+            }
+            return $requestInfoButton;
+        }
 
-		protected function getUpdateFields() {
-			return array_merge(
-				parent::getUpdateFields(),
-				array('homepage', 'upgrade_notice', 'tested',)
-			);
-		}
-	}
+        protected function getUpdateFields() {
+            return array_merge(
+                parent::getUpdateFields(),
+                array('homepage', 'upgrade_notice', 'tested',)
+            );
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_DebugBar_PluginPanel', false) ):
+if (!class_exists('Puc_v4p4_DebugBar_PluginPanel', false)):
 
 	class Puc_v4p4_DebugBar_PluginPanel extends Puc_v4p4_DebugBar_Panel {
 		/**
@@ -15,7 +15,7 @@ 
 
 		protected function getMetadataButton() {
 			$requestInfoButton = '';
-			if ( function_exists('get_submit_button') ) {
+			if (function_exists('get_submit_button')) {
 				$requestInfoButton = get_submit_button(
 					'Request Info',
 					'secondary',

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

Indentation +172 added lines, -172 removed lines

@@ -1,177 +1,177 @@
 <?php
 if ( !class_exists('Puc_v4p4_Scheduler', false) ):
 
-	/**
-	 * The scheduler decides when and how often to check for updates.
-	 * It calls @see Puc_v4p4_UpdateChecker::checkForUpdates() to perform the actual checks.
-	 */
-	class Puc_v4p4_Scheduler {
-		public $checkPeriod = 12; //How often to check for updates (in hours).
-		public $throttleRedundantChecks = false; //Check less often if we already know that an update is available.
-		public $throttledCheckPeriod = 72;
-
-		protected $hourlyCheckHooks = array('load-update.php');
-
-		/**
-		 * @var Puc_v4p4_UpdateChecker
-		 */
-		protected $updateChecker;
-
-		private $cronHook = null;
-
-		/**
-		 * Scheduler constructor.
-		 *
-		 * @param Puc_v4p4_UpdateChecker $updateChecker
-		 * @param int $checkPeriod How often to check for updates (in hours).
-		 * @param array $hourlyHooks
-		 */
-		public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('load-plugins.php')) {
-			$this->updateChecker = $updateChecker;
-			$this->checkPeriod = $checkPeriod;
-
-			//Set up the periodic update checks
-			$this->cronHook = $this->updateChecker->getUniqueName('cron_check_updates');
-			if ( $this->checkPeriod > 0 ){
-
-				//Trigger the check via Cron.
-				//Try to use one of the default schedules if possible as it's less likely to conflict
-				//with other plugins and their custom schedules.
-				$defaultSchedules = array(
-					1  => 'hourly',
-					12 => 'twicedaily',
-					24 => 'daily',
-				);
-				if ( array_key_exists($this->checkPeriod, $defaultSchedules) ) {
-					$scheduleName = $defaultSchedules[$this->checkPeriod];
-				} else {
-					//Use a custom cron schedule.
-					$scheduleName = 'every' . $this->checkPeriod . 'hours';
-					add_filter('cron_schedules', array($this, '_addCustomSchedule'));
-				}
-
-				if ( !wp_next_scheduled($this->cronHook) && !defined('WP_INSTALLING') ) {
-					wp_schedule_event(time(), $scheduleName, $this->cronHook);
-				}
-				add_action($this->cronHook, array($this, 'maybeCheckForUpdates'));
-
-				//In case Cron is disabled or unreliable, we also manually trigger
-				//the periodic checks while the user is browsing the Dashboard.
-				add_action( 'admin_init', array($this, 'maybeCheckForUpdates') );
-
-				//Like WordPress itself, we check more often on certain pages.
-				/** @see wp_update_plugins */
-				add_action('load-update-core.php', array($this, 'maybeCheckForUpdates'));
-				//"load-update.php" and "load-plugins.php" or "load-themes.php".
-				$this->hourlyCheckHooks = array_merge($this->hourlyCheckHooks, $hourlyHooks);
-				foreach($this->hourlyCheckHooks as $hook) {
-					add_action($hook, array($this, 'maybeCheckForUpdates'));
-				}
-				//This hook fires after a bulk update is complete.
-				add_action('upgrader_process_complete', array($this, 'maybeCheckForUpdates'), 11, 0);
-
-			} else {
-				//Periodic checks are disabled.
-				wp_clear_scheduled_hook($this->cronHook);
-			}
-		}
-
-		/**
-		 * Check for updates if the configured check interval has already elapsed.
-		 * Will use a shorter check interval on certain admin pages like "Dashboard -> Updates" or when doing cron.
-		 *
-		 * You can override the default behaviour by using the "puc_check_now-$slug" filter.
-		 * The filter callback will be passed three parameters:
-		 *     - Current decision. TRUE = check updates now, FALSE = don't check now.
-		 *     - Last check time as a Unix timestamp.
-		 *     - Configured check period in hours.
-		 * Return TRUE to check for updates immediately, or FALSE to cancel.
-		 *
-		 * This method is declared public because it's a hook callback. Calling it directly is not recommended.
-		 */
-		public function maybeCheckForUpdates(){
-			if ( empty($this->checkPeriod) ){
-				return;
-			}
-
-			$state = $this->updateChecker->getUpdateState();
-			$shouldCheck = ($state->timeSinceLastCheck() >= $this->getEffectiveCheckPeriod());
-
-			//Let plugin authors substitute their own algorithm.
-			$shouldCheck = apply_filters(
-				$this->updateChecker->getUniqueName('check_now'),
-				$shouldCheck,
-				$state->getLastCheck(),
-				$this->checkPeriod
-			);
-
-			if ( $shouldCheck ) {
-				$this->updateChecker->checkForUpdates();
-			}
-		}
-
-		/**
-		 * Calculate the actual check period based on the current status and environment.
-		 *
-		 * @return int Check period in seconds.
-		 */
-		protected function getEffectiveCheckPeriod() {
-			$currentFilter = current_filter();
-			if ( in_array($currentFilter, array('load-update-core.php', 'upgrader_process_complete')) ) {
-				//Check more often when the user visits "Dashboard -> Updates" or does a bulk update.
-				$period = 60;
-			} else if ( in_array($currentFilter, $this->hourlyCheckHooks) ) {
-				//Also check more often on /wp-admin/update.php and the "Plugins" or "Themes" page.
-				$period = 3600;
-			} else if ( $this->throttleRedundantChecks && ($this->updateChecker->getUpdate() !== null) ) {
-				//Check less frequently if it's already known that an update is available.
-				$period = $this->throttledCheckPeriod * 3600;
-			} else if ( defined('DOING_CRON') && constant('DOING_CRON') ) {
-				//WordPress cron schedules are not exact, so lets do an update check even
-				//if slightly less than $checkPeriod hours have elapsed since the last check.
-				$cronFuzziness = 20 * 60;
-				$period = $this->checkPeriod * 3600 - $cronFuzziness;
-			} else {
-				$period = $this->checkPeriod * 3600;
-			}
-
-			return $period;
-		}
-
-		/**
-		 * Add our custom schedule to the array of Cron schedules used by WP.
-		 *
-		 * @param array $schedules
-		 * @return array
-		 */
-		public function _addCustomSchedule($schedules){
-			if ( $this->checkPeriod && ($this->checkPeriod > 0) ){
-				$scheduleName = 'every' . $this->checkPeriod . 'hours';
-				$schedules[$scheduleName] = array(
-					'interval' => $this->checkPeriod * 3600,
-					'display' => sprintf('Every %d hours', $this->checkPeriod),
-				);
-			}
-			return $schedules;
-		}
-
-		/**
-		 * Remove the scheduled cron event that the library uses to check for updates.
-		 *
-		 * @return void
-		 */
-		public function removeUpdaterCron(){
-			wp_clear_scheduled_hook($this->cronHook);
-		}
-
-		/**
-		 * Get the name of the update checker's WP-cron hook. Mostly useful for debugging.
-		 *
-		 * @return string
-		 */
-		public function getCronHookName() {
-			return $this->cronHook;
-		}
-	}
+    /**
+     * The scheduler decides when and how often to check for updates.
+     * It calls @see Puc_v4p4_UpdateChecker::checkForUpdates() to perform the actual checks.
+     */
+    class Puc_v4p4_Scheduler {
+        public $checkPeriod = 12; //How often to check for updates (in hours).
+        public $throttleRedundantChecks = false; //Check less often if we already know that an update is available.
+        public $throttledCheckPeriod = 72;
+
+        protected $hourlyCheckHooks = array('load-update.php');
+
+        /**
+         * @var Puc_v4p4_UpdateChecker
+         */
+        protected $updateChecker;
+
+        private $cronHook = null;
+
+        /**
+         * Scheduler constructor.
+         *
+         * @param Puc_v4p4_UpdateChecker $updateChecker
+         * @param int $checkPeriod How often to check for updates (in hours).
+         * @param array $hourlyHooks
+         */
+        public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('load-plugins.php')) {
+            $this->updateChecker = $updateChecker;
+            $this->checkPeriod = $checkPeriod;
+
+            //Set up the periodic update checks
+            $this->cronHook = $this->updateChecker->getUniqueName('cron_check_updates');
+            if ( $this->checkPeriod > 0 ){
+
+                //Trigger the check via Cron.
+                //Try to use one of the default schedules if possible as it's less likely to conflict
+                //with other plugins and their custom schedules.
+                $defaultSchedules = array(
+                    1  => 'hourly',
+                    12 => 'twicedaily',
+                    24 => 'daily',
+                );
+                if ( array_key_exists($this->checkPeriod, $defaultSchedules) ) {
+                    $scheduleName = $defaultSchedules[$this->checkPeriod];
+                } else {
+                    //Use a custom cron schedule.
+                    $scheduleName = 'every' . $this->checkPeriod . 'hours';
+                    add_filter('cron_schedules', array($this, '_addCustomSchedule'));
+                }
+
+                if ( !wp_next_scheduled($this->cronHook) && !defined('WP_INSTALLING') ) {
+                    wp_schedule_event(time(), $scheduleName, $this->cronHook);
+                }
+                add_action($this->cronHook, array($this, 'maybeCheckForUpdates'));
+
+                //In case Cron is disabled or unreliable, we also manually trigger
+                //the periodic checks while the user is browsing the Dashboard.
+                add_action( 'admin_init', array($this, 'maybeCheckForUpdates') );
+
+                //Like WordPress itself, we check more often on certain pages.
+                /** @see wp_update_plugins */
+                add_action('load-update-core.php', array($this, 'maybeCheckForUpdates'));
+                //"load-update.php" and "load-plugins.php" or "load-themes.php".
+                $this->hourlyCheckHooks = array_merge($this->hourlyCheckHooks, $hourlyHooks);
+                foreach($this->hourlyCheckHooks as $hook) {
+                    add_action($hook, array($this, 'maybeCheckForUpdates'));
+                }
+                //This hook fires after a bulk update is complete.
+                add_action('upgrader_process_complete', array($this, 'maybeCheckForUpdates'), 11, 0);
+
+            } else {
+                //Periodic checks are disabled.
+                wp_clear_scheduled_hook($this->cronHook);
+            }
+        }
+
+        /**
+         * Check for updates if the configured check interval has already elapsed.
+         * Will use a shorter check interval on certain admin pages like "Dashboard -> Updates" or when doing cron.
+         *
+         * You can override the default behaviour by using the "puc_check_now-$slug" filter.
+         * The filter callback will be passed three parameters:
+         *     - Current decision. TRUE = check updates now, FALSE = don't check now.
+         *     - Last check time as a Unix timestamp.
+         *     - Configured check period in hours.
+         * Return TRUE to check for updates immediately, or FALSE to cancel.
+         *
+         * This method is declared public because it's a hook callback. Calling it directly is not recommended.
+         */
+        public function maybeCheckForUpdates(){
+            if ( empty($this->checkPeriod) ){
+                return;
+            }
+
+            $state = $this->updateChecker->getUpdateState();
+            $shouldCheck = ($state->timeSinceLastCheck() >= $this->getEffectiveCheckPeriod());
+
+            //Let plugin authors substitute their own algorithm.
+            $shouldCheck = apply_filters(
+                $this->updateChecker->getUniqueName('check_now'),
+                $shouldCheck,
+                $state->getLastCheck(),
+                $this->checkPeriod
+            );
+
+            if ( $shouldCheck ) {
+                $this->updateChecker->checkForUpdates();
+            }
+        }
+
+        /**
+         * Calculate the actual check period based on the current status and environment.
+         *
+         * @return int Check period in seconds.
+         */
+        protected function getEffectiveCheckPeriod() {
+            $currentFilter = current_filter();
+            if ( in_array($currentFilter, array('load-update-core.php', 'upgrader_process_complete')) ) {
+                //Check more often when the user visits "Dashboard -> Updates" or does a bulk update.
+                $period = 60;
+            } else if ( in_array($currentFilter, $this->hourlyCheckHooks) ) {
+                //Also check more often on /wp-admin/update.php and the "Plugins" or "Themes" page.
+                $period = 3600;
+            } else if ( $this->throttleRedundantChecks && ($this->updateChecker->getUpdate() !== null) ) {
+                //Check less frequently if it's already known that an update is available.
+                $period = $this->throttledCheckPeriod * 3600;
+            } else if ( defined('DOING_CRON') && constant('DOING_CRON') ) {
+                //WordPress cron schedules are not exact, so lets do an update check even
+                //if slightly less than $checkPeriod hours have elapsed since the last check.
+                $cronFuzziness = 20 * 60;
+                $period = $this->checkPeriod * 3600 - $cronFuzziness;
+            } else {
+                $period = $this->checkPeriod * 3600;
+            }
+
+            return $period;
+        }
+
+        /**
+         * Add our custom schedule to the array of Cron schedules used by WP.
+         *
+         * @param array $schedules
+         * @return array
+         */
+        public function _addCustomSchedule($schedules){
+            if ( $this->checkPeriod && ($this->checkPeriod > 0) ){
+                $scheduleName = 'every' . $this->checkPeriod . 'hours';
+                $schedules[$scheduleName] = array(
+                    'interval' => $this->checkPeriod * 3600,
+                    'display' => sprintf('Every %d hours', $this->checkPeriod),
+                );
+            }
+            return $schedules;
+        }
+
+        /**
+         * Remove the scheduled cron event that the library uses to check for updates.
+         *
+         * @return void
+         */
+        public function removeUpdaterCron(){
+            wp_clear_scheduled_hook($this->cronHook);
+        }
+
+        /**
+         * Get the name of the update checker's WP-cron hook. Mostly useful for debugging.
+         *
+         * @return string
+         */
+        public function getCronHookName() {
+            return $this->cronHook;
+        }
+    }
 
 endif;

Spacing +23 added lines, -23 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_Scheduler', false) ):
+if (!class_exists('Puc_v4p4_Scheduler', false)):
 
 	/**
 	 * The scheduler decides when and how often to check for updates.
@@ -32,7 +32,7 @@ 
 
 			//Set up the periodic update checks
 			$this->cronHook = $this->updateChecker->getUniqueName('cron_check_updates');
-			if ( $this->checkPeriod > 0 ){
+			if ($this->checkPeriod > 0) {
 
 				//Trigger the check via Cron.
 				//Try to use one of the default schedules if possible as it's less likely to conflict
@@ -42,29 +42,29 @@ 
 					12 => 'twicedaily',
 					24 => 'daily',
 				);
-				if ( array_key_exists($this->checkPeriod, $defaultSchedules) ) {
+				if (array_key_exists($this->checkPeriod, $defaultSchedules)) {
 					$scheduleName = $defaultSchedules[$this->checkPeriod];
 				} else {
 					//Use a custom cron schedule.
-					$scheduleName = 'every' . $this->checkPeriod . 'hours';
+					$scheduleName = 'every'.$this->checkPeriod.'hours';
 					add_filter('cron_schedules', array($this, '_addCustomSchedule'));
 				}
 
-				if ( !wp_next_scheduled($this->cronHook) && !defined('WP_INSTALLING') ) {
+				if (!wp_next_scheduled($this->cronHook) && !defined('WP_INSTALLING')) {
 					wp_schedule_event(time(), $scheduleName, $this->cronHook);
 				}
 				add_action($this->cronHook, array($this, 'maybeCheckForUpdates'));
 
 				//In case Cron is disabled or unreliable, we also manually trigger
 				//the periodic checks while the user is browsing the Dashboard.
-				add_action( 'admin_init', array($this, 'maybeCheckForUpdates') );
+				add_action('admin_init', array($this, 'maybeCheckForUpdates'));
 
 				//Like WordPress itself, we check more often on certain pages.
 				/** @see wp_update_plugins */
 				add_action('load-update-core.php', array($this, 'maybeCheckForUpdates'));
 				//"load-update.php" and "load-plugins.php" or "load-themes.php".
 				$this->hourlyCheckHooks = array_merge($this->hourlyCheckHooks, $hourlyHooks);
-				foreach($this->hourlyCheckHooks as $hook) {
+				foreach ($this->hourlyCheckHooks as $hook) {
 					add_action($hook, array($this, 'maybeCheckForUpdates'));
 				}
 				//This hook fires after a bulk update is complete.
@@ -89,8 +89,8 @@ 
 		 *
 		 * This method is declared public because it's a hook callback. Calling it directly is not recommended.
 		 */
-		public function maybeCheckForUpdates(){
-			if ( empty($this->checkPeriod) ){
+		public function maybeCheckForUpdates() {
+			if (empty($this->checkPeriod)) {
 				return;
 			}
 
@@ -105,7 +105,7 @@ 
 				$this->checkPeriod
 			);
 
-			if ( $shouldCheck ) {
+			if ($shouldCheck) {
 				$this->updateChecker->checkForUpdates();
 			}
 		}
@@ -117,22 +117,22 @@ 
 		 */
 		protected function getEffectiveCheckPeriod() {
 			$currentFilter = current_filter();
-			if ( in_array($currentFilter, array('load-update-core.php', 'upgrader_process_complete')) ) {
+			if (in_array($currentFilter, array('load-update-core.php', 'upgrader_process_complete'))) {
 				//Check more often when the user visits "Dashboard -> Updates" or does a bulk update.
 				$period = 60;
-			} else if ( in_array($currentFilter, $this->hourlyCheckHooks) ) {
+			} else if (in_array($currentFilter, $this->hourlyCheckHooks)) {
 				//Also check more often on /wp-admin/update.php and the "Plugins" or "Themes" page.
 				$period = 3600;
-			} else if ( $this->throttleRedundantChecks && ($this->updateChecker->getUpdate() !== null) ) {
+			} else if ($this->throttleRedundantChecks && ($this->updateChecker->getUpdate() !== null)) {
 				//Check less frequently if it's already known that an update is available.
-				$period = $this->throttledCheckPeriod * 3600;
-			} else if ( defined('DOING_CRON') && constant('DOING_CRON') ) {
+				$period = $this->throttledCheckPeriod*3600;
+			} else if (defined('DOING_CRON') && constant('DOING_CRON')) {
 				//WordPress cron schedules are not exact, so lets do an update check even
 				//if slightly less than $checkPeriod hours have elapsed since the last check.
-				$cronFuzziness = 20 * 60;
-				$period = $this->checkPeriod * 3600 - $cronFuzziness;
+				$cronFuzziness = 20*60;
+				$period = $this->checkPeriod*3600 - $cronFuzziness;
 			} else {
-				$period = $this->checkPeriod * 3600;
+				$period = $this->checkPeriod*3600;
 			}
 
 			return $period;
@@ -144,11 +144,11 @@ 
 		 * @param array $schedules
 		 * @return array
 		 */
-		public function _addCustomSchedule($schedules){
-			if ( $this->checkPeriod && ($this->checkPeriod > 0) ){
-				$scheduleName = 'every' . $this->checkPeriod . 'hours';
+		public function _addCustomSchedule($schedules) {
+			if ($this->checkPeriod && ($this->checkPeriod > 0)) {
+				$scheduleName = 'every'.$this->checkPeriod.'hours';
 				$schedules[$scheduleName] = array(
-					'interval' => $this->checkPeriod * 3600,
+					'interval' => $this->checkPeriod*3600,
 					'display' => sprintf('Every %d hours', $this->checkPeriod),
 				);
 			}
@@ -160,7 +160,7 @@ 
 		 *
 		 * @return void
 		 */
-		public function removeUpdaterCron(){
+		public function removeUpdaterCron() {
 			wp_clear_scheduled_hook($this->cronHook);
 		}
 

classes/external/php/plugin-update-checker/Puc/v4p4/Theme/Update.php

Indentation +69 added lines, -69 removed lines

@@ -2,83 +2,83 @@
 
 if ( !class_exists('Puc_v4p4_Theme_Update', false) ):
 
-	class Puc_v4p4_Theme_Update extends Puc_v4p4_Update {
-		public $details_url = '';
+    class Puc_v4p4_Theme_Update extends Puc_v4p4_Update {
+        public $details_url = '';
 
-		protected static $extraFields = array('details_url');
+        protected static $extraFields = array('details_url');
 
-		/**
-		 * Transform the metadata into the format used by WordPress core.
-		 * Note the inconsistency: WP stores plugin updates as objects and theme updates as arrays.
-		 *
-		 * @return array
-		 */
-		public function toWpFormat() {
-			$update = array(
-				'theme' => $this->slug,
-				'new_version' => $this->version,
-				'url' => $this->details_url,
-			);
+        /**
+         * Transform the metadata into the format used by WordPress core.
+         * Note the inconsistency: WP stores plugin updates as objects and theme updates as arrays.
+         *
+         * @return array
+         */
+        public function toWpFormat() {
+            $update = array(
+                'theme' => $this->slug,
+                'new_version' => $this->version,
+                'url' => $this->details_url,
+            );
 
-			if ( !empty($this->download_url) ) {
-				$update['package'] = $this->download_url;
-			}
+            if ( !empty($this->download_url) ) {
+                $update['package'] = $this->download_url;
+            }
 
-			return $update;
-		}
+            return $update;
+        }
 
-		/**
-		 * Create a new instance of Theme_Update from its JSON-encoded representation.
-		 *
-		 * @param string $json Valid JSON string representing a theme information object.
-		 * @return self New instance of ThemeUpdate, or NULL on error.
-		 */
-		public static function fromJson($json) {
-			$instance = new self();
-			if ( !parent::createFromJson($json, $instance) ) {
-				return null;
-			}
-			return $instance;
-		}
+        /**
+         * Create a new instance of Theme_Update from its JSON-encoded representation.
+         *
+         * @param string $json Valid JSON string representing a theme information object.
+         * @return self New instance of ThemeUpdate, or NULL on error.
+         */
+        public static function fromJson($json) {
+            $instance = new self();
+            if ( !parent::createFromJson($json, $instance) ) {
+                return null;
+            }
+            return $instance;
+        }
 
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @param StdClass|Puc_v4p4_Theme_Update $object The source object.
-		 * @return Puc_v4p4_Theme_Update The new copy.
-		 */
-		public static function fromObject($object) {
-			$update = new self();
-			$update->copyFields($object, $update);
-			return $update;
-		}
+        /**
+         * Create a new instance by copying the necessary fields from another object.
+         *
+         * @param StdClass|Puc_v4p4_Theme_Update $object The source object.
+         * @return Puc_v4p4_Theme_Update The new copy.
+         */
+        public static function fromObject($object) {
+            $update = new self();
+            $update->copyFields($object, $update);
+            return $update;
+        }
 
-		/**
-		 * Basic validation.
-		 *
-		 * @param StdClass $apiResponse
-		 * @return bool|WP_Error
-		 */
-		protected function validateMetadata($apiResponse) {
-			$required = array('version', 'details_url');
-			foreach($required as $key) {
-				if ( !isset($apiResponse->$key) || empty($apiResponse->$key) ) {
-					return new WP_Error(
-						'tuc-invalid-metadata',
-						sprintf('The theme metadata is missing the required "%s" key.', $key)
-					);
-				}
-			}
-			return true;
-		}
+        /**
+         * Basic validation.
+         *
+         * @param StdClass $apiResponse
+         * @return bool|WP_Error
+         */
+        protected function validateMetadata($apiResponse) {
+            $required = array('version', 'details_url');
+            foreach($required as $key) {
+                if ( !isset($apiResponse->$key) || empty($apiResponse->$key) ) {
+                    return new WP_Error(
+                        'tuc-invalid-metadata',
+                        sprintf('The theme metadata is missing the required "%s" key.', $key)
+                    );
+                }
+            }
+            return true;
+        }
 
-		protected function getFieldNames() {
-			return array_merge(parent::getFieldNames(), self::$extraFields);
-		}
+        protected function getFieldNames() {
+            return array_merge(parent::getFieldNames(), self::$extraFields);
+        }
 
-		protected function getPrefixedFilter($tag) {
-			return parent::getPrefixedFilter($tag) . '_theme';
-		}
-	}
+        protected function getPrefixedFilter($tag) {
+            return parent::getPrefixedFilter($tag) . '_theme';
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Theme_Update', false) ):
+if (!class_exists('Puc_v4p4_Theme_Update', false)):
 
 	class Puc_v4p4_Theme_Update extends Puc_v4p4_Update {
 		public $details_url = '';
@@ -20,7 +20,7 @@ 
 				'url' => $this->details_url,
 			);
 
-			if ( !empty($this->download_url) ) {
+			if (!empty($this->download_url)) {
 				$update['package'] = $this->download_url;
 			}
 
@@ -35,7 +35,7 @@ 
 		 */
 		public static function fromJson($json) {
 			$instance = new self();
-			if ( !parent::createFromJson($json, $instance) ) {
+			if (!parent::createFromJson($json, $instance)) {
 				return null;
 			}
 			return $instance;
@@ -61,8 +61,8 @@ 
 		 */
 		protected function validateMetadata($apiResponse) {
 			$required = array('version', 'details_url');
-			foreach($required as $key) {
-				if ( !isset($apiResponse->$key) || empty($apiResponse->$key) ) {
+			foreach ($required as $key) {
+				if (!isset($apiResponse->$key) || empty($apiResponse->$key)) {
 					return new WP_Error(
 						'tuc-invalid-metadata',
 						sprintf('The theme metadata is missing the required "%s" key.', $key)
@@ -77,7 +77,7 @@ 
 		}
 
 		protected function getPrefixedFilter($tag) {
-			return parent::getPrefixedFilter($tag) . '_theme';
+			return parent::getPrefixedFilter($tag).'_theme';
 		}
 	}
 

classes/external/php/plugin-update-checker/Puc/v4p4/Theme/UpdateChecker.php

Indentation +171 added lines, -171 removed lines

@@ -2,176 +2,176 @@
 
 if ( !class_exists('Puc_v4p4_Theme_UpdateChecker', false) ):
 
-	class Puc_v4p4_Theme_UpdateChecker extends Puc_v4p4_UpdateChecker {
-		protected $filterSuffix = 'theme';
-		protected $updateTransient = 'update_themes';
-		protected $translationType = 'theme';
-
-		/**
-		 * @var string Theme directory name.
-		 */
-		protected $stylesheet;
-
-		/**
-		 * @var WP_Theme Theme object.
-		 */
-		protected $theme;
-
-		public function __construct($metadataUrl, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
-			if ( $stylesheet === null ) {
-				$stylesheet = get_stylesheet();
-			}
-			$this->stylesheet = $stylesheet;
-			$this->theme = wp_get_theme($this->stylesheet);
-
-			parent::__construct(
-				$metadataUrl,
-				$stylesheet,
-				$customSlug ? $customSlug : $stylesheet,
-				$checkPeriod,
-				$optionName
-			);
-		}
-
-		/**
-		 * For themes, the update array is indexed by theme directory name.
-		 *
-		 * @return string
-		 */
-		protected function getUpdateListKey() {
-			return $this->directoryName;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * @return Puc_v4p4_Update|null An instance of Update, or NULL when no updates are available.
-		 */
-		public function requestUpdate() {
-			list($themeUpdate, $result) = $this->requestMetadata('Puc_v4p4_Theme_Update', 'request_update');
-
-			if ( $themeUpdate !== null ) {
-				/** @var Puc_v4p4_Theme_Update $themeUpdate */
-				$themeUpdate->slug = $this->slug;
-			}
-
-			$themeUpdate = $this->filterUpdateResult($themeUpdate, $result);
-			return $themeUpdate;
-		}
-
-		public function userCanInstallUpdates() {
-			return current_user_can('update_themes');
-		}
-
-		/**
-		 * Get the currently installed version of the plugin or theme.
-		 *
-		 * @return string Version number.
-		 */
-		public function getInstalledVersion() {
-			return $this->theme->get('Version');
-		}
-
-		/**
-		 * @return string
-		 */
-		public function getAbsoluteDirectoryPath() {
-			if ( method_exists($this->theme, 'get_stylesheet_directory') ) {
-				return $this->theme->get_stylesheet_directory(); //Available since WP 3.4.
-			}
-			return get_theme_root($this->stylesheet) . '/' . $this->stylesheet;
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p4_Scheduler
-		 */
-		protected function createScheduler($checkPeriod) {
-			return new Puc_v4p4_Scheduler($this, $checkPeriod, array('load-themes.php'));
-		}
-
-		/**
-		 * Is there an update being installed right now for this theme?
-		 *
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		public function isBeingUpgraded($upgrader = null) {
-			return $this->upgraderStatus->isThemeBeingUpgraded($this->stylesheet, $upgrader);
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p4_DebugBar_Extension($this, 'Puc_v4p4_DebugBar_ThemePanel');
-		}
-
-		/**
-		 * Register a callback for filtering query arguments.
-		 *
-		 * The callback function should take one argument - an associative array of query arguments.
-		 * It should return a modified array of query arguments.
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addQueryArgFilter($callback){
-			$this->addFilter('request_update_query_args', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering arguments passed to wp_remote_get().
-		 *
-		 * The callback function should take one argument - an associative array of arguments -
-		 * and return a modified array or arguments. See the WP documentation on wp_remote_get()
-		 * for details on what arguments are available and how they work.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addHttpRequestArgFilter($callback) {
-			$this->addFilter('request_update_options', $callback);
-		}
-
-		/**
-		 * Register a callback for filtering theme updates retrieved from the external API.
-		 *
-		 * The callback function should take two arguments. If the theme update was retrieved
-		 * successfully, the first argument passed will be an instance of Theme_Update. Otherwise,
-		 * it will be NULL. The second argument will be the corresponding return value of
-		 * wp_remote_get (see WP docs for details).
-		 *
-		 * The callback function should return a new or modified instance of Theme_Update or NULL.
-		 *
-		 * @uses add_filter() This method is a convenience wrapper for add_filter().
-		 *
-		 * @param callable $callback
-		 * @return void
-		 */
-		public function addResultFilter($callback) {
-			$this->addFilter('request_update_result', $callback, 10, 2);
-		}
-
-		/**
-		 * @return array
-		 */
-		protected function getHeaderNames() {
-			return array(
-				'Name'        => 'Theme Name',
-				'ThemeURI'    => 'Theme URI',
-				'Description' => 'Description',
-				'Author'      => 'Author',
-				'AuthorURI'   => 'Author URI',
-				'Version'     => 'Version',
-				'Template'    => 'Template',
-				'Status'      => 'Status',
-				'Tags'        => 'Tags',
-				'TextDomain'  => 'Text Domain',
-				'DomainPath'  => 'Domain Path',
-			);
-		}
-	}
+    class Puc_v4p4_Theme_UpdateChecker extends Puc_v4p4_UpdateChecker {
+        protected $filterSuffix = 'theme';
+        protected $updateTransient = 'update_themes';
+        protected $translationType = 'theme';
+
+        /**
+         * @var string Theme directory name.
+         */
+        protected $stylesheet;
+
+        /**
+         * @var WP_Theme Theme object.
+         */
+        protected $theme;
+
+        public function __construct($metadataUrl, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
+            if ( $stylesheet === null ) {
+                $stylesheet = get_stylesheet();
+            }
+            $this->stylesheet = $stylesheet;
+            $this->theme = wp_get_theme($this->stylesheet);
+
+            parent::__construct(
+                $metadataUrl,
+                $stylesheet,
+                $customSlug ? $customSlug : $stylesheet,
+                $checkPeriod,
+                $optionName
+            );
+        }
+
+        /**
+         * For themes, the update array is indexed by theme directory name.
+         *
+         * @return string
+         */
+        protected function getUpdateListKey() {
+            return $this->directoryName;
+        }
+
+        /**
+         * Retrieve the latest update (if any) from the configured API endpoint.
+         *
+         * @return Puc_v4p4_Update|null An instance of Update, or NULL when no updates are available.
+         */
+        public function requestUpdate() {
+            list($themeUpdate, $result) = $this->requestMetadata('Puc_v4p4_Theme_Update', 'request_update');
+
+            if ( $themeUpdate !== null ) {
+                /** @var Puc_v4p4_Theme_Update $themeUpdate */
+                $themeUpdate->slug = $this->slug;
+            }
+
+            $themeUpdate = $this->filterUpdateResult($themeUpdate, $result);
+            return $themeUpdate;
+        }
+
+        public function userCanInstallUpdates() {
+            return current_user_can('update_themes');
+        }
+
+        /**
+         * Get the currently installed version of the plugin or theme.
+         *
+         * @return string Version number.
+         */
+        public function getInstalledVersion() {
+            return $this->theme->get('Version');
+        }
+
+        /**
+         * @return string
+         */
+        public function getAbsoluteDirectoryPath() {
+            if ( method_exists($this->theme, 'get_stylesheet_directory') ) {
+                return $this->theme->get_stylesheet_directory(); //Available since WP 3.4.
+            }
+            return get_theme_root($this->stylesheet) . '/' . $this->stylesheet;
+        }
+
+        /**
+         * Create an instance of the scheduler.
+         *
+         * @param int $checkPeriod
+         * @return Puc_v4p4_Scheduler
+         */
+        protected function createScheduler($checkPeriod) {
+            return new Puc_v4p4_Scheduler($this, $checkPeriod, array('load-themes.php'));
+        }
+
+        /**
+         * Is there an update being installed right now for this theme?
+         *
+         * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        public function isBeingUpgraded($upgrader = null) {
+            return $this->upgraderStatus->isThemeBeingUpgraded($this->stylesheet, $upgrader);
+        }
+
+        protected function createDebugBarExtension() {
+            return new Puc_v4p4_DebugBar_Extension($this, 'Puc_v4p4_DebugBar_ThemePanel');
+        }
+
+        /**
+         * Register a callback for filtering query arguments.
+         *
+         * The callback function should take one argument - an associative array of query arguments.
+         * It should return a modified array of query arguments.
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addQueryArgFilter($callback){
+            $this->addFilter('request_update_query_args', $callback);
+        }
+
+        /**
+         * Register a callback for filtering arguments passed to wp_remote_get().
+         *
+         * The callback function should take one argument - an associative array of arguments -
+         * and return a modified array or arguments. See the WP documentation on wp_remote_get()
+         * for details on what arguments are available and how they work.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addHttpRequestArgFilter($callback) {
+            $this->addFilter('request_update_options', $callback);
+        }
+
+        /**
+         * Register a callback for filtering theme updates retrieved from the external API.
+         *
+         * The callback function should take two arguments. If the theme update was retrieved
+         * successfully, the first argument passed will be an instance of Theme_Update. Otherwise,
+         * it will be NULL. The second argument will be the corresponding return value of
+         * wp_remote_get (see WP docs for details).
+         *
+         * The callback function should return a new or modified instance of Theme_Update or NULL.
+         *
+         * @uses add_filter() This method is a convenience wrapper for add_filter().
+         *
+         * @param callable $callback
+         * @return void
+         */
+        public function addResultFilter($callback) {
+            $this->addFilter('request_update_result', $callback, 10, 2);
+        }
+
+        /**
+         * @return array
+         */
+        protected function getHeaderNames() {
+            return array(
+                'Name'        => 'Theme Name',
+                'ThemeURI'    => 'Theme URI',
+                'Description' => 'Description',
+                'Author'      => 'Author',
+                'AuthorURI'   => 'Author URI',
+                'Version'     => 'Version',
+                'Template'    => 'Template',
+                'Status'      => 'Status',
+                'Tags'        => 'Tags',
+                'TextDomain'  => 'Text Domain',
+                'DomainPath'  => 'Domain Path',
+            );
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_Theme_UpdateChecker', false) ):
+if (!class_exists('Puc_v4p4_Theme_UpdateChecker', false)):
 
 	class Puc_v4p4_Theme_UpdateChecker extends Puc_v4p4_UpdateChecker {
 		protected $filterSuffix = 'theme';
@@ -18,7 +18,7 @@ 
 		protected $theme;
 
 		public function __construct($metadataUrl, $stylesheet = null, $customSlug = null, $checkPeriod = 12, $optionName = '') {
-			if ( $stylesheet === null ) {
+			if ($stylesheet === null) {
 				$stylesheet = get_stylesheet();
 			}
 			$this->stylesheet = $stylesheet;
@@ -50,7 +50,7 @@ 
 		public function requestUpdate() {
 			list($themeUpdate, $result) = $this->requestMetadata('Puc_v4p4_Theme_Update', 'request_update');
 
-			if ( $themeUpdate !== null ) {
+			if ($themeUpdate !== null) {
 				/** @var Puc_v4p4_Theme_Update $themeUpdate */
 				$themeUpdate->slug = $this->slug;
 			}
@@ -76,10 +76,10 @@ 
 		 * @return string
 		 */
 		public function getAbsoluteDirectoryPath() {
-			if ( method_exists($this->theme, 'get_stylesheet_directory') ) {
+			if (method_exists($this->theme, 'get_stylesheet_directory')) {
 				return $this->theme->get_stylesheet_directory(); //Available since WP 3.4.
 			}
-			return get_theme_root($this->stylesheet) . '/' . $this->stylesheet;
+			return get_theme_root($this->stylesheet).'/'.$this->stylesheet;
 		}
 
 		/**
@@ -115,7 +115,7 @@ 
 		 * @param callable $callback
 		 * @return void
 		 */
-		public function addQueryArgFilter($callback){
+		public function addQueryArgFilter($callback) {
 			$this->addFilter('request_update_query_args', $callback);
 		}
 

classes/external/php/plugin-update-checker/Puc/v4p4/Plugin/Update.php

Indentation +94 added lines, -94 removed lines

@@ -1,110 +1,110 @@
 <?php
 if ( !class_exists('Puc_v4p4_Plugin_Update', false) ):
 
-	/**
-	 * A simple container class for holding information about an available update.
-	 *
-	 * @author Janis Elsts
-	 * @copyright 2016
-	 * @access public
-	 */
-	class Puc_v4p4_Plugin_Update extends Puc_v4p4_Update {
-		public $id = 0;
-		public $homepage;
-		public $upgrade_notice;
-		public $tested;
-		public $icons = array();
-		public $filename; //Plugin filename relative to the plugins directory.
+    /**
+     * A simple container class for holding information about an available update.
+     *
+     * @author Janis Elsts
+     * @copyright 2016
+     * @access public
+     */
+    class Puc_v4p4_Plugin_Update extends Puc_v4p4_Update {
+        public $id = 0;
+        public $homepage;
+        public $upgrade_notice;
+        public $tested;
+        public $icons = array();
+        public $filename; //Plugin filename relative to the plugins directory.
 
-		protected static $extraFields = array(
-			'id', 'homepage', 'tested', 'upgrade_notice', 'icons', 'filename',
-		);
+        protected static $extraFields = array(
+            'id', 'homepage', 'tested', 'upgrade_notice', 'icons', 'filename',
+        );
 
-		/**
-		 * Create a new instance of PluginUpdate from its JSON-encoded representation.
-		 *
-		 * @param string $json
-		 * @return Puc_v4p4_Plugin_Update|null
-		 */
-		public static function fromJson($json){
-			//Since update-related information is simply a subset of the full plugin info,
-			//we can parse the update JSON as if it was a plugin info string, then copy over
-			//the parts that we care about.
-			$pluginInfo = Puc_v4p4_Plugin_Info::fromJson($json);
-			if ( $pluginInfo !== null ) {
-				return self::fromPluginInfo($pluginInfo);
-			} else {
-				return null;
-			}
-		}
+        /**
+         * Create a new instance of PluginUpdate from its JSON-encoded representation.
+         *
+         * @param string $json
+         * @return Puc_v4p4_Plugin_Update|null
+         */
+        public static function fromJson($json){
+            //Since update-related information is simply a subset of the full plugin info,
+            //we can parse the update JSON as if it was a plugin info string, then copy over
+            //the parts that we care about.
+            $pluginInfo = Puc_v4p4_Plugin_Info::fromJson($json);
+            if ( $pluginInfo !== null ) {
+                return self::fromPluginInfo($pluginInfo);
+            } else {
+                return null;
+            }
+        }
 
-		/**
-		 * Create a new instance of PluginUpdate based on an instance of PluginInfo.
-		 * Basically, this just copies a subset of fields from one object to another.
-		 *
-		 * @param Puc_v4p4_Plugin_Info $info
-		 * @return Puc_v4p4_Plugin_Update
-		 */
-		public static function fromPluginInfo($info){
-			return self::fromObject($info);
-		}
+        /**
+         * Create a new instance of PluginUpdate based on an instance of PluginInfo.
+         * Basically, this just copies a subset of fields from one object to another.
+         *
+         * @param Puc_v4p4_Plugin_Info $info
+         * @return Puc_v4p4_Plugin_Update
+         */
+        public static function fromPluginInfo($info){
+            return self::fromObject($info);
+        }
 
-		/**
-		 * Create a new instance by copying the necessary fields from another object.
-		 *
-		 * @param StdClass|Puc_v4p4_Plugin_Info|Puc_v4p4_Plugin_Update $object The source object.
-		 * @return Puc_v4p4_Plugin_Update The new copy.
-		 */
-		public static function fromObject($object) {
-			$update = new self();
-			$update->copyFields($object, $update);
-			return $update;
-		}
+        /**
+         * Create a new instance by copying the necessary fields from another object.
+         *
+         * @param StdClass|Puc_v4p4_Plugin_Info|Puc_v4p4_Plugin_Update $object The source object.
+         * @return Puc_v4p4_Plugin_Update The new copy.
+         */
+        public static function fromObject($object) {
+            $update = new self();
+            $update->copyFields($object, $update);
+            return $update;
+        }
 
-		/**
-		 * @return string[]
-		 */
-		protected function getFieldNames() {
-			return array_merge(parent::getFieldNames(), self::$extraFields);
-		}
+        /**
+         * @return string[]
+         */
+        protected function getFieldNames() {
+            return array_merge(parent::getFieldNames(), self::$extraFields);
+        }
 
-		/**
-		 * Transform the update into the format used by WordPress native plugin API.
-		 *
-		 * @return object
-		 */
-		public function toWpFormat() {
-			$update = parent::toWpFormat();
+        /**
+         * Transform the update into the format used by WordPress native plugin API.
+         *
+         * @return object
+         */
+        public function toWpFormat() {
+            $update = parent::toWpFormat();
 
-			$update->id = $this->id;
-			$update->url = $this->homepage;
-			$update->tested = $this->tested;
-			$update->plugin = $this->filename;
+            $update->id = $this->id;
+            $update->url = $this->homepage;
+            $update->tested = $this->tested;
+            $update->plugin = $this->filename;
 
-			if ( !empty($this->upgrade_notice) ) {
-				$update->upgrade_notice = $this->upgrade_notice;
-			}
+            if ( !empty($this->upgrade_notice) ) {
+                $update->upgrade_notice = $this->upgrade_notice;
+            }
 
-			if ( !empty($this->icons) && is_array($this->icons) ) {
-				//This should be an array with up to 4 keys: 'svg', '1x', '2x' and 'default'.
-				//Docs: https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
-				$icons = array_intersect_key(
-					$this->icons,
-					array('svg' => true, '1x' => true, '2x' => true, 'default' => true)
-				);
-				if ( !empty($icons) ) {
-					$update->icons = $icons;
+            if ( !empty($this->icons) && is_array($this->icons) ) {
+                //This should be an array with up to 4 keys: 'svg', '1x', '2x' and 'default'.
+                //Docs: https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
+                $icons = array_intersect_key(
+                    $this->icons,
+                    array('svg' => true, '1x' => true, '2x' => true, 'default' => true)
+                );
+                if ( !empty($icons) ) {
+                    $update->icons = $icons;
 
-					//It appears that the 'default' icon isn't used anywhere in WordPress 4.9,
-					//but lets set it just in case a future release needs it.
-					if ( !isset($update->icons['default']) ) {
-						$update->icons['default'] = current($update->icons);
-					}
-				}
-			}
+                    //It appears that the 'default' icon isn't used anywhere in WordPress 4.9,
+                    //but lets set it just in case a future release needs it.
+                    if ( !isset($update->icons['default']) ) {
+                        $update->icons['default'] = current($update->icons);
+                    }
+                }
+            }
 
-			return $update;
-		}
-	}
+            return $update;
+        }
+    }
 
 endif;
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( !class_exists('Puc_v4p4_Plugin_Update', false) ):
+if (!class_exists('Puc_v4p4_Plugin_Update', false)):
 
 	/**
 	 * A simple container class for holding information about an available update.
@@ -26,12 +26,12 @@ 
 		 * @param string $json
 		 * @return Puc_v4p4_Plugin_Update|null
 		 */
-		public static function fromJson($json){
+		public static function fromJson($json) {
 			//Since update-related information is simply a subset of the full plugin info,
 			//we can parse the update JSON as if it was a plugin info string, then copy over
 			//the parts that we care about.
 			$pluginInfo = Puc_v4p4_Plugin_Info::fromJson($json);
-			if ( $pluginInfo !== null ) {
+			if ($pluginInfo !== null) {
 				return self::fromPluginInfo($pluginInfo);
 			} else {
 				return null;
@@ -45,7 +45,7 @@ 
 		 * @param Puc_v4p4_Plugin_Info $info
 		 * @return Puc_v4p4_Plugin_Update
 		 */
-		public static function fromPluginInfo($info){
+		public static function fromPluginInfo($info) {
 			return self::fromObject($info);
 		}
 
@@ -81,23 +81,23 @@ 
 			$update->tested = $this->tested;
 			$update->plugin = $this->filename;
 
-			if ( !empty($this->upgrade_notice) ) {
+			if (!empty($this->upgrade_notice)) {
 				$update->upgrade_notice = $this->upgrade_notice;
 			}
 
-			if ( !empty($this->icons) && is_array($this->icons) ) {
+			if (!empty($this->icons) && is_array($this->icons)) {
 				//This should be an array with up to 4 keys: 'svg', '1x', '2x' and 'default'.
 				//Docs: https://developer.wordpress.org/plugins/wordpress-org/plugin-assets/#plugin-icons
 				$icons = array_intersect_key(
 					$this->icons,
 					array('svg' => true, '1x' => true, '2x' => true, 'default' => true)
 				);
-				if ( !empty($icons) ) {
+				if (!empty($icons)) {
 					$update->icons = $icons;
 
 					//It appears that the 'default' icon isn't used anywhere in WordPress 4.9,
 					//but lets set it just in case a future release needs it.
-					if ( !isset($update->icons['default']) ) {
+					if (!isset($update->icons['default'])) {
 						$update->icons['default'] = current($update->icons);
 					}
 				}

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

Indentation +861 added lines, -861 removed lines

@@ -2,895 +2,895 @@
 
 if ( !class_exists('Puc_v4p4_UpdateChecker', false) ):
 
-	abstract class Puc_v4p4_UpdateChecker {
-		protected $filterSuffix = '';
-		protected $updateTransient = '';
-		protected $translationType = ''; //"plugin" or "theme".
-
-		/**
-		 * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
-		 * and should be logged to the standard PHP error log.
-		 * @var bool
-		 */
-		public $debugMode = false;
-
-		/**
-		 * @var string Where to store the update info.
-		 */
-		public $optionName = '';
-
-		/**
-		 * @var string The URL of the metadata file.
-		 */
-		public $metadataUrl = '';
-
-		/**
-		 * @var string Plugin or theme directory name.
-		 */
-		public $directoryName = '';
-
-		/**
-		 * @var string The slug that will be used in update checker hooks and remote API requests.
-		 * Usually matches the directory name unless the plugin/theme directory has been renamed.
-		 */
-		public $slug = '';
-
-		/**
-		 * @var Puc_v4p4_Scheduler
-		 */
-		public $scheduler;
-
-		/**
-		 * @var Puc_v4p4_UpgraderStatus
-		 */
-		protected $upgraderStatus;
-
-		/**
-		 * @var Puc_v4p4_StateStore
-		 */
-		protected $updateState;
-
-		/**
-		 * @var array List of API errors triggered during the last checkForUpdates() call.
-		 */
-		protected $lastRequestApiErrors = array();
-
-		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
-			$this->debugMode = (bool)(constant('WP_DEBUG'));
-			$this->metadataUrl = $metadataUrl;
-			$this->directoryName = $directoryName;
-			$this->slug = !empty($slug) ? $slug : $this->directoryName;
-
-			$this->optionName = $optionName;
-			if ( empty($this->optionName) ) {
-				//BC: Initially the library only supported plugin updates and didn't use type prefixes
-				//in the option name. Lets use the same prefix-less name when possible.
-				if ( $this->filterSuffix === '' ) {
-					$this->optionName = 'external_updates-' . $this->slug;
-				} else {
-					$this->optionName = $this->getUniqueName('external_updates');
-				}
-			}
-
-			$this->scheduler = $this->createScheduler($checkPeriod);
-			$this->upgraderStatus = new Puc_v4p4_UpgraderStatus();
-			$this->updateState = new Puc_v4p4_StateStore($this->optionName);
-
-			if ( did_action('init') ) {
-				$this->loadTextDomain();
-			} else {
-				add_action('init', array($this, 'loadTextDomain'));
-			}
-
-			$this->installHooks();
-		}
-
-		/**
-		 * @internal
-		 */
-		public function loadTextDomain() {
-			//We're not using load_plugin_textdomain() or its siblings because figuring out where
-			//the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
-			$domain = 'plugin-update-checker';
-			$locale = apply_filters(
-				'plugin_locale',
-				(is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
-				$domain
-			);
-
-			$moFile = $domain . '-' . $locale . '.mo';
-			$path = realpath(dirname(__FILE__) . '/../../languages');
-
-			if ($path && file_exists($path)) {
-				load_textdomain($domain, $path . '/' . $moFile);
-			}
-		}
-
-		protected function installHooks() {
-			//Insert our update info into the update array maintained by WP.
-			add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-
-			//Insert translation updates into the update list.
-			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-
-			//Clear translation updates when WP clears the update cache.
-			//This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
-			//it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
-			add_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			//Rename the update directory to be the same as the existing directory.
-			if ( $this->directoryName !== '.' ) {
-				add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
-			}
-
-			//Allow HTTP requests to the metadata URL even if it's on a local host.
-			add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
-
-			//DebugBar integration.
-			if ( did_action('plugins_loaded') ) {
-				$this->maybeInitDebugBar();
-			} else {
-				add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-			}
-		}
-
-		/**
-		 * Remove hooks that were added by this update checker instance.
-		 */
-		protected function removeHooks() {
-			remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-			remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
-			remove_action(
-				'delete_site_transient_' . $this->updateTransient,
-				array($this, 'clearCachedTranslationUpdates')
-			);
-
-			remove_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10);
-			remove_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10);
-			remove_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
-
-			remove_action('init', array($this, 'loadTextDomain'));
-		}
-
-		/**
-		 * Check if the current user has the required permissions to install updates.
-		 *
-		 * @return bool
-		 */
-		abstract public function userCanInstallUpdates();
-
-		/**
-		 * Explicitly allow HTTP requests to the metadata URL.
-		 *
-		 * WordPress has a security feature where the HTTP API will reject all requests that are sent to
-		 * another site hosted on the same server as the current site (IP match), a local host, or a local
-		 * IP, unless the host exactly matches the current site.
-		 *
-		 * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
-		 *
-		 * That can be a problem when you're developing your plugin and you decide to host the update information
-		 * on the same server as your test site. Update requests will mysteriously fail.
-		 *
-		 * We fix that by adding an exception for the metadata host.
-		 *
-		 * @param bool $allow
-		 * @param string $host
-		 * @return bool
-		 */
-		public function allowMetadataHost($allow, $host) {
-			static $metadataHost = 0; //Using 0 instead of NULL because parse_url can return NULL.
-			if ( $metadataHost === 0 ) {
-				$metadataHost = @parse_url($this->metadataUrl, PHP_URL_HOST);
-			}
-
-			if ( is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost)) ) {
-				return true;
-			}
-			return $allow;
-		}
-
-		/**
-		 * Create an instance of the scheduler.
-		 *
-		 * This is implemented as a method to make it possible for plugins to subclass the update checker
-		 * and substitute their own scheduler.
-		 *
-		 * @param int $checkPeriod
-		 * @return Puc_v4p4_Scheduler
-		 */
-		abstract protected function createScheduler($checkPeriod);
-
-		/**
-		 * Check for updates. The results are stored in the DB option specified in $optionName.
-		 *
-		 * @return Puc_v4p4_Update|null
-		 */
-		public function checkForUpdates() {
-			$installedVersion = $this->getInstalledVersion();
-			//Fail silently if we can't find the plugin/theme or read its header.
-			if ( $installedVersion === null ) {
-				$this->triggerError(
-					sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
-					E_USER_WARNING
-				);
-				return null;
-			}
-
-			//Start collecting API errors.
-			$this->lastRequestApiErrors = array();
-			add_action('puc_api_error', array($this, 'collectApiErrors'), 10, 4);
-
-			$state = $this->updateState;
-			$state->setLastCheckToNow()
-				->setCheckedVersion($installedVersion)
-				->save(); //Save before checking in case something goes wrong
-
-			$state->setUpdate($this->requestUpdate());
-			$state->save();
-
-			//Stop collecting API errors.
-			remove_action('puc_api_error', array($this, 'collectApiErrors'), 10);
-
-			return $this->getUpdate();
-		}
-
-		/**
-		 * Load the update checker state from the DB.
-		 *
-		 * @return Puc_v4p4_StateStore
-		 */
-		public function getUpdateState() {
-			return $this->updateState->lazyLoad();
-		}
-
-		/**
-		 * Reset update checker state - i.e. last check time, cached update data and so on.
-		 *
-		 * Call this when your plugin is being uninstalled, or if you want to
-		 * clear the update cache.
-		 */
-		public function resetUpdateState() {
-			$this->updateState->delete();
-		}
-
-		/**
-		 * Get the details of the currently available update, if any.
-		 *
-		 * If no updates are available, or if the last known update version is below or equal
-		 * to the currently installed version, this method will return NULL.
-		 *
-		 * Uses cached update data. To retrieve update information straight from
-		 * the metadata URL, call requestUpdate() instead.
-		 *
-		 * @return Puc_v4p4_Update|null
-		 */
-		public function getUpdate() {
-			$update = $this->updateState->getUpdate();
-
-			//Is there an update available?
-			if ( isset($update) ) {
-				//Check if the update is actually newer than the currently installed version.
-				$installedVersion = $this->getInstalledVersion();
-				if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
-					return $update;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * Retrieve the latest update (if any) from the configured API endpoint.
-		 *
-		 * Subclasses should run the update through filterUpdateResult before returning it.
-		 *
-		 * @return Puc_v4p4_Update An instance of Update, or NULL when no updates are available.
-		 */
-		abstract public function requestUpdate();
-
-		/**
-		 * Filter the result of a requestUpdate() call.
-		 *
-		 * @param Puc_v4p4_Update|null $update
-		 * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
-		 * @return Puc_v4p4_Update
-		 */
-		protected function filterUpdateResult($update, $httpResult = null) {
-			//Let plugins/themes modify the update.
-			$update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
-
-			if ( isset($update, $update->translations) ) {
-				//Keep only those translation updates that apply to this site.
-				$update->translations = $this->filterApplicableTranslations($update->translations);
-			}
-
-			return $update;
-		}
-
-		/**
-		 * Get the currently installed version of the plugin or theme.
-		 *
-		 * @return string|null Version number.
-		 */
-		abstract public function getInstalledVersion();
-
-		/**
-		 * Get the full path of the plugin or theme directory.
-		 *
-		 * @return string
-		 */
-		abstract public function getAbsoluteDirectoryPath();
-
-		/**
-		 * Trigger a PHP error, but only when $debugMode is enabled.
-		 *
-		 * @param string $message
-		 * @param int $errorType
-		 */
-		protected function triggerError($message, $errorType) {
-			if ($this->debugMode) {
-				trigger_error($message, $errorType);
-			}
-		}
-
-		/**
-		 * Get the full name of an update checker filter, action or DB entry.
-		 *
-		 * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
-		 * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
-		 *
-		 * @param string $baseTag
-		 * @return string
-		 */
-		public function getUniqueName($baseTag) {
-			$name = 'puc_' . $baseTag;
-			if ($this->filterSuffix !== '') {
-				$name .= '_' . $this->filterSuffix;
-			}
-			return $name . '-' . $this->slug;
-		}
-
-		/**
-		 * Store API errors that are generated when checking for updates.
-		 *
-		 * @internal
-		 * @param WP_Error $error
-		 * @param array|null $httpResponse
-		 * @param string|null $url
-		 * @param string|null $slug
-		 */
-		public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
-			if ( isset($slug) && ($slug !== $this->slug) ) {
-				return;
-			}
-
-			$this->lastRequestApiErrors[] = array(
-				'error'        => $error,
-				'httpResponse' => $httpResponse,
-				'url'          => $url,
-			);
-		}
-
-		/**
-		 * @return array
-		 */
-		public function getLastRequestApiErrors() {
-			return $this->lastRequestApiErrors;
-		}
-
-		/* -------------------------------------------------------------------
+    abstract class Puc_v4p4_UpdateChecker {
+        protected $filterSuffix = '';
+        protected $updateTransient = '';
+        protected $translationType = ''; //"plugin" or "theme".
+
+        /**
+         * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
+         * and should be logged to the standard PHP error log.
+         * @var bool
+         */
+        public $debugMode = false;
+
+        /**
+         * @var string Where to store the update info.
+         */
+        public $optionName = '';
+
+        /**
+         * @var string The URL of the metadata file.
+         */
+        public $metadataUrl = '';
+
+        /**
+         * @var string Plugin or theme directory name.
+         */
+        public $directoryName = '';
+
+        /**
+         * @var string The slug that will be used in update checker hooks and remote API requests.
+         * Usually matches the directory name unless the plugin/theme directory has been renamed.
+         */
+        public $slug = '';
+
+        /**
+         * @var Puc_v4p4_Scheduler
+         */
+        public $scheduler;
+
+        /**
+         * @var Puc_v4p4_UpgraderStatus
+         */
+        protected $upgraderStatus;
+
+        /**
+         * @var Puc_v4p4_StateStore
+         */
+        protected $updateState;
+
+        /**
+         * @var array List of API errors triggered during the last checkForUpdates() call.
+         */
+        protected $lastRequestApiErrors = array();
+
+        public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
+            $this->debugMode = (bool)(constant('WP_DEBUG'));
+            $this->metadataUrl = $metadataUrl;
+            $this->directoryName = $directoryName;
+            $this->slug = !empty($slug) ? $slug : $this->directoryName;
+
+            $this->optionName = $optionName;
+            if ( empty($this->optionName) ) {
+                //BC: Initially the library only supported plugin updates and didn't use type prefixes
+                //in the option name. Lets use the same prefix-less name when possible.
+                if ( $this->filterSuffix === '' ) {
+                    $this->optionName = 'external_updates-' . $this->slug;
+                } else {
+                    $this->optionName = $this->getUniqueName('external_updates');
+                }
+            }
+
+            $this->scheduler = $this->createScheduler($checkPeriod);
+            $this->upgraderStatus = new Puc_v4p4_UpgraderStatus();
+            $this->updateState = new Puc_v4p4_StateStore($this->optionName);
+
+            if ( did_action('init') ) {
+                $this->loadTextDomain();
+            } else {
+                add_action('init', array($this, 'loadTextDomain'));
+            }
+
+            $this->installHooks();
+        }
+
+        /**
+         * @internal
+         */
+        public function loadTextDomain() {
+            //We're not using load_plugin_textdomain() or its siblings because figuring out where
+            //the library is located (plugin, mu-plugin, theme, custom wp-content paths) is messy.
+            $domain = 'plugin-update-checker';
+            $locale = apply_filters(
+                'plugin_locale',
+                (is_admin() && function_exists('get_user_locale')) ? get_user_locale() : get_locale(),
+                $domain
+            );
+
+            $moFile = $domain . '-' . $locale . '.mo';
+            $path = realpath(dirname(__FILE__) . '/../../languages');
+
+            if ($path && file_exists($path)) {
+                load_textdomain($domain, $path . '/' . $moFile);
+            }
+        }
+
+        protected function installHooks() {
+            //Insert our update info into the update array maintained by WP.
+            add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+
+            //Insert translation updates into the update list.
+            add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+
+            //Clear translation updates when WP clears the update cache.
+            //This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
+            //it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
+            add_action(
+                'delete_site_transient_' . $this->updateTransient,
+                array($this, 'clearCachedTranslationUpdates')
+            );
+
+            //Rename the update directory to be the same as the existing directory.
+            if ( $this->directoryName !== '.' ) {
+                add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
+            }
+
+            //Allow HTTP requests to the metadata URL even if it's on a local host.
+            add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
+
+            //DebugBar integration.
+            if ( did_action('plugins_loaded') ) {
+                $this->maybeInitDebugBar();
+            } else {
+                add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
+            }
+        }
+
+        /**
+         * Remove hooks that were added by this update checker instance.
+         */
+        protected function removeHooks() {
+            remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+            remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+            remove_action(
+                'delete_site_transient_' . $this->updateTransient,
+                array($this, 'clearCachedTranslationUpdates')
+            );
+
+            remove_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10);
+            remove_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10);
+            remove_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
+
+            remove_action('init', array($this, 'loadTextDomain'));
+        }
+
+        /**
+         * Check if the current user has the required permissions to install updates.
+         *
+         * @return bool
+         */
+        abstract public function userCanInstallUpdates();
+
+        /**
+         * Explicitly allow HTTP requests to the metadata URL.
+         *
+         * WordPress has a security feature where the HTTP API will reject all requests that are sent to
+         * another site hosted on the same server as the current site (IP match), a local host, or a local
+         * IP, unless the host exactly matches the current site.
+         *
+         * This feature is opt-in (at least in WP 4.4). Apparently some people enable it.
+         *
+         * That can be a problem when you're developing your plugin and you decide to host the update information
+         * on the same server as your test site. Update requests will mysteriously fail.
+         *
+         * We fix that by adding an exception for the metadata host.
+         *
+         * @param bool $allow
+         * @param string $host
+         * @return bool
+         */
+        public function allowMetadataHost($allow, $host) {
+            static $metadataHost = 0; //Using 0 instead of NULL because parse_url can return NULL.
+            if ( $metadataHost === 0 ) {
+                $metadataHost = @parse_url($this->metadataUrl, PHP_URL_HOST);
+            }
+
+            if ( is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost)) ) {
+                return true;
+            }
+            return $allow;
+        }
+
+        /**
+         * Create an instance of the scheduler.
+         *
+         * This is implemented as a method to make it possible for plugins to subclass the update checker
+         * and substitute their own scheduler.
+         *
+         * @param int $checkPeriod
+         * @return Puc_v4p4_Scheduler
+         */
+        abstract protected function createScheduler($checkPeriod);
+
+        /**
+         * Check for updates. The results are stored in the DB option specified in $optionName.
+         *
+         * @return Puc_v4p4_Update|null
+         */
+        public function checkForUpdates() {
+            $installedVersion = $this->getInstalledVersion();
+            //Fail silently if we can't find the plugin/theme or read its header.
+            if ( $installedVersion === null ) {
+                $this->triggerError(
+                    sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
+                    E_USER_WARNING
+                );
+                return null;
+            }
+
+            //Start collecting API errors.
+            $this->lastRequestApiErrors = array();
+            add_action('puc_api_error', array($this, 'collectApiErrors'), 10, 4);
+
+            $state = $this->updateState;
+            $state->setLastCheckToNow()
+                ->setCheckedVersion($installedVersion)
+                ->save(); //Save before checking in case something goes wrong
+
+            $state->setUpdate($this->requestUpdate());
+            $state->save();
+
+            //Stop collecting API errors.
+            remove_action('puc_api_error', array($this, 'collectApiErrors'), 10);
+
+            return $this->getUpdate();
+        }
+
+        /**
+         * Load the update checker state from the DB.
+         *
+         * @return Puc_v4p4_StateStore
+         */
+        public function getUpdateState() {
+            return $this->updateState->lazyLoad();
+        }
+
+        /**
+         * Reset update checker state - i.e. last check time, cached update data and so on.
+         *
+         * Call this when your plugin is being uninstalled, or if you want to
+         * clear the update cache.
+         */
+        public function resetUpdateState() {
+            $this->updateState->delete();
+        }
+
+        /**
+         * Get the details of the currently available update, if any.
+         *
+         * If no updates are available, or if the last known update version is below or equal
+         * to the currently installed version, this method will return NULL.
+         *
+         * Uses cached update data. To retrieve update information straight from
+         * the metadata URL, call requestUpdate() instead.
+         *
+         * @return Puc_v4p4_Update|null
+         */
+        public function getUpdate() {
+            $update = $this->updateState->getUpdate();
+
+            //Is there an update available?
+            if ( isset($update) ) {
+                //Check if the update is actually newer than the currently installed version.
+                $installedVersion = $this->getInstalledVersion();
+                if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
+                    return $update;
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Retrieve the latest update (if any) from the configured API endpoint.
+         *
+         * Subclasses should run the update through filterUpdateResult before returning it.
+         *
+         * @return Puc_v4p4_Update An instance of Update, or NULL when no updates are available.
+         */
+        abstract public function requestUpdate();
+
+        /**
+         * Filter the result of a requestUpdate() call.
+         *
+         * @param Puc_v4p4_Update|null $update
+         * @param array|WP_Error|null $httpResult The value returned by wp_remote_get(), if any.
+         * @return Puc_v4p4_Update
+         */
+        protected function filterUpdateResult($update, $httpResult = null) {
+            //Let plugins/themes modify the update.
+            $update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
+
+            if ( isset($update, $update->translations) ) {
+                //Keep only those translation updates that apply to this site.
+                $update->translations = $this->filterApplicableTranslations($update->translations);
+            }
+
+            return $update;
+        }
+
+        /**
+         * Get the currently installed version of the plugin or theme.
+         *
+         * @return string|null Version number.
+         */
+        abstract public function getInstalledVersion();
+
+        /**
+         * Get the full path of the plugin or theme directory.
+         *
+         * @return string
+         */
+        abstract public function getAbsoluteDirectoryPath();
+
+        /**
+         * Trigger a PHP error, but only when $debugMode is enabled.
+         *
+         * @param string $message
+         * @param int $errorType
+         */
+        protected function triggerError($message, $errorType) {
+            if ($this->debugMode) {
+                trigger_error($message, $errorType);
+            }
+        }
+
+        /**
+         * Get the full name of an update checker filter, action or DB entry.
+         *
+         * This method adds the "puc_" prefix and the "-$slug" suffix to the filter name.
+         * For example, "pre_inject_update" becomes "puc_pre_inject_update-plugin-slug".
+         *
+         * @param string $baseTag
+         * @return string
+         */
+        public function getUniqueName($baseTag) {
+            $name = 'puc_' . $baseTag;
+            if ($this->filterSuffix !== '') {
+                $name .= '_' . $this->filterSuffix;
+            }
+            return $name . '-' . $this->slug;
+        }
+
+        /**
+         * Store API errors that are generated when checking for updates.
+         *
+         * @internal
+         * @param WP_Error $error
+         * @param array|null $httpResponse
+         * @param string|null $url
+         * @param string|null $slug
+         */
+        public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
+            if ( isset($slug) && ($slug !== $this->slug) ) {
+                return;
+            }
+
+            $this->lastRequestApiErrors[] = array(
+                'error'        => $error,
+                'httpResponse' => $httpResponse,
+                'url'          => $url,
+            );
+        }
+
+        /**
+         * @return array
+         */
+        public function getLastRequestApiErrors() {
+            return $this->lastRequestApiErrors;
+        }
+
+        /* -------------------------------------------------------------------
 		 * PUC filters and filter utilities
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Register a callback for one of the update checker filters.
-		 *
-		 * Identical to add_filter(), except it automatically adds the "puc_" prefix
-		 * and the "-$slug" suffix to the filter name. For example, "request_info_result"
-		 * becomes "puc_request_info_result-your_plugin_slug".
-		 *
-		 * @param string $tag
-		 * @param callable $callback
-		 * @param int $priority
-		 * @param int $acceptedArgs
-		 */
-		public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
-			add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Register a callback for one of the update checker filters.
+         *
+         * Identical to add_filter(), except it automatically adds the "puc_" prefix
+         * and the "-$slug" suffix to the filter name. For example, "request_info_result"
+         * becomes "puc_request_info_result-your_plugin_slug".
+         *
+         * @param string $tag
+         * @param callable $callback
+         * @param int $priority
+         * @param int $acceptedArgs
+         */
+        public function addFilter($tag, $callback, $priority = 10, $acceptedArgs = 1) {
+            add_filter($this->getUniqueName($tag), $callback, $priority, $acceptedArgs);
+        }
+
+        /* -------------------------------------------------------------------
 		 * Inject updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Insert the latest update (if any) into the update list maintained by WP.
-		 *
-		 * @param stdClass $updates Update list.
-		 * @return stdClass Modified update list.
-		 */
-		public function injectUpdate($updates) {
-			//Is there an update to insert?
-			$update = $this->getUpdate();
-
-			if ( !$this->shouldShowUpdates() ) {
-				$update = null;
-			}
-
-			if ( !empty($update) ) {
-				//Let plugins filter the update info before it's passed on to WordPress.
-				$update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
-				$updates = $this->addUpdateToList($updates, $update->toWpFormat());
-			} else {
-				//Clean up any stale update info.
-				$updates = $this->removeUpdateFromList($updates);
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @param stdClass|array $updateToAdd
-		 * @return stdClass
-		 */
-		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-				$updates->response = array();
-			}
-
-			$updates->response[$this->getUpdateListKey()] = $updateToAdd;
-			return $updates;
-		}
-
-		/**
-		 * @param stdClass|null $updates
-		 * @return stdClass|null
-		 */
-		protected function removeUpdateFromList($updates) {
-			if ( isset($updates, $updates->response) ) {
-				unset($updates->response[$this->getUpdateListKey()]);
-			}
-			return $updates;
-		}
-
-		/**
-		 * Get the key that will be used when adding updates to the update list that's maintained
-		 * by the WordPress core. The list is always an associative array, but the key is different
-		 * for plugins and themes.
-		 *
-		 * @return string
-		 */
-		abstract protected function getUpdateListKey();
-
-		/**
-		 * Should we show available updates?
-		 *
-		 * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
-		 * support automatic updates installation for mu-plugins, so PUC usually won't show update
-		 * notifications in that case. See the plugin-specific subclass for details.
-		 *
-		 * Note: This method only applies to updates that are displayed (or not) in the WordPress
-		 * admin. It doesn't affect APIs like requestUpdate and getUpdate.
-		 *
-		 * @return bool
-		 */
-		protected function shouldShowUpdates() {
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Insert the latest update (if any) into the update list maintained by WP.
+         *
+         * @param stdClass $updates Update list.
+         * @return stdClass Modified update list.
+         */
+        public function injectUpdate($updates) {
+            //Is there an update to insert?
+            $update = $this->getUpdate();
+
+            if ( !$this->shouldShowUpdates() ) {
+                $update = null;
+            }
+
+            if ( !empty($update) ) {
+                //Let plugins filter the update info before it's passed on to WordPress.
+                $update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
+                $updates = $this->addUpdateToList($updates, $update->toWpFormat());
+            } else {
+                //Clean up any stale update info.
+                $updates = $this->removeUpdateFromList($updates);
+            }
+
+            return $updates;
+        }
+
+        /**
+         * @param stdClass|null $updates
+         * @param stdClass|array $updateToAdd
+         * @return stdClass
+         */
+        protected function addUpdateToList($updates, $updateToAdd) {
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+                $updates->response = array();
+            }
+
+            $updates->response[$this->getUpdateListKey()] = $updateToAdd;
+            return $updates;
+        }
+
+        /**
+         * @param stdClass|null $updates
+         * @return stdClass|null
+         */
+        protected function removeUpdateFromList($updates) {
+            if ( isset($updates, $updates->response) ) {
+                unset($updates->response[$this->getUpdateListKey()]);
+            }
+            return $updates;
+        }
+
+        /**
+         * Get the key that will be used when adding updates to the update list that's maintained
+         * by the WordPress core. The list is always an associative array, but the key is different
+         * for plugins and themes.
+         *
+         * @return string
+         */
+        abstract protected function getUpdateListKey();
+
+        /**
+         * Should we show available updates?
+         *
+         * Usually the answer is "yes", but there are exceptions. For example, WordPress doesn't
+         * support automatic updates installation for mu-plugins, so PUC usually won't show update
+         * notifications in that case. See the plugin-specific subclass for details.
+         *
+         * Note: This method only applies to updates that are displayed (or not) in the WordPress
+         * admin. It doesn't affect APIs like requestUpdate and getUpdate.
+         *
+         * @return bool
+         */
+        protected function shouldShowUpdates() {
+            return true;
+        }
+
+        /* -------------------------------------------------------------------
 		 * JSON-based update API
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
-		 *
-		 * @param string $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
-		 * @param string $filterRoot
-		 * @param array $queryArgs Additional query arguments.
-		 * @return array [Puc_v4p4_Metadata|null, array|WP_Error] A metadata instance and the value returned by wp_remote_get().
-		 */
-		protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
-			//Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
-			$queryArgs = array_merge(
-				array(
-					'installed_version' => strval($this->getInstalledVersion()),
-					'php' => phpversion(),
-					'locale' => get_locale(),
-				),
-				$queryArgs
-			);
-			$queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
-
-			//Various options for the wp_remote_get() call. Plugins can filter these, too.
-			$options = array(
-				'timeout' => 10, //seconds
-				'headers' => array(
-					'Accept' => 'application/json',
-				),
-			);
-			$options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
-
-			//The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
-			$url = $this->metadataUrl;
-			if ( !empty($queryArgs) ){
-				$url = add_query_arg($queryArgs, $url);
-			}
-
-			$result = wp_remote_get($url, $options);
-
-			$result = apply_filters($this->getUniqueName('request_metadata_http_result'), $result, $url, $options);
+        /**
+         * Retrieve plugin or theme metadata from the JSON document at $this->metadataUrl.
+         *
+         * @param string $metaClass Parse the JSON as an instance of this class. It must have a static fromJson method.
+         * @param string $filterRoot
+         * @param array $queryArgs Additional query arguments.
+         * @return array [Puc_v4p4_Metadata|null, array|WP_Error] A metadata instance and the value returned by wp_remote_get().
+         */
+        protected function requestMetadata($metaClass, $filterRoot, $queryArgs = array()) {
+            //Query args to append to the URL. Plugins can add their own by using a filter callback (see addQueryArgFilter()).
+            $queryArgs = array_merge(
+                array(
+                    'installed_version' => strval($this->getInstalledVersion()),
+                    'php' => phpversion(),
+                    'locale' => get_locale(),
+                ),
+                $queryArgs
+            );
+            $queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
+
+            //Various options for the wp_remote_get() call. Plugins can filter these, too.
+            $options = array(
+                'timeout' => 10, //seconds
+                'headers' => array(
+                    'Accept' => 'application/json',
+                ),
+            );
+            $options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
+
+            //The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
+            $url = $this->metadataUrl;
+            if ( !empty($queryArgs) ){
+                $url = add_query_arg($queryArgs, $url);
+            }
+
+            $result = wp_remote_get($url, $options);
+
+            $result = apply_filters($this->getUniqueName('request_metadata_http_result'), $result, $url, $options);
 			
-			//Try to parse the response
-			$status = $this->validateApiResponse($result);
-			$metadata = null;
-			if ( !is_wp_error($status) ){
-				$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
-			} else {
-				do_action('puc_api_error', $status, $result, $url, $this->slug);
-				$this->triggerError(
-					sprintf('The URL %s does not point to a valid metadata file. ', $url)
-					. $status->get_error_message(),
-					E_USER_WARNING
-				);
-			}
-
-			return array($metadata, $result);
-		}
-
-		/**
-		 * Check if $result is a successful update API response.
-		 *
-		 * @param array|WP_Error $result
-		 * @return true|WP_Error
-		 */
-		protected function validateApiResponse($result) {
-			if ( is_wp_error($result) ) { /** @var WP_Error $result */
-				return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
-			}
-
-			if ( !isset($result['response']['code']) ) {
-				return new WP_Error(
-					'puc_no_response_code',
-					'wp_remote_get() returned an unexpected result.'
-				);
-			}
-
-			if ( $result['response']['code'] !== 200 ) {
-				return new WP_Error(
-					'puc_unexpected_response_code',
-					'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
-				);
-			}
-
-			if ( empty($result['body']) ) {
-				return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
-			}
-
-			return true;
-		}
-
-		/* -------------------------------------------------------------------
+            //Try to parse the response
+            $status = $this->validateApiResponse($result);
+            $metadata = null;
+            if ( !is_wp_error($status) ){
+                $metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
+            } else {
+                do_action('puc_api_error', $status, $result, $url, $this->slug);
+                $this->triggerError(
+                    sprintf('The URL %s does not point to a valid metadata file. ', $url)
+                    . $status->get_error_message(),
+                    E_USER_WARNING
+                );
+            }
+
+            return array($metadata, $result);
+        }
+
+        /**
+         * Check if $result is a successful update API response.
+         *
+         * @param array|WP_Error $result
+         * @return true|WP_Error
+         */
+        protected function validateApiResponse($result) {
+            if ( is_wp_error($result) ) { /** @var WP_Error $result */
+                return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
+            }
+
+            if ( !isset($result['response']['code']) ) {
+                return new WP_Error(
+                    'puc_no_response_code',
+                    'wp_remote_get() returned an unexpected result.'
+                );
+            }
+
+            if ( $result['response']['code'] !== 200 ) {
+                return new WP_Error(
+                    'puc_unexpected_response_code',
+                    'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
+                );
+            }
+
+            if ( empty($result['body']) ) {
+                return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
+            }
+
+            return true;
+        }
+
+        /* -------------------------------------------------------------------
 		 * Language packs / Translation updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Filter a list of translation updates and return a new list that contains only updates
-		 * that apply to the current site.
-		 *
-		 * @param array $translations
-		 * @return array
-		 */
-		protected function filterApplicableTranslations($translations) {
-			$languages = array_flip(array_values(get_available_languages()));
-			$installedTranslations = $this->getInstalledTranslations();
-
-			$applicableTranslations = array();
-			foreach($translations as $translation) {
-				//Does it match one of the available core languages?
-				$isApplicable = array_key_exists($translation->language, $languages);
-				//Is it more recent than an already-installed translation?
-				if ( isset($installedTranslations[$translation->language]) ) {
-					$updateTimestamp = strtotime($translation->updated);
-					$installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
-					$isApplicable = $updateTimestamp > $installedTimestamp;
-				}
-
-				if ( $isApplicable ) {
-					$applicableTranslations[] = $translation;
-				}
-			}
-
-			return $applicableTranslations;
-		}
-
-		/**
-		 * Get a list of installed translations for this plugin or theme.
-		 *
-		 * @return array
-		 */
-		protected function getInstalledTranslations() {
-			if ( !function_exists('wp_get_installed_translations') ) {
-				return array();
-			}
-			$installedTranslations = wp_get_installed_translations($this->translationType . 's');
-			if ( isset($installedTranslations[$this->directoryName]) ) {
-				$installedTranslations = $installedTranslations[$this->directoryName];
-			} else {
-				$installedTranslations = array();
-			}
-			return $installedTranslations;
-		}
-
-		/**
-		 * Insert translation updates into the list maintained by WordPress.
-		 *
-		 * @param stdClass $updates
-		 * @return stdClass
-		 */
-		public function injectTranslationUpdates($updates) {
-			$translationUpdates = $this->getTranslationUpdates();
-			if ( empty($translationUpdates) ) {
-				return $updates;
-			}
-
-			//Being defensive.
-			if ( !is_object($updates) ) {
-				$updates = new stdClass();
-			}
-			if ( !isset($updates->translations) ) {
-				$updates->translations = array();
-			}
-
-			//In case there's a name collision with a plugin or theme hosted on wordpress.org,
-			//remove any preexisting updates that match our thing.
-			$updates->translations = array_values(array_filter(
-				$updates->translations,
-				array($this, 'isNotMyTranslation')
-			));
-
-			//Add our updates to the list.
-			foreach($translationUpdates as $update) {
-				$convertedUpdate = array_merge(
-					array(
-						'type' => $this->translationType,
-						'slug' => $this->directoryName,
-						'autoupdate' => 0,
-						//AFAICT, WordPress doesn't actually use the "version" field for anything.
-						//But lets make sure it's there, just in case.
-						'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
-					),
-					(array)$update
-				);
-
-				$updates->translations[] = $convertedUpdate;
-			}
-
-			return $updates;
-		}
-
-		/**
-		 * Get a list of available translation updates.
-		 *
-		 * This method will return an empty array if there are no updates.
-		 * Uses cached update data.
-		 *
-		 * @return array
-		 */
-		public function getTranslationUpdates() {
-			return $this->updateState->getTranslations();
-		}
-
-		/**
-		 * Remove all cached translation updates.
-		 *
-		 * @see wp_clean_update_cache
-		 */
-		public function clearCachedTranslationUpdates() {
-			$this->updateState->setTranslations(array());
-		}
-
-		/**
-		 * Filter callback. Keeps only translations that *don't* match this plugin or theme.
-		 *
-		 * @param array $translation
-		 * @return bool
-		 */
-		protected function isNotMyTranslation($translation) {
-			$isMatch = isset($translation['type'], $translation['slug'])
-				&& ($translation['type'] === $this->translationType)
-				&& ($translation['slug'] === $this->directoryName);
-
-			return !$isMatch;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Filter a list of translation updates and return a new list that contains only updates
+         * that apply to the current site.
+         *
+         * @param array $translations
+         * @return array
+         */
+        protected function filterApplicableTranslations($translations) {
+            $languages = array_flip(array_values(get_available_languages()));
+            $installedTranslations = $this->getInstalledTranslations();
+
+            $applicableTranslations = array();
+            foreach($translations as $translation) {
+                //Does it match one of the available core languages?
+                $isApplicable = array_key_exists($translation->language, $languages);
+                //Is it more recent than an already-installed translation?
+                if ( isset($installedTranslations[$translation->language]) ) {
+                    $updateTimestamp = strtotime($translation->updated);
+                    $installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
+                    $isApplicable = $updateTimestamp > $installedTimestamp;
+                }
+
+                if ( $isApplicable ) {
+                    $applicableTranslations[] = $translation;
+                }
+            }
+
+            return $applicableTranslations;
+        }
+
+        /**
+         * Get a list of installed translations for this plugin or theme.
+         *
+         * @return array
+         */
+        protected function getInstalledTranslations() {
+            if ( !function_exists('wp_get_installed_translations') ) {
+                return array();
+            }
+            $installedTranslations = wp_get_installed_translations($this->translationType . 's');
+            if ( isset($installedTranslations[$this->directoryName]) ) {
+                $installedTranslations = $installedTranslations[$this->directoryName];
+            } else {
+                $installedTranslations = array();
+            }
+            return $installedTranslations;
+        }
+
+        /**
+         * Insert translation updates into the list maintained by WordPress.
+         *
+         * @param stdClass $updates
+         * @return stdClass
+         */
+        public function injectTranslationUpdates($updates) {
+            $translationUpdates = $this->getTranslationUpdates();
+            if ( empty($translationUpdates) ) {
+                return $updates;
+            }
+
+            //Being defensive.
+            if ( !is_object($updates) ) {
+                $updates = new stdClass();
+            }
+            if ( !isset($updates->translations) ) {
+                $updates->translations = array();
+            }
+
+            //In case there's a name collision with a plugin or theme hosted on wordpress.org,
+            //remove any preexisting updates that match our thing.
+            $updates->translations = array_values(array_filter(
+                $updates->translations,
+                array($this, 'isNotMyTranslation')
+            ));
+
+            //Add our updates to the list.
+            foreach($translationUpdates as $update) {
+                $convertedUpdate = array_merge(
+                    array(
+                        'type' => $this->translationType,
+                        'slug' => $this->directoryName,
+                        'autoupdate' => 0,
+                        //AFAICT, WordPress doesn't actually use the "version" field for anything.
+                        //But lets make sure it's there, just in case.
+                        'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
+                    ),
+                    (array)$update
+                );
+
+                $updates->translations[] = $convertedUpdate;
+            }
+
+            return $updates;
+        }
+
+        /**
+         * Get a list of available translation updates.
+         *
+         * This method will return an empty array if there are no updates.
+         * Uses cached update data.
+         *
+         * @return array
+         */
+        public function getTranslationUpdates() {
+            return $this->updateState->getTranslations();
+        }
+
+        /**
+         * Remove all cached translation updates.
+         *
+         * @see wp_clean_update_cache
+         */
+        public function clearCachedTranslationUpdates() {
+            $this->updateState->setTranslations(array());
+        }
+
+        /**
+         * Filter callback. Keeps only translations that *don't* match this plugin or theme.
+         *
+         * @param array $translation
+         * @return bool
+         */
+        protected function isNotMyTranslation($translation) {
+            $isMatch = isset($translation['type'], $translation['slug'])
+                && ($translation['type'] === $this->translationType)
+                && ($translation['slug'] === $this->directoryName);
+
+            return !$isMatch;
+        }
+
+        /* -------------------------------------------------------------------
 		 * Fix directory name when installing updates
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Rename the update directory to match the existing plugin/theme directory.
-		 *
-		 * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
-		 * exactly one directory, and that the directory name will be the same as the directory where
-		 * the plugin or theme is currently installed.
-		 *
-		 * GitHub and other repositories provide ZIP downloads, but they often use directory names like
-		 * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
-		 *
-		 * This is a hook callback. Don't call it from a plugin.
-		 *
-		 * @access protected
-		 *
-		 * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
-		 * @param string $remoteSource WordPress has extracted the update to this directory.
-		 * @param WP_Upgrader $upgrader
-		 * @return string|WP_Error
-		 */
-		public function fixDirectoryName($source, $remoteSource, $upgrader) {
-			global $wp_filesystem;
-			/** @var WP_Filesystem_Base $wp_filesystem */
-
-			//Basic sanity checks.
-			if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
-				return $source;
-			}
-
-			//If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
-			if ( !$this->isBeingUpgraded($upgrader) ) {
-				return $source;
-			}
-
-			//Rename the source to match the existing directory.
-			$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
-			if ( $source !== $correctedSource ) {
-				//The update archive should contain a single directory that contains the rest of plugin/theme files.
-				//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
-				//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
-				//after update.
-				if ( $this->isBadDirectoryStructure($remoteSource) ) {
-					return new WP_Error(
-						'puc-incorrect-directory-structure',
-						sprintf(
-							'The directory structure of the update is incorrect. All files should be inside ' .
-							'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
-							htmlentities($this->slug)
-						)
-					);
-				}
-
-				/** @var WP_Upgrader_Skin $upgrader ->skin */
-				$upgrader->skin->feedback(sprintf(
-					'Renaming %s to %s&#8230;',
-					'<span class="code">' . basename($source) . '</span>',
-					'<span class="code">' . $this->directoryName . '</span>'
-				));
-
-				if ( $wp_filesystem->move($source, $correctedSource, true) ) {
-					$upgrader->skin->feedback('Directory successfully renamed.');
-					return $correctedSource;
-				} else {
-					return new WP_Error(
-						'puc-rename-failed',
-						'Unable to rename the update to match the existing directory.'
-					);
-				}
-			}
-
-			return $source;
-		}
-
-		/**
-		 * Is there an update being installed right now, for this plugin or theme?
-		 *
-		 * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
-		 * @return bool
-		 */
-		abstract public function isBeingUpgraded($upgrader = null);
-
-		/**
-		 * Check for incorrect update directory structure. An update must contain a single directory,
-		 * all other files should be inside that directory.
-		 *
-		 * @param string $remoteSource Directory path.
-		 * @return bool
-		 */
-		protected function isBadDirectoryStructure($remoteSource) {
-			global $wp_filesystem;
-			/** @var WP_Filesystem_Base $wp_filesystem */
-
-			$sourceFiles = $wp_filesystem->dirlist($remoteSource);
-			if ( is_array($sourceFiles) ) {
-				$sourceFiles = array_keys($sourceFiles);
-				$firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
-				return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
-			}
-
-			//Assume it's fine.
-			return false;
-		}
-
-		/* -------------------------------------------------------------------
+        /**
+         * Rename the update directory to match the existing plugin/theme directory.
+         *
+         * When WordPress installs a plugin or theme update, it assumes that the ZIP file will contain
+         * exactly one directory, and that the directory name will be the same as the directory where
+         * the plugin or theme is currently installed.
+         *
+         * GitHub and other repositories provide ZIP downloads, but they often use directory names like
+         * "project-branch" or "project-tag-hash". We need to change the name to the actual plugin folder.
+         *
+         * This is a hook callback. Don't call it from a plugin.
+         *
+         * @access protected
+         *
+         * @param string $source The directory to copy to /wp-content/plugins or /wp-content/themes. Usually a subdirectory of $remoteSource.
+         * @param string $remoteSource WordPress has extracted the update to this directory.
+         * @param WP_Upgrader $upgrader
+         * @return string|WP_Error
+         */
+        public function fixDirectoryName($source, $remoteSource, $upgrader) {
+            global $wp_filesystem;
+            /** @var WP_Filesystem_Base $wp_filesystem */
+
+            //Basic sanity checks.
+            if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
+                return $source;
+            }
+
+            //If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
+            if ( !$this->isBeingUpgraded($upgrader) ) {
+                return $source;
+            }
+
+            //Rename the source to match the existing directory.
+            $correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
+            if ( $source !== $correctedSource ) {
+                //The update archive should contain a single directory that contains the rest of plugin/theme files.
+                //Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
+                //We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
+                //after update.
+                if ( $this->isBadDirectoryStructure($remoteSource) ) {
+                    return new WP_Error(
+                        'puc-incorrect-directory-structure',
+                        sprintf(
+                            'The directory structure of the update is incorrect. All files should be inside ' .
+                            'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
+                            htmlentities($this->slug)
+                        )
+                    );
+                }
+
+                /** @var WP_Upgrader_Skin $upgrader ->skin */
+                $upgrader->skin->feedback(sprintf(
+                    'Renaming %s to %s&#8230;',
+                    '<span class="code">' . basename($source) . '</span>',
+                    '<span class="code">' . $this->directoryName . '</span>'
+                ));
+
+                if ( $wp_filesystem->move($source, $correctedSource, true) ) {
+                    $upgrader->skin->feedback('Directory successfully renamed.');
+                    return $correctedSource;
+                } else {
+                    return new WP_Error(
+                        'puc-rename-failed',
+                        'Unable to rename the update to match the existing directory.'
+                    );
+                }
+            }
+
+            return $source;
+        }
+
+        /**
+         * Is there an update being installed right now, for this plugin or theme?
+         *
+         * @param WP_Upgrader|null $upgrader The upgrader that's performing the current update.
+         * @return bool
+         */
+        abstract public function isBeingUpgraded($upgrader = null);
+
+        /**
+         * Check for incorrect update directory structure. An update must contain a single directory,
+         * all other files should be inside that directory.
+         *
+         * @param string $remoteSource Directory path.
+         * @return bool
+         */
+        protected function isBadDirectoryStructure($remoteSource) {
+            global $wp_filesystem;
+            /** @var WP_Filesystem_Base $wp_filesystem */
+
+            $sourceFiles = $wp_filesystem->dirlist($remoteSource);
+            if ( is_array($sourceFiles) ) {
+                $sourceFiles = array_keys($sourceFiles);
+                $firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
+                return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
+            }
+
+            //Assume it's fine.
+            return false;
+        }
+
+        /* -------------------------------------------------------------------
 		 * File header parsing
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Parse plugin or theme metadata from the header comment.
-		 *
-		 * This is basically a simplified version of the get_file_data() function from /wp-includes/functions.php.
-		 * It's intended as a utility for subclasses that detect updates by parsing files in a VCS.
-		 *
-		 * @param string|null $content File contents.
-		 * @return string[]
-		 */
-		public function getFileHeader($content) {
-			$content = (string) $content;
-
-			//WordPress only looks at the first 8 KiB of the file, so we do the same.
-			$content = substr($content, 0, 8192);
-			//Normalize line endings.
-			$content = str_replace("\r", "\n", $content);
-
-			$headers = $this->getHeaderNames();
-			$results = array();
-			foreach ($headers as $field => $name) {
-				$success = preg_match('/^[ \t\/*#@]*' . preg_quote($name, '/') . ':(.*)$/mi', $content, $matches);
-
-				if ( ($success === 1) && $matches[1] ) {
-					$value = $matches[1];
-					if ( function_exists('_cleanup_header_comment') ) {
-						$value = _cleanup_header_comment($value);
-					}
-					$results[$field] = $value;
-				} else {
-					$results[$field] = '';
-				}
-			}
-
-			return $results;
-		}
-
-		/**
-		 * @return array Format: ['HeaderKey' => 'Header Name']
-		 */
-		abstract protected function getHeaderNames();
-
-		/* -------------------------------------------------------------------
+        /**
+         * Parse plugin or theme metadata from the header comment.
+         *
+         * This is basically a simplified version of the get_file_data() function from /wp-includes/functions.php.
+         * It's intended as a utility for subclasses that detect updates by parsing files in a VCS.
+         *
+         * @param string|null $content File contents.
+         * @return string[]
+         */
+        public function getFileHeader($content) {
+            $content = (string) $content;
+
+            //WordPress only looks at the first 8 KiB of the file, so we do the same.
+            $content = substr($content, 0, 8192);
+            //Normalize line endings.
+            $content = str_replace("\r", "\n", $content);
+
+            $headers = $this->getHeaderNames();
+            $results = array();
+            foreach ($headers as $field => $name) {
+                $success = preg_match('/^[ \t\/*#@]*' . preg_quote($name, '/') . ':(.*)$/mi', $content, $matches);
+
+                if ( ($success === 1) && $matches[1] ) {
+                    $value = $matches[1];
+                    if ( function_exists('_cleanup_header_comment') ) {
+                        $value = _cleanup_header_comment($value);
+                    }
+                    $results[$field] = $value;
+                } else {
+                    $results[$field] = '';
+                }
+            }
+
+            return $results;
+        }
+
+        /**
+         * @return array Format: ['HeaderKey' => 'Header Name']
+         */
+        abstract protected function getHeaderNames();
+
+        /* -------------------------------------------------------------------
 		 * DebugBar integration
 		 * -------------------------------------------------------------------
 		 */
 
-		/**
-		 * Initialize the update checker Debug Bar plugin/add-on thingy.
-		 */
-		public function maybeInitDebugBar() {
-			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__ . '/DebugBar')) ) {
-				$this->createDebugBarExtension();
-			}
-		}
-
-		protected function createDebugBarExtension() {
-			return new Puc_v4p4_DebugBar_Extension($this);
-		}
-
-		/**
-		 * Display additional configuration details in the Debug Bar panel.
-		 *
-		 * @param Puc_v4p4_DebugBar_Panel $panel
-		 */
-		public function onDisplayConfiguration($panel) {
-			//Do nothing. Subclasses can use this to add additional info to the panel.
-		}
-
-	}
+        /**
+         * Initialize the update checker Debug Bar plugin/add-on thingy.
+         */
+        public function maybeInitDebugBar() {
+            if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__ . '/DebugBar')) ) {
+                $this->createDebugBarExtension();
+            }
+        }
+
+        protected function createDebugBarExtension() {
+            return new Puc_v4p4_DebugBar_Extension($this);
+        }
+
+        /**
+         * Display additional configuration details in the Debug Bar panel.
+         *
+         * @param Puc_v4p4_DebugBar_Panel $panel
+         */
+        public function onDisplayConfiguration($panel) {
+            //Do nothing. Subclasses can use this to add additional info to the panel.
+        }
+
+    }
 
 endif;

Spacing +68 added lines, -68 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( !class_exists('Puc_v4p4_UpdateChecker', false) ):
+if (!class_exists('Puc_v4p4_UpdateChecker', false)):
 
 	abstract class Puc_v4p4_UpdateChecker {
 		protected $filterSuffix = '';
@@ -56,17 +56,17 @@ 
 		protected $lastRequestApiErrors = array();
 
 		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
-			$this->debugMode = (bool)(constant('WP_DEBUG'));
+			$this->debugMode = (bool) (constant('WP_DEBUG'));
 			$this->metadataUrl = $metadataUrl;
 			$this->directoryName = $directoryName;
 			$this->slug = !empty($slug) ? $slug : $this->directoryName;
 
 			$this->optionName = $optionName;
-			if ( empty($this->optionName) ) {
+			if (empty($this->optionName)) {
 				//BC: Initially the library only supported plugin updates and didn't use type prefixes
 				//in the option name. Lets use the same prefix-less name when possible.
-				if ( $this->filterSuffix === '' ) {
-					$this->optionName = 'external_updates-' . $this->slug;
+				if ($this->filterSuffix === '') {
+					$this->optionName = 'external_updates-'.$this->slug;
 				} else {
 					$this->optionName = $this->getUniqueName('external_updates');
 				}
@@ -76,7 +76,7 @@ 
 			$this->upgraderStatus = new Puc_v4p4_UpgraderStatus();
 			$this->updateState = new Puc_v4p4_StateStore($this->optionName);
 
-			if ( did_action('init') ) {
+			if (did_action('init')) {
 				$this->loadTextDomain();
 			} else {
 				add_action('init', array($this, 'loadTextDomain'));
@@ -98,31 +98,31 @@ 
 				$domain
 			);
 
-			$moFile = $domain . '-' . $locale . '.mo';
-			$path = realpath(dirname(__FILE__) . '/../../languages');
+			$moFile = $domain.'-'.$locale.'.mo';
+			$path = realpath(dirname(__FILE__).'/../../languages');
 
 			if ($path && file_exists($path)) {
-				load_textdomain($domain, $path . '/' . $moFile);
+				load_textdomain($domain, $path.'/'.$moFile);
 			}
 		}
 
 		protected function installHooks() {
 			//Insert our update info into the update array maintained by WP.
-			add_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
+			add_filter('site_transient_'.$this->updateTransient, array($this, 'injectUpdate'));
 
 			//Insert translation updates into the update list.
-			add_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+			add_filter('site_transient_'.$this->updateTransient, array($this, 'injectTranslationUpdates'));
 
 			//Clear translation updates when WP clears the update cache.
 			//This needs to be done directly because the library doesn't actually remove obsolete plugin updates,
 			//it just hides them (see getUpdate()). We can't do that with translations - too much disk I/O.
 			add_action(
-				'delete_site_transient_' . $this->updateTransient,
+				'delete_site_transient_'.$this->updateTransient,
 				array($this, 'clearCachedTranslationUpdates')
 			);
 
 			//Rename the update directory to be the same as the existing directory.
-			if ( $this->directoryName !== '.' ) {
+			if ($this->directoryName !== '.') {
 				add_filter('upgrader_source_selection', array($this, 'fixDirectoryName'), 10, 3);
 			}
 
@@ -130,7 +130,7 @@ 
 			add_filter('http_request_host_is_external', array($this, 'allowMetadataHost'), 10, 2);
 
 			//DebugBar integration.
-			if ( did_action('plugins_loaded') ) {
+			if (did_action('plugins_loaded')) {
 				$this->maybeInitDebugBar();
 			} else {
 				add_action('plugins_loaded', array($this, 'maybeInitDebugBar'));
@@ -141,10 +141,10 @@ 
 		 * Remove hooks that were added by this update checker instance.
 		 */
 		protected function removeHooks() {
-			remove_filter('site_transient_' . $this->updateTransient, array($this,'injectUpdate'));
-			remove_filter('site_transient_' . $this->updateTransient, array($this, 'injectTranslationUpdates'));
+			remove_filter('site_transient_'.$this->updateTransient, array($this, 'injectUpdate'));
+			remove_filter('site_transient_'.$this->updateTransient, array($this, 'injectTranslationUpdates'));
 			remove_action(
-				'delete_site_transient_' . $this->updateTransient,
+				'delete_site_transient_'.$this->updateTransient,
 				array($this, 'clearCachedTranslationUpdates')
 			);
 
@@ -182,11 +182,11 @@ 
 		 */
 		public function allowMetadataHost($allow, $host) {
 			static $metadataHost = 0; //Using 0 instead of NULL because parse_url can return NULL.
-			if ( $metadataHost === 0 ) {
+			if ($metadataHost === 0) {
 				$metadataHost = @parse_url($this->metadataUrl, PHP_URL_HOST);
 			}
 
-			if ( is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost)) ) {
+			if (is_string($metadataHost) && (strtolower($host) === strtolower($metadataHost))) {
 				return true;
 			}
 			return $allow;
@@ -211,7 +211,7 @@ 
 		public function checkForUpdates() {
 			$installedVersion = $this->getInstalledVersion();
 			//Fail silently if we can't find the plugin/theme or read its header.
-			if ( $installedVersion === null ) {
+			if ($installedVersion === null) {
 				$this->triggerError(
 					sprintf('Skipping update check for %s - installed version unknown.', $this->slug),
 					E_USER_WARNING
@@ -271,10 +271,10 @@ 
 			$update = $this->updateState->getUpdate();
 
 			//Is there an update available?
-			if ( isset($update) ) {
+			if (isset($update)) {
 				//Check if the update is actually newer than the currently installed version.
 				$installedVersion = $this->getInstalledVersion();
-				if ( ($installedVersion !== null) && version_compare($update->version, $installedVersion, '>') ){
+				if (($installedVersion !== null) && version_compare($update->version, $installedVersion, '>')) {
 					return $update;
 				}
 			}
@@ -301,7 +301,7 @@ 
 			//Let plugins/themes modify the update.
 			$update = apply_filters($this->getUniqueName('request_update_result'), $update, $httpResult);
 
-			if ( isset($update, $update->translations) ) {
+			if (isset($update, $update->translations)) {
 				//Keep only those translation updates that apply to this site.
 				$update->translations = $this->filterApplicableTranslations($update->translations);
 			}
@@ -345,11 +345,11 @@ 
 		 * @return string
 		 */
 		public function getUniqueName($baseTag) {
-			$name = 'puc_' . $baseTag;
+			$name = 'puc_'.$baseTag;
 			if ($this->filterSuffix !== '') {
-				$name .= '_' . $this->filterSuffix;
+				$name .= '_'.$this->filterSuffix;
 			}
-			return $name . '-' . $this->slug;
+			return $name.'-'.$this->slug;
 		}
 
 		/**
@@ -362,7 +362,7 @@ 
 		 * @param string|null $slug
 		 */
 		public function collectApiErrors($error, $httpResponse = null, $url = null, $slug = null) {
-			if ( isset($slug) && ($slug !== $this->slug) ) {
+			if (isset($slug) && ($slug !== $this->slug)) {
 				return;
 			}
 
@@ -416,11 +416,11 @@ 
 			//Is there an update to insert?
 			$update = $this->getUpdate();
 
-			if ( !$this->shouldShowUpdates() ) {
+			if (!$this->shouldShowUpdates()) {
 				$update = null;
 			}
 
-			if ( !empty($update) ) {
+			if (!empty($update)) {
 				//Let plugins filter the update info before it's passed on to WordPress.
 				$update = apply_filters($this->getUniqueName('pre_inject_update'), $update);
 				$updates = $this->addUpdateToList($updates, $update->toWpFormat());
@@ -438,7 +438,7 @@ 
 		 * @return stdClass
 		 */
 		protected function addUpdateToList($updates, $updateToAdd) {
-			if ( !is_object($updates) ) {
+			if (!is_object($updates)) {
 				$updates = new stdClass();
 				$updates->response = array();
 			}
@@ -452,7 +452,7 @@ 
 		 * @return stdClass|null
 		 */
 		protected function removeUpdateFromList($updates) {
-			if ( isset($updates, $updates->response) ) {
+			if (isset($updates, $updates->response)) {
 				unset($updates->response[$this->getUpdateListKey()]);
 			}
 			return $updates;
@@ -506,7 +506,7 @@ 
 				),
 				$queryArgs
 			);
-			$queryArgs = apply_filters($this->getUniqueName($filterRoot . '_query_args'), $queryArgs);
+			$queryArgs = apply_filters($this->getUniqueName($filterRoot.'_query_args'), $queryArgs);
 
 			//Various options for the wp_remote_get() call. Plugins can filter these, too.
 			$options = array(
@@ -515,11 +515,11 @@ 
 					'Accept' => 'application/json',
 				),
 			);
-			$options = apply_filters($this->getUniqueName($filterRoot . '_options'), $options);
+			$options = apply_filters($this->getUniqueName($filterRoot.'_options'), $options);
 
 			//The metadata file should be at 'http://your-api.com/url/here/$slug/info.json'
 			$url = $this->metadataUrl;
-			if ( !empty($queryArgs) ){
+			if (!empty($queryArgs)) {
 				$url = add_query_arg($queryArgs, $url);
 			}
 
@@ -530,7 +530,7 @@ 
 			//Try to parse the response
 			$status = $this->validateApiResponse($result);
 			$metadata = null;
-			if ( !is_wp_error($status) ){
+			if (!is_wp_error($status)) {
 				$metadata = call_user_func(array($metaClass, 'fromJson'), $result['body']);
 			} else {
 				do_action('puc_api_error', $status, $result, $url, $this->slug);
@@ -551,25 +551,25 @@ 
 		 * @return true|WP_Error
 		 */
 		protected function validateApiResponse($result) {
-			if ( is_wp_error($result) ) { /** @var WP_Error $result */
-				return new WP_Error($result->get_error_code(), 'WP HTTP Error: ' . $result->get_error_message());
+			if (is_wp_error($result)) { /** @var WP_Error $result */
+				return new WP_Error($result->get_error_code(), 'WP HTTP Error: '.$result->get_error_message());
 			}
 
-			if ( !isset($result['response']['code']) ) {
+			if (!isset($result['response']['code'])) {
 				return new WP_Error(
 					'puc_no_response_code',
 					'wp_remote_get() returned an unexpected result.'
 				);
 			}
 
-			if ( $result['response']['code'] !== 200 ) {
+			if ($result['response']['code'] !== 200) {
 				return new WP_Error(
 					'puc_unexpected_response_code',
-					'HTTP response code is ' . $result['response']['code'] . ' (expected: 200)'
+					'HTTP response code is '.$result['response']['code'].' (expected: 200)'
 				);
 			}
 
-			if ( empty($result['body']) ) {
+			if (empty($result['body'])) {
 				return new WP_Error('puc_empty_response', 'The metadata file appears to be empty.');
 			}
 
@@ -593,17 +593,17 @@ 
 			$installedTranslations = $this->getInstalledTranslations();
 
 			$applicableTranslations = array();
-			foreach($translations as $translation) {
+			foreach ($translations as $translation) {
 				//Does it match one of the available core languages?
 				$isApplicable = array_key_exists($translation->language, $languages);
 				//Is it more recent than an already-installed translation?
-				if ( isset($installedTranslations[$translation->language]) ) {
+				if (isset($installedTranslations[$translation->language])) {
 					$updateTimestamp = strtotime($translation->updated);
 					$installedTimestamp = strtotime($installedTranslations[$translation->language]['PO-Revision-Date']);
 					$isApplicable = $updateTimestamp > $installedTimestamp;
 				}
 
-				if ( $isApplicable ) {
+				if ($isApplicable) {
 					$applicableTranslations[] = $translation;
 				}
 			}
@@ -617,11 +617,11 @@ 
 		 * @return array
 		 */
 		protected function getInstalledTranslations() {
-			if ( !function_exists('wp_get_installed_translations') ) {
+			if (!function_exists('wp_get_installed_translations')) {
 				return array();
 			}
-			$installedTranslations = wp_get_installed_translations($this->translationType . 's');
-			if ( isset($installedTranslations[$this->directoryName]) ) {
+			$installedTranslations = wp_get_installed_translations($this->translationType.'s');
+			if (isset($installedTranslations[$this->directoryName])) {
 				$installedTranslations = $installedTranslations[$this->directoryName];
 			} else {
 				$installedTranslations = array();
@@ -637,15 +637,15 @@ 
 		 */
 		public function injectTranslationUpdates($updates) {
 			$translationUpdates = $this->getTranslationUpdates();
-			if ( empty($translationUpdates) ) {
+			if (empty($translationUpdates)) {
 				return $updates;
 			}
 
 			//Being defensive.
-			if ( !is_object($updates) ) {
+			if (!is_object($updates)) {
 				$updates = new stdClass();
 			}
-			if ( !isset($updates->translations) ) {
+			if (!isset($updates->translations)) {
 				$updates->translations = array();
 			}
 
@@ -657,7 +657,7 @@ 
 			));
 
 			//Add our updates to the list.
-			foreach($translationUpdates as $update) {
+			foreach ($translationUpdates as $update) {
 				$convertedUpdate = array_merge(
 					array(
 						'type' => $this->translationType,
@@ -665,9 +665,9 @@ 
 						'autoupdate' => 0,
 						//AFAICT, WordPress doesn't actually use the "version" field for anything.
 						//But lets make sure it's there, just in case.
-						'version' => isset($update->version) ? $update->version : ('1.' . strtotime($update->updated)),
+						'version' => isset($update->version) ? $update->version : ('1.'.strtotime($update->updated)),
 					),
-					(array)$update
+					(array) $update
 				);
 
 				$updates->translations[] = $convertedUpdate;
@@ -740,27 +740,27 @@ 
 			/** @var WP_Filesystem_Base $wp_filesystem */
 
 			//Basic sanity checks.
-			if ( !isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem) ) {
+			if (!isset($source, $remoteSource, $upgrader, $upgrader->skin, $wp_filesystem)) {
 				return $source;
 			}
 
 			//If WordPress is upgrading anything other than our plugin/theme, leave the directory name unchanged.
-			if ( !$this->isBeingUpgraded($upgrader) ) {
+			if (!$this->isBeingUpgraded($upgrader)) {
 				return $source;
 			}
 
 			//Rename the source to match the existing directory.
-			$correctedSource = trailingslashit($remoteSource) . $this->directoryName . '/';
-			if ( $source !== $correctedSource ) {
+			$correctedSource = trailingslashit($remoteSource).$this->directoryName.'/';
+			if ($source !== $correctedSource) {
 				//The update archive should contain a single directory that contains the rest of plugin/theme files.
 				//Otherwise, WordPress will try to copy the entire working directory ($source == $remoteSource).
 				//We can't rename $remoteSource because that would break WordPress code that cleans up temporary files
 				//after update.
-				if ( $this->isBadDirectoryStructure($remoteSource) ) {
+				if ($this->isBadDirectoryStructure($remoteSource)) {
 					return new WP_Error(
 						'puc-incorrect-directory-structure',
 						sprintf(
-							'The directory structure of the update is incorrect. All files should be inside ' .
+							'The directory structure of the update is incorrect. All files should be inside '.
 							'a directory named <span class="code">%s</span>, not at the root of the ZIP archive.',
 							htmlentities($this->slug)
 						)
@@ -770,11 +770,11 @@ 
 				/** @var WP_Upgrader_Skin $upgrader ->skin */
 				$upgrader->skin->feedback(sprintf(
 					'Renaming %s to %s&#8230;',
-					'<span class="code">' . basename($source) . '</span>',
-					'<span class="code">' . $this->directoryName . '</span>'
+					'<span class="code">'.basename($source).'</span>',
+					'<span class="code">'.$this->directoryName.'</span>'
 				));
 
-				if ( $wp_filesystem->move($source, $correctedSource, true) ) {
+				if ($wp_filesystem->move($source, $correctedSource, true)) {
 					$upgrader->skin->feedback('Directory successfully renamed.');
 					return $correctedSource;
 				} else {
@@ -808,9 +808,9 @@ 
 			/** @var WP_Filesystem_Base $wp_filesystem */
 
 			$sourceFiles = $wp_filesystem->dirlist($remoteSource);
-			if ( is_array($sourceFiles) ) {
+			if (is_array($sourceFiles)) {
 				$sourceFiles = array_keys($sourceFiles);
-				$firstFilePath = trailingslashit($remoteSource) . $sourceFiles[0];
+				$firstFilePath = trailingslashit($remoteSource).$sourceFiles[0];
 				return (count($sourceFiles) > 1) || (!$wp_filesystem->is_dir($firstFilePath));
 			}
 
@@ -843,11 +843,11 @@ 
 			$headers = $this->getHeaderNames();
 			$results = array();
 			foreach ($headers as $field => $name) {
-				$success = preg_match('/^[ \t\/*#@]*' . preg_quote($name, '/') . ':(.*)$/mi', $content, $matches);
+				$success = preg_match('/^[ \t\/*#@]*'.preg_quote($name, '/').':(.*)$/mi', $content, $matches);
 
-				if ( ($success === 1) && $matches[1] ) {
+				if (($success === 1) && $matches[1]) {
 					$value = $matches[1];
-					if ( function_exists('_cleanup_header_comment') ) {
+					if (function_exists('_cleanup_header_comment')) {
 						$value = _cleanup_header_comment($value);
 					}
 					$results[$field] = $value;
@@ -873,7 +873,7 @@ 
 		 * Initialize the update checker Debug Bar plugin/add-on thingy.
 		 */
 		public function maybeInitDebugBar() {
-			if ( class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__ . '/DebugBar')) ) {
+			if (class_exists('Debug_Bar', false) && file_exists(dirname(__FILE__.'/DebugBar'))) {
 				$this->createDebugBarExtension();
 			}
 		}

classes/external/php/plugin-update-checker/Puc/v4/Factory.php

Indentation +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 if ( !class_exists('Puc_v4_Factory', false) ):
 
-	class Puc_v4_Factory extends Puc_v4p4_Factory { }
+    class Puc_v4_Factory extends Puc_v4p4_Factory { }
 
 endif;
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if ( !class_exists('Puc_v4_Factory', false) ):
+if (!class_exists('Puc_v4_Factory', false)):
 
 	class Puc_v4_Factory extends Puc_v4p4_Factory { }
 

classes/autoptimizeCacheChecker.php

Spacing +38 added lines, -38 removed lines

@@ -6,7 +6,7 @@ 
  * Checks if cachesize is > 0.5GB (size is filterable), if so, an option is set which controls showing an admin notice.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -25,51 +25,51 @@ 
 
     public function add_hooks()
     {
-        if ( is_admin() ) {
-            add_action( 'plugins_loaded', array( $this, 'setup' ) );
+        if (is_admin()) {
+            add_action('plugins_loaded', array($this, 'setup'));
         }
-        add_action( self::SCHEDULE_HOOK, array( $this, 'cronjob' ) );
-        add_action( 'admin_notices', array( $this, 'show_admin_notice' ) );
+        add_action(self::SCHEDULE_HOOK, array($this, 'cronjob'));
+        add_action('admin_notices', array($this, 'show_admin_notice'));
     }
 
     public function setup()
     {
-        $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true );
-        $schedule       = wp_get_schedule( self::SCHEDULE_HOOK );
-        $frequency      = apply_filters( 'autoptimize_filter_cachecheck_frequency', 'twicedaily' );
-        if ( ! in_array( $frequency, array( 'hourly', 'twicedaily', 'daily', 'weekly', 'monthly' ) ) ) {
+        $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
+        $schedule       = wp_get_schedule(self::SCHEDULE_HOOK);
+        $frequency      = apply_filters('autoptimize_filter_cachecheck_frequency', 'twicedaily');
+        if (!in_array($frequency, array('hourly', 'twicedaily', 'daily', 'weekly', 'monthly'))) {
             $frequency = 'twicedaily';
         }
-        if ( $do_cache_check && ( ! $schedule || $schedule !== $frequency ) ) {
-            if ( $schedule ) {
-                wp_clear_scheduled_hook( self::SCHEDULE_HOOK );
+        if ($do_cache_check && (!$schedule || $schedule !== $frequency)) {
+            if ($schedule) {
+                wp_clear_scheduled_hook(self::SCHEDULE_HOOK);
             }
-            wp_schedule_event( time(), $frequency, self::SCHEDULE_HOOK );
-        } elseif ( $schedule && ! $do_cache_check ) {
-            wp_clear_scheduled_hook( self::SCHEDULE_HOOK );
+            wp_schedule_event(time(), $frequency, self::SCHEDULE_HOOK);
+        } elseif ($schedule && !$do_cache_check) {
+            wp_clear_scheduled_hook(self::SCHEDULE_HOOK);
         }
     }
 
     public function cronjob()
     {
         // Check cachesize and act accordingly.
-        $max_size       = (int) apply_filters( 'autoptimize_filter_cachecheck_maxsize', 536870912 );
-        $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true );
+        $max_size       = (int) apply_filters('autoptimize_filter_cachecheck_maxsize', 536870912);
+        $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
         $stat_array     = autoptimizeCache::stats();
-        $cache_size     = round( $stat_array[1] );
-        if ( ( $cache_size > $max_size ) && ( $do_cache_check ) ) {
-            update_option( 'autoptimize_cachesize_notice', true );
-            if ( apply_filters( 'autoptimize_filter_cachecheck_sendmail', true ) ) {
-                $site_url  = esc_url( site_url() );
-                $ao_mailto = apply_filters( 'autoptimize_filter_cachecheck_mailto', get_option( 'admin_email', '' ) );
-
-                $ao_mailsubject = __( 'Autoptimize cache size warning', 'autoptimize' ) . ' (' . $site_url . ')';
-                $ao_mailbody    = __( 'Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize' ) . ' (site: ' . $site_url . ')';
-
-                if ( ! empty( $ao_mailto ) ) {
-                    $ao_mailresult = wp_mail( $ao_mailto, $ao_mailsubject, $ao_mailbody );
-                    if ( ! $ao_mailresult ) {
-                        error_log( 'Autoptimize could not send cache size warning mail.' );
+        $cache_size     = round($stat_array[1]);
+        if (($cache_size > $max_size) && ($do_cache_check)) {
+            update_option('autoptimize_cachesize_notice', true);
+            if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) {
+                $site_url  = esc_url(site_url());
+                $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', ''));
+
+                $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize').' ('.$site_url.')';
+                $ao_mailbody    = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize').' (site: '.$site_url.')';
+
+                if (!empty($ao_mailto)) {
+                    $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody);
+                    if (!$ao_mailresult) {
+                        error_log('Autoptimize could not send cache size warning mail.');
                     }
                 }
             }
@@ -87,16 +87,16 @@ 
 
     public function show_admin_notice()
     {
-        if ( (bool) get_option( 'autoptimize_cachesize_notice', false ) && current_user_can( 'manage_options' ) ) {
+        if ((bool) get_option('autoptimize_cachesize_notice', false) && current_user_can('manage_options')) {
             echo '<div class="notice notice-warning"><p>';
-            _e( '<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' );
+            _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize');
             echo '</p></div>';
-            update_option( 'autoptimize_cachesize_notice', false );
+            update_option('autoptimize_cachesize_notice', false);
         }
 
         // Notice for image proxy usage.
         $_imgopt_notice = autoptimizeImages::instance()->get_status_notice();
-        if ( current_user_can( 'manage_options' ) && is_array( $_imgopt_notice ) && array_key_exists( 'status', $_imgopt_notice ) && in_array( $_imgopt_notice['status'], array( 1, -1, -2 ) ) ) {
+        if (current_user_can('manage_options') && is_array($_imgopt_notice) && array_key_exists('status', $_imgopt_notice) && in_array($_imgopt_notice['status'], array(1, -1, -2))) {
             $_dismissible = 'ao-img-opt-notice-';
             $_hide_notice = '7';
 
@@ -104,10 +104,10 @@ 
                 $_hide_notice = '1';
             }
 
-            $_imgopt_notice_dismissible = apply_filters( 'autoptimize_filter_imgopt_notice_dismissable', $_dismissible . $_hide_notice );
+            $_imgopt_notice_dismissible = apply_filters('autoptimize_filter_imgopt_notice_dismissable', $_dismissible.$_hide_notice);
 
-            if ( $_imgopt_notice && PAnD::is_admin_notice_active( $_imgopt_notice_dismissible ) ) {
-                echo '<div class="notice notice-warning is-dismissible" data-dismissible="' . $_imgopt_notice_dismissible . '"><p>' . $_imgopt_notice['notice'] . '</p></div>';
+            if ($_imgopt_notice && PAnD::is_admin_notice_active($_imgopt_notice_dismissible)) {
+                echo '<div class="notice notice-warning is-dismissible" data-dismissible="'.$_imgopt_notice_dismissible.'"><p>'.$_imgopt_notice['notice'].'</p></div>';
             }
         }
     }