moonstonemedia / Simple-Calendar

google-calendar-events.php

Spacing +11 added lines, -11 removed lines

@@ -14,24 +14,24 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Plugin constants.
-$this_plugin_path      = trailingslashit( dirname( __FILE__ ) );
-$this_plugin_dir       = plugin_dir_url( __FILE__ );
+$this_plugin_path      = trailingslashit(dirname(__FILE__));
+$this_plugin_dir       = plugin_dir_url(__FILE__);
 $this_plugin_constants = array(
 	'SIMPLE_CALENDAR_VERSION'   => '3.0.15',
 	'SIMPLE_CALENDAR_MAIN_FILE' => __FILE__,
 	'SIMPLE_CALENDAR_URL'       => $this_plugin_dir,
-	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir . 'assets/',
+	'SIMPLE_CALENDAR_ASSETS'    => $this_plugin_dir.'assets/',
 	'SIMPLE_CALENDAR_PATH'      => $this_plugin_path,
-	'SIMPLE_CALENDAR_INC'       => $this_plugin_path . 'includes/',
+	'SIMPLE_CALENDAR_INC'       => $this_plugin_path.'includes/',
 );
-foreach ( $this_plugin_constants as $constant => $value ) {
-	if ( ! defined( $constant ) ) {
-		define( $constant, $value );
+foreach ($this_plugin_constants as $constant => $value) {
+	if ( ! defined($constant)) {
+		define($constant, $value);
 	}
 }
 
@@ -40,7 +40,7 @@ 
 include_once 'includes/wp-requirements.php';
 
 // Check plugin requirements before loading plugin.
-$this_plugin_checks = new SimCal_WP_Requirements( 'Simple Calendar', plugin_basename( __FILE__ ), array(
+$this_plugin_checks = new SimCal_WP_Requirements('Simple Calendar', plugin_basename(__FILE__), array(
 		'PHP'        => '5.3.3',
 		'WordPress'  => '4.1',
 		'Extensions' => array(
@@ -49,8 +49,8 @@ 
 			'json',
 			'mbstring',
 		),
-	) );
-if ( $this_plugin_checks->pass() === false ) {
+	));
+if ($this_plugin_checks->pass() === false) {
 	$this_plugin_checks->halt();
 
 	return;

includes/browser.php

Indentation +1211 added lines, -1211 removed lines

@@ -42,1214 +42,1214 @@
 
 
 
-    class Browser
-    {
-        private $_agent = '';
-        private $_browser_name = '';
-        private $_version = '';
-        private $_platform = '';
-        private $_os = '';
-        private $_is_aol = false;
-        private $_is_mobile = false;
-        private $_is_tablet = false;
-        private $_is_robot = false;
-        private $_is_facebook = false;
-        private $_aol_version = '';
-
-        const BROWSER_UNKNOWN = 'unknown';
-        const VERSION_UNKNOWN = 'unknown';
-
-        const BROWSER_OPERA = 'Opera'; // http://www.opera.com/
-        const BROWSER_OPERA_MINI = 'Opera Mini'; // http://www.opera.com/mini/
-        const BROWSER_WEBTV = 'WebTV'; // http://www.webtv.net/pc/
-        const BROWSER_IE = 'Internet Explorer'; // http://www.microsoft.com/ie/
-        const BROWSER_POCKET_IE = 'Pocket Internet Explorer'; // http://en.wikipedia.org/wiki/Internet_Explorer_Mobile
-        const BROWSER_KONQUEROR = 'Konqueror'; // http://www.konqueror.org/
-        const BROWSER_ICAB = 'iCab'; // http://www.icab.de/
-        const BROWSER_OMNIWEB = 'OmniWeb'; // http://www.omnigroup.com/applications/omniweb/
-        const BROWSER_FIREBIRD = 'Firebird'; // http://www.ibphoenix.com/
-        const BROWSER_FIREFOX = 'Firefox'; // http://www.mozilla.com/en-US/firefox/firefox.html
-        const BROWSER_ICEWEASEL = 'Iceweasel'; // http://www.geticeweasel.org/
-        const BROWSER_SHIRETOKO = 'Shiretoko'; // http://wiki.mozilla.org/Projects/shiretoko
-        const BROWSER_MOZILLA = 'Mozilla'; // http://www.mozilla.com/en-US/
-        const BROWSER_AMAYA = 'Amaya'; // http://www.w3.org/Amaya/
-        const BROWSER_LYNX = 'Lynx'; // http://en.wikipedia.org/wiki/Lynx
-        const BROWSER_SAFARI = 'Safari'; // http://apple.com
-        const BROWSER_IPHONE = 'iPhone'; // http://apple.com
-        const BROWSER_IPOD = 'iPod'; // http://apple.com
-        const BROWSER_IPAD = 'iPad'; // http://apple.com
-        const BROWSER_CHROME = 'Chrome'; // http://www.google.com/chrome
-        const BROWSER_ANDROID = 'Android'; // http://www.android.com/
-        const BROWSER_GOOGLEBOT = 'GoogleBot'; // http://en.wikipedia.org/wiki/Googlebot
-        const BROWSER_SLURP = 'Yahoo! Slurp'; // http://en.wikipedia.org/wiki/Yahoo!_Slurp
-        const BROWSER_W3CVALIDATOR = 'W3C Validator'; // http://validator.w3.org/
-        const BROWSER_BLACKBERRY = 'BlackBerry'; // http://www.blackberry.com/
-        const BROWSER_ICECAT = 'IceCat'; // http://en.wikipedia.org/wiki/GNU_IceCat
-        const BROWSER_NOKIA_S60 = 'Nokia S60 OSS Browser'; // http://en.wikipedia.org/wiki/Web_Browser_for_S60
-        const BROWSER_NOKIA = 'Nokia Browser'; // * all other WAP-based browsers on the Nokia Platform
-        const BROWSER_MSN = 'MSN Browser'; // http://explorer.msn.com/
-        const BROWSER_MSNBOT = 'MSN Bot'; // http://search.msn.com/msnbot.htm
-        const BROWSER_BINGBOT = 'Bing Bot'; // http://en.wikipedia.org/wiki/Bingbot
-
-        const BROWSER_NETSCAPE_NAVIGATOR = 'Netscape Navigator'; // http://browser.netscape.com/ (DEPRECATED)
-        const BROWSER_GALEON = 'Galeon'; // http://galeon.sourceforge.net/ (DEPRECATED)
-        const BROWSER_NETPOSITIVE = 'NetPositive'; // http://en.wikipedia.org/wiki/NetPositive (DEPRECATED)
-        const BROWSER_PHOENIX = 'Phoenix'; // http://en.wikipedia.org/wiki/History_of_Mozilla_Firefox (DEPRECATED)
-
-        const PLATFORM_UNKNOWN = 'unknown';
-        const PLATFORM_WINDOWS = 'Windows';
-        const PLATFORM_WINDOWS_CE = 'Windows CE';
-        const PLATFORM_APPLE = 'Apple';
-        const PLATFORM_LINUX = 'Linux';
-        const PLATFORM_OS2 = 'OS/2';
-        const PLATFORM_BEOS = 'BeOS';
-        const PLATFORM_IPHONE = 'iPhone';
-        const PLATFORM_IPOD = 'iPod';
-        const PLATFORM_IPAD = 'iPad';
-        const PLATFORM_BLACKBERRY = 'BlackBerry';
-        const PLATFORM_NOKIA = 'Nokia';
-        const PLATFORM_FREEBSD = 'FreeBSD';
-        const PLATFORM_OPENBSD = 'OpenBSD';
-        const PLATFORM_NETBSD = 'NetBSD';
-        const PLATFORM_SUNOS = 'SunOS';
-        const PLATFORM_OPENSOLARIS = 'OpenSolaris';
-        const PLATFORM_ANDROID = 'Android';
-
-        const OPERATING_SYSTEM_UNKNOWN = 'unknown';
-
-        public function __construct($userAgent = "")
-        {
-            $this->reset();
-            if ($userAgent != "") {
-                $this->setUserAgent($userAgent);
-            } else {
-                $this->determine();
-            }
-        }
-
-        /**
-         * Reset all properties
-         */
-        public function reset()
-        {
-            $this->_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
-            $this->_browser_name = self::BROWSER_UNKNOWN;
-            $this->_version = self::VERSION_UNKNOWN;
-            $this->_platform = self::PLATFORM_UNKNOWN;
-            $this->_os = self::OPERATING_SYSTEM_UNKNOWN;
-            $this->_is_aol = false;
-            $this->_is_mobile = false;
-            $this->_is_tablet = false;
-            $this->_is_robot = false;
-            $this->_is_facebook = false;
-            $this->_aol_version = self::VERSION_UNKNOWN;
-        }
-
-        /**
-         * Check to see if the specific browser is valid
-         * @param string $browserName
-         * @return bool True if the browser is the specified browser
-         */
-        function isBrowser($browserName)
-        {
-            return (0 == strcasecmp($this->_browser_name, trim($browserName)));
-        }
-
-        /**
-         * The name of the browser.  All return types are from the class contants
-         * @return string Name of the browser
-         */
-        public function getBrowser()
-        {
-            return $this->_browser_name;
-        }
-
-        /**
-         * Set the name of the browser
-         * @param $browser string The name of the Browser
-         */
-        public function setBrowser($browser)
-        {
-            $this->_browser_name = $browser;
-        }
-
-        /**
-         * The name of the platform.  All return types are from the class contants
-         * @return string Name of the browser
-         */
-        public function getPlatform()
-        {
-            return $this->_platform;
-        }
-
-        /**
-         * Set the name of the platform
-         * @param string $platform The name of the Platform
-         */
-        public function setPlatform($platform)
-        {
-            $this->_platform = $platform;
-        }
-
-        /**
-         * The version of the browser.
-         * @return string Version of the browser (will only contain alpha-numeric characters and a period)
-         */
-        public function getVersion()
-        {
-            return $this->_version;
-        }
-
-        /**
-         * Set the version of the browser
-         * @param string $version The version of the Browser
-         */
-        public function setVersion($version)
-        {
-            $this->_version = preg_replace('/[^0-9,.,a-z,A-Z-]/', '', $version);
-        }
-
-        /**
-         * The version of AOL.
-         * @return string Version of AOL (will only contain alpha-numeric characters and a period)
-         */
-        public function getAolVersion()
-        {
-            return $this->_aol_version;
-        }
-
-        /**
-         * Set the version of AOL
-         * @param string $version The version of AOL
-         */
-        public function setAolVersion($version)
-        {
-            $this->_aol_version = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $version);
-        }
-
-        /**
-         * Is the browser from AOL?
-         * @return boolean True if the browser is from AOL otherwise false
-         */
-        public function isAol()
-        {
-            return $this->_is_aol;
-        }
-
-        /**
-         * Is the browser from a mobile device?
-         * @return boolean True if the browser is from a mobile device otherwise false
-         */
-        public function isMobile()
-        {
-            return $this->_is_mobile;
-        }
-
-        /**
-         * Is the browser from a tablet device?
-         * @return boolean True if the browser is from a tablet device otherwise false
-         */
-        public function isTablet()
-        {
-            return $this->_is_tablet;
-        }
-
-        /**
-         * Is the browser from a robot (ex Slurp,GoogleBot)?
-         * @return boolean True if the browser is from a robot otherwise false
-         */
-        public function isRobot()
-        {
-            return $this->_is_robot;
-        }
-
-        /**
-         * Is the browser from facebook?
-         * @return boolean True if the browser is from facebook otherwise false
-         */
-        public function isFacebook()
-        {
-            return $this->_is_facebook;
-        }
-
-        /**
-         * Set the browser to be from AOL
-         * @param $isAol
-         */
-        public function setAol($isAol)
-        {
-            $this->_is_aol = $isAol;
-        }
-
-        /**
-         * Set the Browser to be mobile
-         * @param boolean $value is the browser a mobile browser or not
-         */
-        protected function setMobile($value = true)
-        {
-            $this->_is_mobile = $value;
-        }
-
-        /**
-         * Set the Browser to be tablet
-         * @param boolean $value is the browser a tablet browser or not
-         */
-        protected function setTablet($value = true)
-        {
-            $this->_is_tablet = $value;
-        }
-
-        /**
-         * Set the Browser to be a robot
-         * @param boolean $value is the browser a robot or not
-         */
-        protected function setRobot($value = true)
-        {
-            $this->_is_robot = $value;
-        }
-
-        /**
-         * Set the Browser to be a Facebook request
-         * @param boolean $value is the browser a robot or not
-         */
-        protected function setFacebook($value = true)
-        {
-            $this->_is_facebook = $value;
-        }
-
-        /**
-         * Get the user agent value in use to determine the browser
-         * @return string The user agent from the HTTP header
-         */
-        public function getUserAgent()
-        {
-            return $this->_agent;
-        }
-
-        /**
-         * Set the user agent value (the construction will use the HTTP header value - this will overwrite it)
-         * @param string $agent_string The value for the User Agent
-         */
-        public function setUserAgent($agent_string)
-        {
-            $this->reset();
-            $this->_agent = $agent_string;
-            $this->determine();
-        }
-
-        /**
-         * Used to determine if the browser is actually "chromeframe"
-         * @since 1.7
-         * @return boolean True if the browser is using chromeframe
-         */
-        public function isChromeFrame()
-        {
-            return (strpos($this->_agent, "chromeframe") !== false);
-        }
-
-        /**
-         * Returns a formatted string with a summary of the details of the browser.
-         * @return string formatted string with a summary of the browser
-         */
-        public function __toString()
-        {
-            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
-            "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
-        }
-
-        /**
-         * Protected routine to calculate and determine what the browser is in use (including platform)
-         */
-        protected function determine()
-        {
-            $this->checkPlatform();
-            $this->checkBrowsers();
-            $this->checkForAol();
-        }
-
-        /**
-         * Protected routine to determine the browser type
-         * @return boolean True if the browser was detected otherwise false
-         */
-        protected function checkBrowsers()
-        {
-            return (
-                // well-known, well-used
-                // Special Notes:
-                // (1) Opera must be checked before FireFox due to the odd
-                //     user agents used in some older versions of Opera
-                // (2) WebTV is strapped onto Internet Explorer so we must
-                //     check for WebTV before IE
-                // (3) (deprecated) Galeon is based on Firefox and needs to be
-                //     tested before Firefox is tested
-                // (4) OmniWeb is based on Safari so OmniWeb check must occur
-                //     before Safari
-                // (5) Netscape 9+ is based on Firefox so Netscape checks
-                //     before FireFox are necessary
-                $this->checkBrowserWebTv() ||
-                $this->checkBrowserInternetExplorer() ||
-                $this->checkBrowserOpera() ||
-                $this->checkBrowserGaleon() ||
-                $this->checkBrowserNetscapeNavigator9Plus() ||
-                $this->checkBrowserFirefox() ||
-                $this->checkBrowserChrome() ||
-                $this->checkBrowserOmniWeb() ||
-
-                // common mobile
-                $this->checkBrowserAndroid() ||
-                $this->checkBrowseriPad() ||
-                $this->checkBrowseriPod() ||
-                $this->checkBrowseriPhone() ||
-                $this->checkBrowserBlackBerry() ||
-                $this->checkBrowserNokia() ||
-
-                // common bots
-                $this->checkBrowserGoogleBot() ||
-                $this->checkBrowserMSNBot() ||
-                $this->checkBrowserBingBot() ||
-                $this->checkBrowserSlurp() ||
-
-                // check for facebook external hit when loading URL
-                $this->checkFacebookExternalHit() ||
-
-                // WebKit base check (post mobile and others)
-                $this->checkBrowserSafari() ||
-
-                // everyone else
-                $this->checkBrowserNetPositive() ||
-                $this->checkBrowserFirebird() ||
-                $this->checkBrowserKonqueror() ||
-                $this->checkBrowserIcab() ||
-                $this->checkBrowserPhoenix() ||
-                $this->checkBrowserAmaya() ||
-                $this->checkBrowserLynx() ||
-                $this->checkBrowserShiretoko() ||
-                $this->checkBrowserIceCat() ||
-                $this->checkBrowserIceweasel() ||
-                $this->checkBrowserW3CValidator() ||
-                $this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */
-            );
-        }
-
-        /**
-         * Determine if the user is using a BlackBerry (last updated 1.7)
-         * @return boolean True if the browser is the BlackBerry browser otherwise false
-         */
-        protected function checkBrowserBlackBerry()
-        {
-            if (stripos($this->_agent, 'blackberry') !== false) {
-                $aresult = explode("/", stristr($this->_agent, "BlackBerry"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_BLACKBERRY;
-                    $this->setMobile(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the user is using an AOL User Agent (last updated 1.7)
-         * @return boolean True if the browser is from AOL otherwise false
-         */
-        protected function checkForAol()
-        {
-            $this->setAol(false);
-            $this->setAolVersion(self::VERSION_UNKNOWN);
-
-            if (stripos($this->_agent, 'aol') !== false) {
-                $aversion = explode(' ', stristr($this->_agent, 'AOL'));
-                if (isset($aversion[1])) {
-                    $this->setAol(true);
-                    $this->setAolVersion(preg_replace('/[^0-9\.a-z]/i', '', $aversion[1]));
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the GoogleBot or not (last updated 1.7)
-         * @return boolean True if the browser is the GoogletBot otherwise false
-         */
-        protected function checkBrowserGoogleBot()
-        {
-            if (stripos($this->_agent, 'googlebot') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'googlebot'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(';', '', $aversion[0]));
-                    $this->_browser_name = self::BROWSER_GOOGLEBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the MSNBot or not (last updated 1.9)
-         * @return boolean True if the browser is the MSNBot otherwise false
-         */
-        protected function checkBrowserMSNBot()
-        {
-            if (stripos($this->_agent, "msnbot") !== false) {
-                $aresult = explode("/", stristr($this->_agent, "msnbot"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(" ", $aresult[1]);
-                    $this->setVersion(str_replace(";", "", $aversion[0]));
-                    $this->_browser_name = self::BROWSER_MSNBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the BingBot or not (last updated 1.9)
-         * @return boolean True if the browser is the BingBot otherwise false
-         */
-        protected function checkBrowserBingBot()
-        {
-            if (stripos($this->_agent, "bingbot") !== false) {
-                $aresult = explode("/", stristr($this->_agent, "bingbot"));
-                if (isset($aresult[1])) {
-                    $aversion = explode(" ", $aresult[1]);
-                    $this->setVersion(str_replace(";", "", $aversion[0]));
-                    $this->_browser_name = self::BROWSER_BINGBOT;
-                    $this->setRobot(true);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the W3C Validator or not (last updated 1.7)
-         * @return boolean True if the browser is the W3C Validator otherwise false
-         */
-        protected function checkBrowserW3CValidator()
-        {
-            if (stripos($this->_agent, 'W3C-checklink') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'W3C-checklink'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                    return true;
-                }
-            } else if (stripos($this->_agent, 'W3C_Validator') !== false) {
-                // Some of the Validator versions do not delineate w/ a slash - add it back in
-                $ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
-                $aresult = explode('/', stristr($ua, 'W3C_Validator'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                    return true;
-                }
-            } else if (stripos($this->_agent, 'W3C-mobileOK') !== false) {
-                $this->_browser_name = self::BROWSER_W3CVALIDATOR;
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is the Yahoo! Slurp Robot or not (last updated 1.7)
-         * @return boolean True if the browser is the Yahoo! Slurp Robot otherwise false
-         */
-        protected function checkBrowserSlurp()
-        {
-            if (stripos($this->_agent, 'slurp') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Slurp'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->_browser_name = self::BROWSER_SLURP;
-                    $this->setRobot(true);
-                    $this->setMobile(false);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Internet Explorer or not (last updated 1.7)
-         * @return boolean True if the browser is Internet Explorer otherwise false
-         */
-        protected function checkBrowserInternetExplorer()
-        {
-            //  Test for IE11
-            if (stripos($this->_agent, 'Trident/7.0; rv:11.0') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $this->setVersion('11.0');
-                return true;
-            } // Test for v1 - v1.5 IE
-            else if (stripos($this->_agent, 'microsoft internet explorer') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $this->setVersion('1.0');
-                $aresult = stristr($this->_agent, '/');
-                if (preg_match('/308|425|426|474|0b1/i', $aresult)) {
-                    $this->setVersion('1.5');
-                }
-                return true;
-            } // Test for versions > 1.5
-            else if (stripos($this->_agent, 'msie') !== false && stripos($this->_agent, 'opera') === false) {
-                // See if the browser is the odd MSN Explorer
-                if (stripos($this->_agent, 'msnb') !== false) {
-                    $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'MSN'));
-                    if (isset($aresult[1])) {
-                        $this->setBrowser(self::BROWSER_MSN);
-                        $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                        return true;
-                    }
-                }
-                $aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
-                if (isset($aresult[1])) {
-                    $this->setBrowser(self::BROWSER_IE);
-                    $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
-                    if (stripos($this->_agent, 'IEMobile') !== false) {
-                        $this->setBrowser(self::BROWSER_POCKET_IE);
-                        $this->setMobile(true);
-                    }
-                    return true;
-                }
-            } // Test for versions > IE 10
-            else if (stripos($this->_agent, 'trident') !== false) {
-                $this->setBrowser(self::BROWSER_IE);
-                $result = explode('rv:', $this->_agent);
-                if (isset($result[1])) {
-                    $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
-                    $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
-                }
-            } // Test for Pocket IE
-            else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'mspie'));
-                if (isset($aresult[1])) {
-                    $this->setPlatform(self::PLATFORM_WINDOWS_CE);
-                    $this->setBrowser(self::BROWSER_POCKET_IE);
-                    $this->setMobile(true);
-
-                    if (stripos($this->_agent, 'mspie') !== false) {
-                        $this->setVersion($aresult[1]);
-                    } else {
-                        $aversion = explode('/', $this->_agent);
-                        if (isset($aversion[1])) {
-                            $this->setVersion($aversion[1]);
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Opera or not (last updated 1.7)
-         * @return boolean True if the browser is Opera otherwise false
-         */
-        protected function checkBrowserOpera()
-        {
-            if (stripos($this->_agent, 'opera mini') !== false) {
-                $resultant = stristr($this->_agent, 'opera mini');
-                if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', $resultant);
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                } else {
-                    $aversion = explode(' ', stristr($resultant, 'opera mini'));
-                    if (isset($aversion[1])) {
-                        $this->setVersion($aversion[1]);
-                    }
-                }
-                $this->_browser_name = self::BROWSER_OPERA_MINI;
-                $this->setMobile(true);
-                return true;
-            } else if (stripos($this->_agent, 'opera') !== false) {
-                $resultant = stristr($this->_agent, 'opera');
-                if (preg_match('/Version\/(1*.*)$/', $resultant, $matches)) {
-                    $this->setVersion($matches[1]);
-                } else if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', str_replace("(", " ", $resultant));
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                } else {
-                    $aversion = explode(' ', stristr($resultant, 'opera'));
-                    $this->setVersion(isset($aversion[1]) ? $aversion[1] : "");
-                }
-                if (stripos($this->_agent, 'Opera Mobi') !== false) {
-                    $this->setMobile(true);
-                }
-                $this->_browser_name = self::BROWSER_OPERA;
-                return true;
-            } else if (stripos($this->_agent, 'OPR') !== false) {
-                $resultant = stristr($this->_agent, 'OPR');
-                if (preg_match('/\//', $resultant)) {
-                    $aresult = explode('/', str_replace("(", " ", $resultant));
-                    if (isset($aresult[1])) {
-                        $aversion = explode(' ', $aresult[1]);
-                        $this->setVersion($aversion[0]);
-                    }
-                }
-                if (stripos($this->_agent, 'Mobile') !== false) {
-                    $this->setMobile(true);
-                }
-                $this->_browser_name = self::BROWSER_OPERA;
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Chrome or not (last updated 1.7)
-         * @return boolean True if the browser is Chrome otherwise false
-         */
-        protected function checkBrowserChrome()
-        {
-            if (stripos($this->_agent, 'Chrome') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Chrome'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_CHROME);
-                    //Chrome on Android
-                    if (stripos($this->_agent, 'Android') !== false) {
-                        if (stripos($this->_agent, 'Mobile') !== false) {
-                            $this->setMobile(true);
-                        } else {
-                            $this->setTablet(true);
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-        }
-
-
-        /**
-         * Determine if the browser is WebTv or not (last updated 1.7)
-         * @return boolean True if the browser is WebTv otherwise false
-         */
-        protected function checkBrowserWebTv()
-        {
-            if (stripos($this->_agent, 'webtv') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'webtv'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_WEBTV);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is NetPositive or not (last updated 1.7)
-         * @return boolean True if the browser is NetPositive otherwise false
-         */
-        protected function checkBrowserNetPositive()
-        {
-            if (stripos($this->_agent, 'NetPositive') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'NetPositive'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion(str_replace(array('(', ')', ';'), '', $aversion[0]));
-                    $this->setBrowser(self::BROWSER_NETPOSITIVE);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Galeon or not (last updated 1.7)
-         * @return boolean True if the browser is Galeon otherwise false
-         */
-        protected function checkBrowserGaleon()
-        {
-            if (stripos($this->_agent, 'galeon') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'galeon'));
-                $aversion = explode('/', $aresult[0]);
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_GALEON);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Konqueror or not (last updated 1.7)
-         * @return boolean True if the browser is Konqueror otherwise false
-         */
-        protected function checkBrowserKonqueror()
-        {
-            if (stripos($this->_agent, 'Konqueror') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'Konqueror'));
-                $aversion = explode('/', $aresult[0]);
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_KONQUEROR);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iCab or not (last updated 1.7)
-         * @return boolean True if the browser is iCab otherwise false
-         */
-        protected function checkBrowserIcab()
-        {
-            if (stripos($this->_agent, 'icab') !== false) {
-                $aversion = explode(' ', stristr(str_replace('/', ' ', $this->_agent), 'icab'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_ICAB);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is OmniWeb or not (last updated 1.7)
-         * @return boolean True if the browser is OmniWeb otherwise false
-         */
-        protected function checkBrowserOmniWeb()
-        {
-            if (stripos($this->_agent, 'omniweb') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'omniweb'));
-                $aversion = explode(' ', isset($aresult[1]) ? $aresult[1] : "");
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_OMNIWEB);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Phoenix or not (last updated 1.7)
-         * @return boolean True if the browser is Phoenix otherwise false
-         */
-        protected function checkBrowserPhoenix()
-        {
-            if (stripos($this->_agent, 'Phoenix') !== false) {
-                $aversion = explode('/', stristr($this->_agent, 'Phoenix'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_PHOENIX);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firebird or not (last updated 1.7)
-         * @return boolean True if the browser is Firebird otherwise false
-         */
-        protected function checkBrowserFirebird()
-        {
-            if (stripos($this->_agent, 'Firebird') !== false) {
-                $aversion = explode('/', stristr($this->_agent, 'Firebird'));
-                if (isset($aversion[1])) {
-                    $this->setVersion($aversion[1]);
-                    $this->setBrowser(self::BROWSER_FIREBIRD);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Netscape Navigator 9+ or not (last updated 1.7)
-         * NOTE: (http://browser.netscape.com/ - Official support ended on March 1st, 2008)
-         * @return boolean True if the browser is Netscape Navigator 9+ otherwise false
-         */
-        protected function checkBrowserNetscapeNavigator9Plus()
-        {
-            if (stripos($this->_agent, 'Firefox') !== false && preg_match('/Navigator\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
-                return true;
-            } else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Shiretoko or not (https://wiki.mozilla.org/Projects/shiretoko) (last updated 1.7)
-         * @return boolean True if the browser is Shiretoko otherwise false
-         */
-        protected function checkBrowserShiretoko()
-        {
-            if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/Shiretoko\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_SHIRETOKO);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Ice Cat or not (http://en.wikipedia.org/wiki/GNU_IceCat) (last updated 1.7)
-         * @return boolean True if the browser is Ice Cat otherwise false
-         */
-        protected function checkBrowserIceCat()
-        {
-            if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/IceCat\/([^ ]*)/i', $this->_agent, $matches)) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_ICECAT);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Nokia or not (last updated 1.7)
-         * @return boolean True if the browser is Nokia otherwise false
-         */
-        protected function checkBrowserNokia()
-        {
-            if (preg_match("/Nokia([^\/]+)\/([^ SP]+)/i", $this->_agent, $matches)) {
-                $this->setVersion($matches[2]);
-                if (stripos($this->_agent, 'Series60') !== false || strpos($this->_agent, 'S60') !== false) {
-                    $this->setBrowser(self::BROWSER_NOKIA_S60);
-                } else {
-                    $this->setBrowser(self::BROWSER_NOKIA);
-                }
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firefox or not (last updated 1.7)
-         * @return boolean True if the browser is Firefox otherwise false
-         */
-        protected function checkBrowserFirefox()
-        {
-            if (stripos($this->_agent, 'safari') === false) {
-                if (preg_match("/Firefox[\/ \(]([^ ;\)]+)/i", $this->_agent, $matches)) {
-                    $this->setVersion($matches[1]);
-                    $this->setBrowser(self::BROWSER_FIREFOX);
-                    //Firefox on Android
-                    if (stripos($this->_agent, 'Android') !== false) {
-                        if (stripos($this->_agent, 'Mobile') !== false) {
-                            $this->setMobile(true);
-                        } else {
-                            $this->setTablet(true);
-                        }
-                    }
-                    return true;
-                } else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
-                    $this->setVersion("");
-                    $this->setBrowser(self::BROWSER_FIREFOX);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Firefox or not (last updated 1.7)
-         * @return boolean True if the browser is Firefox otherwise false
-         */
-        protected function checkBrowserIceweasel()
-        {
-            if (stripos($this->_agent, 'Iceweasel') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Iceweasel'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_ICEWEASEL);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Mozilla or not (last updated 1.7)
-         * @return boolean True if the browser is Mozilla otherwise false
-         */
-        protected function checkBrowserMozilla()
-        {
-            if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
-                $aversion = explode(' ', stristr($this->_agent, 'rv:'));
-                preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent, $aversion);
-                $this->setVersion(str_replace('rv:', '', $aversion[0]));
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
-                $aversion = explode('', stristr($this->_agent, 'rv:'));
-                $this->setVersion(str_replace('rv:', '', $aversion[0]));
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
-                $this->setVersion($matches[1]);
-                $this->setBrowser(self::BROWSER_MOZILLA);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Lynx or not (last updated 1.7)
-         * @return boolean True if the browser is Lynx otherwise false
-         */
-        protected function checkBrowserLynx()
-        {
-            if (stripos($this->_agent, 'lynx') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Lynx'));
-                $aversion = explode(' ', (isset($aresult[1]) ? $aresult[1] : ""));
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_LYNX);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Amaya or not (last updated 1.7)
-         * @return boolean True if the browser is Amaya otherwise false
-         */
-        protected function checkBrowserAmaya()
-        {
-            if (stripos($this->_agent, 'amaya') !== false) {
-                $aresult = explode('/', stristr($this->_agent, 'Amaya'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                    $this->setBrowser(self::BROWSER_AMAYA);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Safari or not (last updated 1.7)
-         * @return boolean True if the browser is Safari otherwise false
-         */
-        protected function checkBrowserSafari()
-        {
-            if (stripos($this->_agent, 'Safari') !== false
-                && stripos($this->_agent, 'iPhone') === false
-                && stripos($this->_agent, 'iPod') === false
-            ) {
-
-                $aresult = explode('/', stristr($this->_agent, 'Version'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                $this->setBrowser(self::BROWSER_SAFARI);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect if URL is loaded from FacebookExternalHit
-         * @return boolean True if it detects FacebookExternalHit otherwise false
-         */
-        protected function checkFacebookExternalHit()
-        {
-            if (stristr($this->_agent, 'FacebookExternalHit')) {
-                $this->setRobot(true);
-                $this->setFacebook(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect if URL is being loaded from internal Facebook browser
-         * @return boolean True if it detects internal Facebook browser otherwise false
-         */
-        protected function checkForFacebookIos()
-        {
-            if (stristr($this->_agent, 'FBIOS')) {
-                $this->setFacebook(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect Version for the Safari browser on iOS devices
-         * @return boolean True if it detects the version correctly otherwise false
-         */
-        protected function getSafariVersionOnIos()
-        {
-            $aresult = explode('/', stristr($this->_agent, 'Version'));
-            if (isset($aresult[1])) {
-                $aversion = explode(' ', $aresult[1]);
-                $this->setVersion($aversion[0]);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Detect Version for the Chrome browser on iOS devices
-         * @return boolean True if it detects the version correctly otherwise false
-         */
-        protected function getChromeVersionOnIos()
-        {
-            $aresult = explode('/', stristr($this->_agent, 'CriOS'));
-            if (isset($aresult[1])) {
-                $aversion = explode(' ', $aresult[1]);
-                $this->setVersion($aversion[0]);
-                $this->setBrowser(self::BROWSER_CHROME);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPhone or not (last updated 1.7)
-         * @return boolean True if the browser is iPhone otherwise false
-         */
-        protected function checkBrowseriPhone()
-        {
-            if (stripos($this->_agent, 'iPhone') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPHONE);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPad or not (last updated 1.7)
-         * @return boolean True if the browser is iPad otherwise false
-         */
-        protected function checkBrowseriPad()
-        {
-            if (stripos($this->_agent, 'iPad') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPAD);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setTablet(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is iPod or not (last updated 1.7)
-         * @return boolean True if the browser is iPod otherwise false
-         */
-        protected function checkBrowseriPod()
-        {
-            if (stripos($this->_agent, 'iPod') !== false) {
-                $this->setVersion(self::VERSION_UNKNOWN);
-                $this->setBrowser(self::BROWSER_IPOD);
-                $this->getSafariVersionOnIos();
-                $this->getChromeVersionOnIos();
-                $this->checkForFacebookIos();
-                $this->setMobile(true);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine if the browser is Android or not (last updated 1.7)
-         * @return boolean True if the browser is Android otherwise false
-         */
-        protected function checkBrowserAndroid()
-        {
-            if (stripos($this->_agent, 'Android') !== false) {
-                $aresult = explode(' ', stristr($this->_agent, 'Android'));
-                if (isset($aresult[1])) {
-                    $aversion = explode(' ', $aresult[1]);
-                    $this->setVersion($aversion[0]);
-                } else {
-                    $this->setVersion(self::VERSION_UNKNOWN);
-                }
-                if (stripos($this->_agent, 'Mobile') !== false) {
-                    $this->setMobile(true);
-                } else {
-                    $this->setTablet(true);
-                }
-                $this->setBrowser(self::BROWSER_ANDROID);
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Determine the user's platform (last updated 1.7)
-         */
-        protected function checkPlatform()
-        {
-            if (stripos($this->_agent, 'windows') !== false) {
-                $this->_platform = self::PLATFORM_WINDOWS;
-            } else if (stripos($this->_agent, 'iPad') !== false) {
-                $this->_platform = self::PLATFORM_IPAD;
-            } else if (stripos($this->_agent, 'iPod') !== false) {
-                $this->_platform = self::PLATFORM_IPOD;
-            } else if (stripos($this->_agent, 'iPhone') !== false) {
-                $this->_platform = self::PLATFORM_IPHONE;
-            } elseif (stripos($this->_agent, 'mac') !== false) {
-                $this->_platform = self::PLATFORM_APPLE;
-            } elseif (stripos($this->_agent, 'android') !== false) {
-                $this->_platform = self::PLATFORM_ANDROID;
-            } elseif (stripos($this->_agent, 'linux') !== false) {
-                $this->_platform = self::PLATFORM_LINUX;
-            } else if (stripos($this->_agent, 'Nokia') !== false) {
-                $this->_platform = self::PLATFORM_NOKIA;
-            } else if (stripos($this->_agent, 'BlackBerry') !== false) {
-                $this->_platform = self::PLATFORM_BLACKBERRY;
-            } elseif (stripos($this->_agent, 'FreeBSD') !== false) {
-                $this->_platform = self::PLATFORM_FREEBSD;
-            } elseif (stripos($this->_agent, 'OpenBSD') !== false) {
-                $this->_platform = self::PLATFORM_OPENBSD;
-            } elseif (stripos($this->_agent, 'NetBSD') !== false) {
-                $this->_platform = self::PLATFORM_NETBSD;
-            } elseif (stripos($this->_agent, 'OpenSolaris') !== false) {
-                $this->_platform = self::PLATFORM_OPENSOLARIS;
-            } elseif (stripos($this->_agent, 'SunOS') !== false) {
-                $this->_platform = self::PLATFORM_SUNOS;
-            } elseif (stripos($this->_agent, 'OS\/2') !== false) {
-                $this->_platform = self::PLATFORM_OS2;
-            } elseif (stripos($this->_agent, 'BeOS') !== false) {
-                $this->_platform = self::PLATFORM_BEOS;
-            } elseif (stripos($this->_agent, 'win') !== false) {
-                $this->_platform = self::PLATFORM_WINDOWS;
-            }
-
-        }
-    }
\ No newline at end of file
+	class Browser
+	{
+		private $_agent = '';
+		private $_browser_name = '';
+		private $_version = '';
+		private $_platform = '';
+		private $_os = '';
+		private $_is_aol = false;
+		private $_is_mobile = false;
+		private $_is_tablet = false;
+		private $_is_robot = false;
+		private $_is_facebook = false;
+		private $_aol_version = '';
+
+		const BROWSER_UNKNOWN = 'unknown';
+		const VERSION_UNKNOWN = 'unknown';
+
+		const BROWSER_OPERA = 'Opera'; // http://www.opera.com/
+		const BROWSER_OPERA_MINI = 'Opera Mini'; // http://www.opera.com/mini/
+		const BROWSER_WEBTV = 'WebTV'; // http://www.webtv.net/pc/
+		const BROWSER_IE = 'Internet Explorer'; // http://www.microsoft.com/ie/
+		const BROWSER_POCKET_IE = 'Pocket Internet Explorer'; // http://en.wikipedia.org/wiki/Internet_Explorer_Mobile
+		const BROWSER_KONQUEROR = 'Konqueror'; // http://www.konqueror.org/
+		const BROWSER_ICAB = 'iCab'; // http://www.icab.de/
+		const BROWSER_OMNIWEB = 'OmniWeb'; // http://www.omnigroup.com/applications/omniweb/
+		const BROWSER_FIREBIRD = 'Firebird'; // http://www.ibphoenix.com/
+		const BROWSER_FIREFOX = 'Firefox'; // http://www.mozilla.com/en-US/firefox/firefox.html
+		const BROWSER_ICEWEASEL = 'Iceweasel'; // http://www.geticeweasel.org/
+		const BROWSER_SHIRETOKO = 'Shiretoko'; // http://wiki.mozilla.org/Projects/shiretoko
+		const BROWSER_MOZILLA = 'Mozilla'; // http://www.mozilla.com/en-US/
+		const BROWSER_AMAYA = 'Amaya'; // http://www.w3.org/Amaya/
+		const BROWSER_LYNX = 'Lynx'; // http://en.wikipedia.org/wiki/Lynx
+		const BROWSER_SAFARI = 'Safari'; // http://apple.com
+		const BROWSER_IPHONE = 'iPhone'; // http://apple.com
+		const BROWSER_IPOD = 'iPod'; // http://apple.com
+		const BROWSER_IPAD = 'iPad'; // http://apple.com
+		const BROWSER_CHROME = 'Chrome'; // http://www.google.com/chrome
+		const BROWSER_ANDROID = 'Android'; // http://www.android.com/
+		const BROWSER_GOOGLEBOT = 'GoogleBot'; // http://en.wikipedia.org/wiki/Googlebot
+		const BROWSER_SLURP = 'Yahoo! Slurp'; // http://en.wikipedia.org/wiki/Yahoo!_Slurp
+		const BROWSER_W3CVALIDATOR = 'W3C Validator'; // http://validator.w3.org/
+		const BROWSER_BLACKBERRY = 'BlackBerry'; // http://www.blackberry.com/
+		const BROWSER_ICECAT = 'IceCat'; // http://en.wikipedia.org/wiki/GNU_IceCat
+		const BROWSER_NOKIA_S60 = 'Nokia S60 OSS Browser'; // http://en.wikipedia.org/wiki/Web_Browser_for_S60
+		const BROWSER_NOKIA = 'Nokia Browser'; // * all other WAP-based browsers on the Nokia Platform
+		const BROWSER_MSN = 'MSN Browser'; // http://explorer.msn.com/
+		const BROWSER_MSNBOT = 'MSN Bot'; // http://search.msn.com/msnbot.htm
+		const BROWSER_BINGBOT = 'Bing Bot'; // http://en.wikipedia.org/wiki/Bingbot
+
+		const BROWSER_NETSCAPE_NAVIGATOR = 'Netscape Navigator'; // http://browser.netscape.com/ (DEPRECATED)
+		const BROWSER_GALEON = 'Galeon'; // http://galeon.sourceforge.net/ (DEPRECATED)
+		const BROWSER_NETPOSITIVE = 'NetPositive'; // http://en.wikipedia.org/wiki/NetPositive (DEPRECATED)
+		const BROWSER_PHOENIX = 'Phoenix'; // http://en.wikipedia.org/wiki/History_of_Mozilla_Firefox (DEPRECATED)
+
+		const PLATFORM_UNKNOWN = 'unknown';
+		const PLATFORM_WINDOWS = 'Windows';
+		const PLATFORM_WINDOWS_CE = 'Windows CE';
+		const PLATFORM_APPLE = 'Apple';
+		const PLATFORM_LINUX = 'Linux';
+		const PLATFORM_OS2 = 'OS/2';
+		const PLATFORM_BEOS = 'BeOS';
+		const PLATFORM_IPHONE = 'iPhone';
+		const PLATFORM_IPOD = 'iPod';
+		const PLATFORM_IPAD = 'iPad';
+		const PLATFORM_BLACKBERRY = 'BlackBerry';
+		const PLATFORM_NOKIA = 'Nokia';
+		const PLATFORM_FREEBSD = 'FreeBSD';
+		const PLATFORM_OPENBSD = 'OpenBSD';
+		const PLATFORM_NETBSD = 'NetBSD';
+		const PLATFORM_SUNOS = 'SunOS';
+		const PLATFORM_OPENSOLARIS = 'OpenSolaris';
+		const PLATFORM_ANDROID = 'Android';
+
+		const OPERATING_SYSTEM_UNKNOWN = 'unknown';
+
+		public function __construct($userAgent = "")
+		{
+			$this->reset();
+			if ($userAgent != "") {
+				$this->setUserAgent($userAgent);
+			} else {
+				$this->determine();
+			}
+		}
+
+		/**
+		 * Reset all properties
+		 */
+		public function reset()
+		{
+			$this->_agent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
+			$this->_browser_name = self::BROWSER_UNKNOWN;
+			$this->_version = self::VERSION_UNKNOWN;
+			$this->_platform = self::PLATFORM_UNKNOWN;
+			$this->_os = self::OPERATING_SYSTEM_UNKNOWN;
+			$this->_is_aol = false;
+			$this->_is_mobile = false;
+			$this->_is_tablet = false;
+			$this->_is_robot = false;
+			$this->_is_facebook = false;
+			$this->_aol_version = self::VERSION_UNKNOWN;
+		}
+
+		/**
+		 * Check to see if the specific browser is valid
+		 * @param string $browserName
+		 * @return bool True if the browser is the specified browser
+		 */
+		function isBrowser($browserName)
+		{
+			return (0 == strcasecmp($this->_browser_name, trim($browserName)));
+		}
+
+		/**
+		 * The name of the browser.  All return types are from the class contants
+		 * @return string Name of the browser
+		 */
+		public function getBrowser()
+		{
+			return $this->_browser_name;
+		}
+
+		/**
+		 * Set the name of the browser
+		 * @param $browser string The name of the Browser
+		 */
+		public function setBrowser($browser)
+		{
+			$this->_browser_name = $browser;
+		}
+
+		/**
+		 * The name of the platform.  All return types are from the class contants
+		 * @return string Name of the browser
+		 */
+		public function getPlatform()
+		{
+			return $this->_platform;
+		}
+
+		/**
+		 * Set the name of the platform
+		 * @param string $platform The name of the Platform
+		 */
+		public function setPlatform($platform)
+		{
+			$this->_platform = $platform;
+		}
+
+		/**
+		 * The version of the browser.
+		 * @return string Version of the browser (will only contain alpha-numeric characters and a period)
+		 */
+		public function getVersion()
+		{
+			return $this->_version;
+		}
+
+		/**
+		 * Set the version of the browser
+		 * @param string $version The version of the Browser
+		 */
+		public function setVersion($version)
+		{
+			$this->_version = preg_replace('/[^0-9,.,a-z,A-Z-]/', '', $version);
+		}
+
+		/**
+		 * The version of AOL.
+		 * @return string Version of AOL (will only contain alpha-numeric characters and a period)
+		 */
+		public function getAolVersion()
+		{
+			return $this->_aol_version;
+		}
+
+		/**
+		 * Set the version of AOL
+		 * @param string $version The version of AOL
+		 */
+		public function setAolVersion($version)
+		{
+			$this->_aol_version = preg_replace('/[^0-9,.,a-z,A-Z]/', '', $version);
+		}
+
+		/**
+		 * Is the browser from AOL?
+		 * @return boolean True if the browser is from AOL otherwise false
+		 */
+		public function isAol()
+		{
+			return $this->_is_aol;
+		}
+
+		/**
+		 * Is the browser from a mobile device?
+		 * @return boolean True if the browser is from a mobile device otherwise false
+		 */
+		public function isMobile()
+		{
+			return $this->_is_mobile;
+		}
+
+		/**
+		 * Is the browser from a tablet device?
+		 * @return boolean True if the browser is from a tablet device otherwise false
+		 */
+		public function isTablet()
+		{
+			return $this->_is_tablet;
+		}
+
+		/**
+		 * Is the browser from a robot (ex Slurp,GoogleBot)?
+		 * @return boolean True if the browser is from a robot otherwise false
+		 */
+		public function isRobot()
+		{
+			return $this->_is_robot;
+		}
+
+		/**
+		 * Is the browser from facebook?
+		 * @return boolean True if the browser is from facebook otherwise false
+		 */
+		public function isFacebook()
+		{
+			return $this->_is_facebook;
+		}
+
+		/**
+		 * Set the browser to be from AOL
+		 * @param $isAol
+		 */
+		public function setAol($isAol)
+		{
+			$this->_is_aol = $isAol;
+		}
+
+		/**
+		 * Set the Browser to be mobile
+		 * @param boolean $value is the browser a mobile browser or not
+		 */
+		protected function setMobile($value = true)
+		{
+			$this->_is_mobile = $value;
+		}
+
+		/**
+		 * Set the Browser to be tablet
+		 * @param boolean $value is the browser a tablet browser or not
+		 */
+		protected function setTablet($value = true)
+		{
+			$this->_is_tablet = $value;
+		}
+
+		/**
+		 * Set the Browser to be a robot
+		 * @param boolean $value is the browser a robot or not
+		 */
+		protected function setRobot($value = true)
+		{
+			$this->_is_robot = $value;
+		}
+
+		/**
+		 * Set the Browser to be a Facebook request
+		 * @param boolean $value is the browser a robot or not
+		 */
+		protected function setFacebook($value = true)
+		{
+			$this->_is_facebook = $value;
+		}
+
+		/**
+		 * Get the user agent value in use to determine the browser
+		 * @return string The user agent from the HTTP header
+		 */
+		public function getUserAgent()
+		{
+			return $this->_agent;
+		}
+
+		/**
+		 * Set the user agent value (the construction will use the HTTP header value - this will overwrite it)
+		 * @param string $agent_string The value for the User Agent
+		 */
+		public function setUserAgent($agent_string)
+		{
+			$this->reset();
+			$this->_agent = $agent_string;
+			$this->determine();
+		}
+
+		/**
+		 * Used to determine if the browser is actually "chromeframe"
+		 * @since 1.7
+		 * @return boolean True if the browser is using chromeframe
+		 */
+		public function isChromeFrame()
+		{
+			return (strpos($this->_agent, "chromeframe") !== false);
+		}
+
+		/**
+		 * Returns a formatted string with a summary of the details of the browser.
+		 * @return string formatted string with a summary of the browser
+		 */
+		public function __toString()
+		{
+			return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
+			"<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
+			"<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+			"<strong>Platform:</strong> {$this->getPlatform()}<br/>";
+		}
+
+		/**
+		 * Protected routine to calculate and determine what the browser is in use (including platform)
+		 */
+		protected function determine()
+		{
+			$this->checkPlatform();
+			$this->checkBrowsers();
+			$this->checkForAol();
+		}
+
+		/**
+		 * Protected routine to determine the browser type
+		 * @return boolean True if the browser was detected otherwise false
+		 */
+		protected function checkBrowsers()
+		{
+			return (
+				// well-known, well-used
+				// Special Notes:
+				// (1) Opera must be checked before FireFox due to the odd
+				//     user agents used in some older versions of Opera
+				// (2) WebTV is strapped onto Internet Explorer so we must
+				//     check for WebTV before IE
+				// (3) (deprecated) Galeon is based on Firefox and needs to be
+				//     tested before Firefox is tested
+				// (4) OmniWeb is based on Safari so OmniWeb check must occur
+				//     before Safari
+				// (5) Netscape 9+ is based on Firefox so Netscape checks
+				//     before FireFox are necessary
+				$this->checkBrowserWebTv() ||
+				$this->checkBrowserInternetExplorer() ||
+				$this->checkBrowserOpera() ||
+				$this->checkBrowserGaleon() ||
+				$this->checkBrowserNetscapeNavigator9Plus() ||
+				$this->checkBrowserFirefox() ||
+				$this->checkBrowserChrome() ||
+				$this->checkBrowserOmniWeb() ||
+
+				// common mobile
+				$this->checkBrowserAndroid() ||
+				$this->checkBrowseriPad() ||
+				$this->checkBrowseriPod() ||
+				$this->checkBrowseriPhone() ||
+				$this->checkBrowserBlackBerry() ||
+				$this->checkBrowserNokia() ||
+
+				// common bots
+				$this->checkBrowserGoogleBot() ||
+				$this->checkBrowserMSNBot() ||
+				$this->checkBrowserBingBot() ||
+				$this->checkBrowserSlurp() ||
+
+				// check for facebook external hit when loading URL
+				$this->checkFacebookExternalHit() ||
+
+				// WebKit base check (post mobile and others)
+				$this->checkBrowserSafari() ||
+
+				// everyone else
+				$this->checkBrowserNetPositive() ||
+				$this->checkBrowserFirebird() ||
+				$this->checkBrowserKonqueror() ||
+				$this->checkBrowserIcab() ||
+				$this->checkBrowserPhoenix() ||
+				$this->checkBrowserAmaya() ||
+				$this->checkBrowserLynx() ||
+				$this->checkBrowserShiretoko() ||
+				$this->checkBrowserIceCat() ||
+				$this->checkBrowserIceweasel() ||
+				$this->checkBrowserW3CValidator() ||
+				$this->checkBrowserMozilla() /* Mozilla is such an open standard that you must check it last */
+			);
+		}
+
+		/**
+		 * Determine if the user is using a BlackBerry (last updated 1.7)
+		 * @return boolean True if the browser is the BlackBerry browser otherwise false
+		 */
+		protected function checkBrowserBlackBerry()
+		{
+			if (stripos($this->_agent, 'blackberry') !== false) {
+				$aresult = explode("/", stristr($this->_agent, "BlackBerry"));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_BLACKBERRY;
+					$this->setMobile(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the user is using an AOL User Agent (last updated 1.7)
+		 * @return boolean True if the browser is from AOL otherwise false
+		 */
+		protected function checkForAol()
+		{
+			$this->setAol(false);
+			$this->setAolVersion(self::VERSION_UNKNOWN);
+
+			if (stripos($this->_agent, 'aol') !== false) {
+				$aversion = explode(' ', stristr($this->_agent, 'AOL'));
+				if (isset($aversion[1])) {
+					$this->setAol(true);
+					$this->setAolVersion(preg_replace('/[^0-9\.a-z]/i', '', $aversion[1]));
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the GoogleBot or not (last updated 1.7)
+		 * @return boolean True if the browser is the GoogletBot otherwise false
+		 */
+		protected function checkBrowserGoogleBot()
+		{
+			if (stripos($this->_agent, 'googlebot') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'googlebot'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(';', '', $aversion[0]));
+					$this->_browser_name = self::BROWSER_GOOGLEBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the MSNBot or not (last updated 1.9)
+		 * @return boolean True if the browser is the MSNBot otherwise false
+		 */
+		protected function checkBrowserMSNBot()
+		{
+			if (stripos($this->_agent, "msnbot") !== false) {
+				$aresult = explode("/", stristr($this->_agent, "msnbot"));
+				if (isset($aresult[1])) {
+					$aversion = explode(" ", $aresult[1]);
+					$this->setVersion(str_replace(";", "", $aversion[0]));
+					$this->_browser_name = self::BROWSER_MSNBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the BingBot or not (last updated 1.9)
+		 * @return boolean True if the browser is the BingBot otherwise false
+		 */
+		protected function checkBrowserBingBot()
+		{
+			if (stripos($this->_agent, "bingbot") !== false) {
+				$aresult = explode("/", stristr($this->_agent, "bingbot"));
+				if (isset($aresult[1])) {
+					$aversion = explode(" ", $aresult[1]);
+					$this->setVersion(str_replace(";", "", $aversion[0]));
+					$this->_browser_name = self::BROWSER_BINGBOT;
+					$this->setRobot(true);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the W3C Validator or not (last updated 1.7)
+		 * @return boolean True if the browser is the W3C Validator otherwise false
+		 */
+		protected function checkBrowserW3CValidator()
+		{
+			if (stripos($this->_agent, 'W3C-checklink') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'W3C-checklink'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+					return true;
+				}
+			} else if (stripos($this->_agent, 'W3C_Validator') !== false) {
+				// Some of the Validator versions do not delineate w/ a slash - add it back in
+				$ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
+				$aresult = explode('/', stristr($ua, 'W3C_Validator'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+					return true;
+				}
+			} else if (stripos($this->_agent, 'W3C-mobileOK') !== false) {
+				$this->_browser_name = self::BROWSER_W3CVALIDATOR;
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is the Yahoo! Slurp Robot or not (last updated 1.7)
+		 * @return boolean True if the browser is the Yahoo! Slurp Robot otherwise false
+		 */
+		protected function checkBrowserSlurp()
+		{
+			if (stripos($this->_agent, 'slurp') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Slurp'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->_browser_name = self::BROWSER_SLURP;
+					$this->setRobot(true);
+					$this->setMobile(false);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Internet Explorer or not (last updated 1.7)
+		 * @return boolean True if the browser is Internet Explorer otherwise false
+		 */
+		protected function checkBrowserInternetExplorer()
+		{
+			//  Test for IE11
+			if (stripos($this->_agent, 'Trident/7.0; rv:11.0') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$this->setVersion('11.0');
+				return true;
+			} // Test for v1 - v1.5 IE
+			else if (stripos($this->_agent, 'microsoft internet explorer') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$this->setVersion('1.0');
+				$aresult = stristr($this->_agent, '/');
+				if (preg_match('/308|425|426|474|0b1/i', $aresult)) {
+					$this->setVersion('1.5');
+				}
+				return true;
+			} // Test for versions > 1.5
+			else if (stripos($this->_agent, 'msie') !== false && stripos($this->_agent, 'opera') === false) {
+				// See if the browser is the odd MSN Explorer
+				if (stripos($this->_agent, 'msnb') !== false) {
+					$aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'MSN'));
+					if (isset($aresult[1])) {
+						$this->setBrowser(self::BROWSER_MSN);
+						$this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+						return true;
+					}
+				}
+				$aresult = explode(' ', stristr(str_replace(';', '; ', $this->_agent), 'msie'));
+				if (isset($aresult[1])) {
+					$this->setBrowser(self::BROWSER_IE);
+					$this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
+					if (stripos($this->_agent, 'IEMobile') !== false) {
+						$this->setBrowser(self::BROWSER_POCKET_IE);
+						$this->setMobile(true);
+					}
+					return true;
+				}
+			} // Test for versions > IE 10
+			else if (stripos($this->_agent, 'trident') !== false) {
+				$this->setBrowser(self::BROWSER_IE);
+				$result = explode('rv:', $this->_agent);
+				if (isset($result[1])) {
+					$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
+					$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
+				}
+			} // Test for Pocket IE
+			else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'mspie'));
+				if (isset($aresult[1])) {
+					$this->setPlatform(self::PLATFORM_WINDOWS_CE);
+					$this->setBrowser(self::BROWSER_POCKET_IE);
+					$this->setMobile(true);
+
+					if (stripos($this->_agent, 'mspie') !== false) {
+						$this->setVersion($aresult[1]);
+					} else {
+						$aversion = explode('/', $this->_agent);
+						if (isset($aversion[1])) {
+							$this->setVersion($aversion[1]);
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Opera or not (last updated 1.7)
+		 * @return boolean True if the browser is Opera otherwise false
+		 */
+		protected function checkBrowserOpera()
+		{
+			if (stripos($this->_agent, 'opera mini') !== false) {
+				$resultant = stristr($this->_agent, 'opera mini');
+				if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', $resultant);
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				} else {
+					$aversion = explode(' ', stristr($resultant, 'opera mini'));
+					if (isset($aversion[1])) {
+						$this->setVersion($aversion[1]);
+					}
+				}
+				$this->_browser_name = self::BROWSER_OPERA_MINI;
+				$this->setMobile(true);
+				return true;
+			} else if (stripos($this->_agent, 'opera') !== false) {
+				$resultant = stristr($this->_agent, 'opera');
+				if (preg_match('/Version\/(1*.*)$/', $resultant, $matches)) {
+					$this->setVersion($matches[1]);
+				} else if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', str_replace("(", " ", $resultant));
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				} else {
+					$aversion = explode(' ', stristr($resultant, 'opera'));
+					$this->setVersion(isset($aversion[1]) ? $aversion[1] : "");
+				}
+				if (stripos($this->_agent, 'Opera Mobi') !== false) {
+					$this->setMobile(true);
+				}
+				$this->_browser_name = self::BROWSER_OPERA;
+				return true;
+			} else if (stripos($this->_agent, 'OPR') !== false) {
+				$resultant = stristr($this->_agent, 'OPR');
+				if (preg_match('/\//', $resultant)) {
+					$aresult = explode('/', str_replace("(", " ", $resultant));
+					if (isset($aresult[1])) {
+						$aversion = explode(' ', $aresult[1]);
+						$this->setVersion($aversion[0]);
+					}
+				}
+				if (stripos($this->_agent, 'Mobile') !== false) {
+					$this->setMobile(true);
+				}
+				$this->_browser_name = self::BROWSER_OPERA;
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Chrome or not (last updated 1.7)
+		 * @return boolean True if the browser is Chrome otherwise false
+		 */
+		protected function checkBrowserChrome()
+		{
+			if (stripos($this->_agent, 'Chrome') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Chrome'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_CHROME);
+					//Chrome on Android
+					if (stripos($this->_agent, 'Android') !== false) {
+						if (stripos($this->_agent, 'Mobile') !== false) {
+							$this->setMobile(true);
+						} else {
+							$this->setTablet(true);
+						}
+					}
+					return true;
+				}
+			}
+			return false;
+		}
+
+
+		/**
+		 * Determine if the browser is WebTv or not (last updated 1.7)
+		 * @return boolean True if the browser is WebTv otherwise false
+		 */
+		protected function checkBrowserWebTv()
+		{
+			if (stripos($this->_agent, 'webtv') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'webtv'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_WEBTV);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is NetPositive or not (last updated 1.7)
+		 * @return boolean True if the browser is NetPositive otherwise false
+		 */
+		protected function checkBrowserNetPositive()
+		{
+			if (stripos($this->_agent, 'NetPositive') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'NetPositive'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion(str_replace(array('(', ')', ';'), '', $aversion[0]));
+					$this->setBrowser(self::BROWSER_NETPOSITIVE);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Galeon or not (last updated 1.7)
+		 * @return boolean True if the browser is Galeon otherwise false
+		 */
+		protected function checkBrowserGaleon()
+		{
+			if (stripos($this->_agent, 'galeon') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'galeon'));
+				$aversion = explode('/', $aresult[0]);
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_GALEON);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Konqueror or not (last updated 1.7)
+		 * @return boolean True if the browser is Konqueror otherwise false
+		 */
+		protected function checkBrowserKonqueror()
+		{
+			if (stripos($this->_agent, 'Konqueror') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'Konqueror'));
+				$aversion = explode('/', $aresult[0]);
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_KONQUEROR);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iCab or not (last updated 1.7)
+		 * @return boolean True if the browser is iCab otherwise false
+		 */
+		protected function checkBrowserIcab()
+		{
+			if (stripos($this->_agent, 'icab') !== false) {
+				$aversion = explode(' ', stristr(str_replace('/', ' ', $this->_agent), 'icab'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_ICAB);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is OmniWeb or not (last updated 1.7)
+		 * @return boolean True if the browser is OmniWeb otherwise false
+		 */
+		protected function checkBrowserOmniWeb()
+		{
+			if (stripos($this->_agent, 'omniweb') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'omniweb'));
+				$aversion = explode(' ', isset($aresult[1]) ? $aresult[1] : "");
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_OMNIWEB);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Phoenix or not (last updated 1.7)
+		 * @return boolean True if the browser is Phoenix otherwise false
+		 */
+		protected function checkBrowserPhoenix()
+		{
+			if (stripos($this->_agent, 'Phoenix') !== false) {
+				$aversion = explode('/', stristr($this->_agent, 'Phoenix'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_PHOENIX);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firebird or not (last updated 1.7)
+		 * @return boolean True if the browser is Firebird otherwise false
+		 */
+		protected function checkBrowserFirebird()
+		{
+			if (stripos($this->_agent, 'Firebird') !== false) {
+				$aversion = explode('/', stristr($this->_agent, 'Firebird'));
+				if (isset($aversion[1])) {
+					$this->setVersion($aversion[1]);
+					$this->setBrowser(self::BROWSER_FIREBIRD);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Netscape Navigator 9+ or not (last updated 1.7)
+		 * NOTE: (http://browser.netscape.com/ - Official support ended on March 1st, 2008)
+		 * @return boolean True if the browser is Netscape Navigator 9+ otherwise false
+		 */
+		protected function checkBrowserNetscapeNavigator9Plus()
+		{
+			if (stripos($this->_agent, 'Firefox') !== false && preg_match('/Navigator\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
+				return true;
+			} else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Shiretoko or not (https://wiki.mozilla.org/Projects/shiretoko) (last updated 1.7)
+		 * @return boolean True if the browser is Shiretoko otherwise false
+		 */
+		protected function checkBrowserShiretoko()
+		{
+			if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/Shiretoko\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_SHIRETOKO);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Ice Cat or not (http://en.wikipedia.org/wiki/GNU_IceCat) (last updated 1.7)
+		 * @return boolean True if the browser is Ice Cat otherwise false
+		 */
+		protected function checkBrowserIceCat()
+		{
+			if (stripos($this->_agent, 'Mozilla') !== false && preg_match('/IceCat\/([^ ]*)/i', $this->_agent, $matches)) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_ICECAT);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Nokia or not (last updated 1.7)
+		 * @return boolean True if the browser is Nokia otherwise false
+		 */
+		protected function checkBrowserNokia()
+		{
+			if (preg_match("/Nokia([^\/]+)\/([^ SP]+)/i", $this->_agent, $matches)) {
+				$this->setVersion($matches[2]);
+				if (stripos($this->_agent, 'Series60') !== false || strpos($this->_agent, 'S60') !== false) {
+					$this->setBrowser(self::BROWSER_NOKIA_S60);
+				} else {
+					$this->setBrowser(self::BROWSER_NOKIA);
+				}
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firefox or not (last updated 1.7)
+		 * @return boolean True if the browser is Firefox otherwise false
+		 */
+		protected function checkBrowserFirefox()
+		{
+			if (stripos($this->_agent, 'safari') === false) {
+				if (preg_match("/Firefox[\/ \(]([^ ;\)]+)/i", $this->_agent, $matches)) {
+					$this->setVersion($matches[1]);
+					$this->setBrowser(self::BROWSER_FIREFOX);
+					//Firefox on Android
+					if (stripos($this->_agent, 'Android') !== false) {
+						if (stripos($this->_agent, 'Mobile') !== false) {
+							$this->setMobile(true);
+						} else {
+							$this->setTablet(true);
+						}
+					}
+					return true;
+				} else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
+					$this->setVersion("");
+					$this->setBrowser(self::BROWSER_FIREFOX);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Firefox or not (last updated 1.7)
+		 * @return boolean True if the browser is Firefox otherwise false
+		 */
+		protected function checkBrowserIceweasel()
+		{
+			if (stripos($this->_agent, 'Iceweasel') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Iceweasel'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_ICEWEASEL);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Mozilla or not (last updated 1.7)
+		 * @return boolean True if the browser is Mozilla otherwise false
+		 */
+		protected function checkBrowserMozilla()
+		{
+			if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+				$aversion = explode(' ', stristr($this->_agent, 'rv:'));
+				preg_match('/rv:[0-9].[0-9][a-b]?/i', $this->_agent, $aversion);
+				$this->setVersion(str_replace('rv:', '', $aversion[0]));
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			} else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+				$aversion = explode('', stristr($this->_agent, 'rv:'));
+				$this->setVersion(str_replace('rv:', '', $aversion[0]));
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			} else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
+				$this->setVersion($matches[1]);
+				$this->setBrowser(self::BROWSER_MOZILLA);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Lynx or not (last updated 1.7)
+		 * @return boolean True if the browser is Lynx otherwise false
+		 */
+		protected function checkBrowserLynx()
+		{
+			if (stripos($this->_agent, 'lynx') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Lynx'));
+				$aversion = explode(' ', (isset($aresult[1]) ? $aresult[1] : ""));
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_LYNX);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Amaya or not (last updated 1.7)
+		 * @return boolean True if the browser is Amaya otherwise false
+		 */
+		protected function checkBrowserAmaya()
+		{
+			if (stripos($this->_agent, 'amaya') !== false) {
+				$aresult = explode('/', stristr($this->_agent, 'Amaya'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+					$this->setBrowser(self::BROWSER_AMAYA);
+					return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Safari or not (last updated 1.7)
+		 * @return boolean True if the browser is Safari otherwise false
+		 */
+		protected function checkBrowserSafari()
+		{
+			if (stripos($this->_agent, 'Safari') !== false
+				&& stripos($this->_agent, 'iPhone') === false
+				&& stripos($this->_agent, 'iPod') === false
+			) {
+
+				$aresult = explode('/', stristr($this->_agent, 'Version'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				$this->setBrowser(self::BROWSER_SAFARI);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect if URL is loaded from FacebookExternalHit
+		 * @return boolean True if it detects FacebookExternalHit otherwise false
+		 */
+		protected function checkFacebookExternalHit()
+		{
+			if (stristr($this->_agent, 'FacebookExternalHit')) {
+				$this->setRobot(true);
+				$this->setFacebook(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect if URL is being loaded from internal Facebook browser
+		 * @return boolean True if it detects internal Facebook browser otherwise false
+		 */
+		protected function checkForFacebookIos()
+		{
+			if (stristr($this->_agent, 'FBIOS')) {
+				$this->setFacebook(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect Version for the Safari browser on iOS devices
+		 * @return boolean True if it detects the version correctly otherwise false
+		 */
+		protected function getSafariVersionOnIos()
+		{
+			$aresult = explode('/', stristr($this->_agent, 'Version'));
+			if (isset($aresult[1])) {
+				$aversion = explode(' ', $aresult[1]);
+				$this->setVersion($aversion[0]);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Detect Version for the Chrome browser on iOS devices
+		 * @return boolean True if it detects the version correctly otherwise false
+		 */
+		protected function getChromeVersionOnIos()
+		{
+			$aresult = explode('/', stristr($this->_agent, 'CriOS'));
+			if (isset($aresult[1])) {
+				$aversion = explode(' ', $aresult[1]);
+				$this->setVersion($aversion[0]);
+				$this->setBrowser(self::BROWSER_CHROME);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPhone or not (last updated 1.7)
+		 * @return boolean True if the browser is iPhone otherwise false
+		 */
+		protected function checkBrowseriPhone()
+		{
+			if (stripos($this->_agent, 'iPhone') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPHONE);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPad or not (last updated 1.7)
+		 * @return boolean True if the browser is iPad otherwise false
+		 */
+		protected function checkBrowseriPad()
+		{
+			if (stripos($this->_agent, 'iPad') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPAD);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setTablet(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is iPod or not (last updated 1.7)
+		 * @return boolean True if the browser is iPod otherwise false
+		 */
+		protected function checkBrowseriPod()
+		{
+			if (stripos($this->_agent, 'iPod') !== false) {
+				$this->setVersion(self::VERSION_UNKNOWN);
+				$this->setBrowser(self::BROWSER_IPOD);
+				$this->getSafariVersionOnIos();
+				$this->getChromeVersionOnIos();
+				$this->checkForFacebookIos();
+				$this->setMobile(true);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine if the browser is Android or not (last updated 1.7)
+		 * @return boolean True if the browser is Android otherwise false
+		 */
+		protected function checkBrowserAndroid()
+		{
+			if (stripos($this->_agent, 'Android') !== false) {
+				$aresult = explode(' ', stristr($this->_agent, 'Android'));
+				if (isset($aresult[1])) {
+					$aversion = explode(' ', $aresult[1]);
+					$this->setVersion($aversion[0]);
+				} else {
+					$this->setVersion(self::VERSION_UNKNOWN);
+				}
+				if (stripos($this->_agent, 'Mobile') !== false) {
+					$this->setMobile(true);
+				} else {
+					$this->setTablet(true);
+				}
+				$this->setBrowser(self::BROWSER_ANDROID);
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * Determine the user's platform (last updated 1.7)
+		 */
+		protected function checkPlatform()
+		{
+			if (stripos($this->_agent, 'windows') !== false) {
+				$this->_platform = self::PLATFORM_WINDOWS;
+			} else if (stripos($this->_agent, 'iPad') !== false) {
+				$this->_platform = self::PLATFORM_IPAD;
+			} else if (stripos($this->_agent, 'iPod') !== false) {
+				$this->_platform = self::PLATFORM_IPOD;
+			} else if (stripos($this->_agent, 'iPhone') !== false) {
+				$this->_platform = self::PLATFORM_IPHONE;
+			} elseif (stripos($this->_agent, 'mac') !== false) {
+				$this->_platform = self::PLATFORM_APPLE;
+			} elseif (stripos($this->_agent, 'android') !== false) {
+				$this->_platform = self::PLATFORM_ANDROID;
+			} elseif (stripos($this->_agent, 'linux') !== false) {
+				$this->_platform = self::PLATFORM_LINUX;
+			} else if (stripos($this->_agent, 'Nokia') !== false) {
+				$this->_platform = self::PLATFORM_NOKIA;
+			} else if (stripos($this->_agent, 'BlackBerry') !== false) {
+				$this->_platform = self::PLATFORM_BLACKBERRY;
+			} elseif (stripos($this->_agent, 'FreeBSD') !== false) {
+				$this->_platform = self::PLATFORM_FREEBSD;
+			} elseif (stripos($this->_agent, 'OpenBSD') !== false) {
+				$this->_platform = self::PLATFORM_OPENBSD;
+			} elseif (stripos($this->_agent, 'NetBSD') !== false) {
+				$this->_platform = self::PLATFORM_NETBSD;
+			} elseif (stripos($this->_agent, 'OpenSolaris') !== false) {
+				$this->_platform = self::PLATFORM_OPENSOLARIS;
+			} elseif (stripos($this->_agent, 'SunOS') !== false) {
+				$this->_platform = self::PLATFORM_SUNOS;
+			} elseif (stripos($this->_agent, 'OS\/2') !== false) {
+				$this->_platform = self::PLATFORM_OS2;
+			} elseif (stripos($this->_agent, 'BeOS') !== false) {
+				$this->_platform = self::PLATFORM_BEOS;
+			} elseif (stripos($this->_agent, 'win') !== false) {
+				$this->_platform = self::PLATFORM_WINDOWS;
+			}
+
+		}
+	}
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -353,9 +353,9 @@
          */
         public function __toString()
         {
-            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n" .
-            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n" .
-            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n" .
+            return "<strong>Browser Name:</strong> {$this->getBrowser()}<br/>\n".
+            "<strong>Browser Version:</strong> {$this->getVersion()}<br/>\n".
+            "<strong>Browser User Agent String:</strong> {$this->getUserAgent()}<br/>\n".
             "<strong>Platform:</strong> {$this->getPlatform()}<br/>";
         }
 

includes/feeds/grouped-calendars.php

Spacing +56 added lines, -56 removed lines

@@ -10,7 +10,7 @@ 
 use SimpleCalendar\Abstracts\Feed;
 use SimpleCalendar\Feeds\Admin\Grouped_Calendars_Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,22 +38,22 @@ 
 	 *
 	 * @param string|Calendar $calendar
 	 */
-	public function __construct( $calendar = '' ) {
+	public function __construct($calendar = '') {
 
-		parent::__construct( $calendar );
+		parent::__construct($calendar);
 
 		$this->type = 'grouped-calendars';
-		$this->name = __( 'Grouped Calendar', 'google-calendar-events' );
+		$this->name = __('Grouped Calendar', 'google-calendar-events');
 
-		if ( $this->post_id > 0 ) {
+		if ($this->post_id > 0) {
 			$this->set_source();
-			if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+			if ( ! is_admin() || defined('DOING_AJAX')) {
 				$this->events = $this->get_events();
 			}
 		}
 
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
-			new Grouped_Calendars_Admin( $this );
+		if (is_admin() && ! defined('DOING_AJAX')) {
+			new Grouped_Calendars_Admin($this);
 		}
 	}
 
@@ -64,38 +64,38 @@ 
 	 *
 	 * @param array $ids Array of calendar ids.
 	 */
-	public function set_source( $ids = array() ) {
+	public function set_source($ids = array()) {
 
-		$source = get_post_meta( $this->post_id, '_grouped_calendars_source', true );
+		$source = get_post_meta($this->post_id, '_grouped_calendars_source', true);
 
-		if ( 'ids' == $source ) {
+		if ('ids' == $source) {
 
-			if ( empty( $ids ) ) {
-				$ids = get_post_meta( $this->post_id, '_grouped_calendars_ids', true );
+			if (empty($ids)) {
+				$ids = get_post_meta($this->post_id, '_grouped_calendars_ids', true);
 			}
 
-			$this->calendars_ids = ! empty( $ids ) && is_array( $ids ) ? array_map( 'absint', $ids ) : array();
+			$this->calendars_ids = ! empty($ids) && is_array($ids) ? array_map('absint', $ids) : array();
 
-		} elseif ( 'category' == $source ) {
+		} elseif ('category' == $source) {
 
-			$categories = get_post_meta( $this->post_id, '_grouped_calendars_category', true );
+			$categories = get_post_meta($this->post_id, '_grouped_calendars_category', true);
 
-			if ( $categories && is_array( $categories ) ) {
+			if ($categories && is_array($categories)) {
 
 				$tax_query = array(
 					'taxonomy' => 'calendar_category',
 					'field'    => 'term_id',
-					'terms'    => array_map( 'absint', $categories ),
+					'terms'    => array_map('absint', $categories),
 				);
 
-				$calendars = get_posts( array(
+				$calendars = get_posts(array(
 					'post_type' => 'calendar',
-					'tax_query' => array( $tax_query ),
+					'tax_query' => array($tax_query),
 					'nopaging'  => true,
 					'fields'    => 'ids',
-				) );
+				));
 
-				$this->calendars_ids = ! empty( $calendars ) && is_array( $calendars ) ? $calendars : array();
+				$this->calendars_ids = ! empty($calendars) && is_array($calendars) ? $calendars : array();
 			}
 
 		}
@@ -111,57 +111,57 @@ 
 	public function get_events() {
 
 		$ids    = $this->calendars_ids;
-		$events = get_transient( '_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type );
+		$events = get_transient('_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type);
 
-		if ( empty( $events ) && ! empty( $ids ) && is_array( $ids ) ) {
+		if (empty($events) && ! empty($ids) && is_array($ids)) {
 
 			$events = array();
 
-			foreach ( $ids as $cal_id ) {
+			foreach ($ids as $cal_id) {
 
-				$calendar = simcal_get_calendar( intval( $cal_id ) );
+				$calendar = simcal_get_calendar(intval($cal_id));
 
-				simcal_delete_feed_transients( $cal_id );
+				simcal_delete_feed_transients($cal_id);
 
-				if ( $calendar instanceof Calendar ) {
+				if ($calendar instanceof Calendar) {
 
 					// Sometimes the calendars might have events at the same time from different calendars
 					// When merging the arrays together some of the events will be lost because the keys are the same and one will overwrite the other
 					// This snippet checks if the key already exists in the master events array and if it does it subtracts 1 from it to make the key unique and then unsets the original key.
-					foreach( $calendar->events as $k => $v ) {
-						$calendar->events[ $this->update_array_timestamp( $events, $k ) ] = $v;
+					foreach ($calendar->events as $k => $v) {
+						$calendar->events[$this->update_array_timestamp($events, $k)] = $v;
 					}
 
-					$events = is_array( $calendar->events ) ? $events + $calendar->events : $events;
+					$events = is_array($calendar->events) ? $events + $calendar->events : $events;
 				}
 
 			}
 
-			if ( ! empty( $events ) ) {
+			if ( ! empty($events)) {
 
 				// Trim events to set the earliest one as specified in feed settings.
-				$earliest_event = intval( $this->time_min );
-				if ( $earliest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_before' ) );
+				$earliest_event = intval($this->time_min);
+				if ($earliest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_before'));
 				}
 
 				// Trim events to set the latest one as specified in feed settings.
-				$latest_event = intval( $this->time_max );
-				if ( $latest_event > 0 ) {
-					$events = $this->array_filter_key( $events, array( $this, 'filter_events_after' ) );
+				$latest_event = intval($this->time_max);
+				if ($latest_event > 0) {
+					$events = $this->array_filter_key($events, array($this, 'filter_events_after'));
 				}
 
 				set_transient(
-					'_simple-calendar_feed_id_' . strval( $this->post_id ) . '_' . $this->type,
+					'_simple-calendar_feed_id_'.strval($this->post_id).'_'.$this->type,
 					$events,
-					absint( $this->cache )
+					absint($this->cache)
 				);
 			}
 
 		}
 	
 		// Sort events by start time before returning
-		uasort( $events, array( $this, 'sort_by_start_time' ) );
+		uasort($events, array($this, 'sort_by_start_time'));
 
 		return $events;
 	}
@@ -169,10 +169,10 @@ 
 	/*
 	 * Recursive function to adjust the timestamp array indices that are the same.
 	 */
-	public function update_array_timestamp( $arr, $i ) {
+	public function update_array_timestamp($arr, $i) {
 
-		if ( array_key_exists( $i, $arr ) ) {
-			$i = $this->update_array_timestamp( $arr, $i - 1 );
+		if (array_key_exists($i, $arr)) {
+			$i = $this->update_array_timestamp($arr, $i - 1);
 		}
 
 		return $i;
@@ -184,12 +184,12 @@ 
 	 * @since  3.0.13
 	 * @access private
 	 */
-	private function sort_by_start_time( $a, $b ) {
-		if ( $a == $b ) {
+	private function sort_by_start_time($a, $b) {
+		if ($a == $b) {
 			return 0;
 		}
 
-		return ( $a[0]->start < $b[0]->start ) ? -1 : 1;
+		return ($a[0]->start < $b[0]->start) ? -1 : 1;
 	}
 
 
@@ -207,9 +207,9 @@ 
 	 *
 	 * @return array
 	 */
-	private function array_filter_key( array $array, $callback ) {
-		$matched_keys = array_filter( array_keys( $array ), $callback );
-		return array_intersect_key( $array, array_flip( $matched_keys ) );
+	private function array_filter_key(array $array, $callback) {
+		$matched_keys = array_filter(array_keys($array), $callback);
+		return array_intersect_key($array, array_flip($matched_keys));
 	}
 
 	/**
@@ -222,9 +222,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_before( $event ) {
-		if ( $this->time_min !== 0 ) {
-			return intval( $event ) > intval( $this->time_min );
+	private function filter_events_before($event) {
+		if ($this->time_min !== 0) {
+			return intval($event) > intval($this->time_min);
 		}
 		return true;
 	}
@@ -239,9 +239,9 @@ 
 	 *
 	 * @return bool
 	 */
-	private function filter_events_after( $event ) {
-		if ( $this->time_max !== 0 ) {
-			return intval( $event ) < intval( $this->time_max );
+	private function filter_events_after($event) {
+		if ($this->time_max !== 0) {
+			return intval($event) < intval($this->time_max);
 		}
 		return true;
 	}

includes/objects.php

Spacing +87 added lines, -87 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts as Object;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -31,27 +31,27 @@ 
 	public function __construct() {
 
 		// Add default feed type.
-		add_filter( 'simcal_get_feed_types', function( $feed_types ) {
-			return array_merge( $feed_types, array(
+		add_filter('simcal_get_feed_types', function($feed_types) {
+			return array_merge($feed_types, array(
 				'google',
 				'grouped-calendars',
-			) );
-		}, 10, 1 );
+			));
+		}, 10, 1);
 
 		// Add default calendar type.
-		add_filter( 'simcal_get_calendar_types', function( $calendar_types ) {
-			return array_merge( $calendar_types, array(
+		add_filter('simcal_get_calendar_types', function($calendar_types) {
+			return array_merge($calendar_types, array(
 				'default-calendar' => array(
 					'grid',
 					'list',
 				),
-			) );
-		}, 10, 1 );
+			));
+		}, 10, 1);
 
 		// Add default admin objects.
-		if ( $is_admin = is_admin() ) {
-			add_filter( 'simcal_get_admin_pages', function( $admin_pages ) {
-				return array_merge( $admin_pages, array(
+		if ($is_admin = is_admin()) {
+			add_filter('simcal_get_admin_pages', function($admin_pages) {
+				return array_merge($admin_pages, array(
 					'add-ons' => array(
 						'add-ons',
 					),
@@ -63,11 +63,11 @@ 
 					'tools' => array(
 						'system-status',
 					),
-				) );
-			}, 10, 1 );
+				));
+			}, 10, 1);
 		}
 
-		do_action( 'simcal_load_objects', $is_admin );
+		do_action('simcal_load_objects', $is_admin);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @return array
 	 */
 	public function get_feed_types() {
-		$array = apply_filters( 'simcal_get_feed_types', array() );
-		ksort( $array );
+		$array = apply_filters('simcal_get_feed_types', array());
+		ksort($array);
 		return $array;
 	}
 
@@ -91,8 +91,8 @@ 
 	 * @return array
 	 */
 	public function get_calendar_types() {
-		$array = apply_filters( 'simcal_get_calendar_types', array() );
-		ksort( $array );
+		$array = apply_filters('simcal_get_calendar_types', array());
+		ksort($array);
 		return $array;
 	}
 
@@ -104,7 +104,7 @@ 
 	 * @return array
 	 */
 	public function get_admin_pages() {
-		return apply_filters( 'simcal_get_admin_pages', array() );
+		return apply_filters('simcal_get_admin_pages', array());
 	}
 
 	/**
@@ -118,30 +118,30 @@ 
 	 *
 	 * @return null|Object\Calendar
 	 */
-	public function get_calendar( $object ) {
+	public function get_calendar($object) {
 
-		if ( is_string( $object ) ) {
-			return ! empty( $object ) ? $this->get_object( $object, 'calendar', '' ) : null;
+		if (is_string($object)) {
+			return ! empty($object) ? $this->get_object($object, 'calendar', '') : null;
 		}
 
-		if ( is_object( $object ) ) {
-			if ( $object instanceof Object\Calendar ) {
-				return $this->get_object( $object->type, 'feed', $object );
-			} elseif ( $object instanceof \WP_Post ) {
-				if ( $type = wp_get_object_terms( $object->ID, 'calendar_type' ) ) {
-					$name = sanitize_title( current( $type )->name );
-					return $this->get_object( $name, 'calendar', $object );
+		if (is_object($object)) {
+			if ($object instanceof Object\Calendar) {
+				return $this->get_object($object->type, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				if ($type = wp_get_object_terms($object->ID, 'calendar_type')) {
+					$name = sanitize_title(current($type)->name);
+					return $this->get_object($name, 'calendar', $object);
 				}
-			} elseif ( isset( $object->type ) && isset( $object->id ) ) {
-				return $this->get_object( $object->type, 'calendar', $object->id );
+			} elseif (isset($object->type) && isset($object->id)) {
+				return $this->get_object($object->type, 'calendar', $object->id);
 			}
 		}
 
-		if ( is_int( $object ) ) {
-			$post = get_post( $object );
-			if ( $post && ( $type = wp_get_object_terms( $post->ID, 'calendar_type' ) ) ) {
-				$name = sanitize_title( current( $type )->name );
-				return $this->get_object( $name, 'calendar', $post );
+		if (is_int($object)) {
+			$post = get_post($object);
+			if ($post && ($type = wp_get_object_terms($post->ID, 'calendar_type'))) {
+				$name = sanitize_title(current($type)->name);
+				return $this->get_object($name, 'calendar', $post);
 			}
 		}
 
@@ -158,20 +158,20 @@ 
 	 *
 	 * @return null|Object\Calendar_View
 	 */
-	public function get_calendar_view( $id = 0, $name = '' ) {
+	public function get_calendar_view($id = 0, $name = '') {
 
-		if ( ! $name && $id > 0 ) {
+		if ( ! $name && $id > 0) {
 
-			$calendar_view = get_post_meta( $id, '_calendar_view', true );
+			$calendar_view = get_post_meta($id, '_calendar_view', true);
 
-			if ( $terms = wp_get_object_terms( $id, 'calendar_type' ) ) {
-				$calendar_type = sanitize_title( current( $terms )->name );
-				$name = isset( $calendar_view[ $calendar_type ] ) ? $calendar_type . '-' . $calendar_view[ $calendar_type ] : '';
+			if ($terms = wp_get_object_terms($id, 'calendar_type')) {
+				$calendar_type = sanitize_title(current($terms)->name);
+				$name = isset($calendar_view[$calendar_type]) ? $calendar_type.'-'.$calendar_view[$calendar_type] : '';
 			}
 
 		}
 
-		return $name ? $this->get_object( $name, 'calendar-view', '' ) : null;
+		return $name ? $this->get_object($name, 'calendar-view', '') : null;
 	}
 
 	/**
@@ -185,41 +185,41 @@ 
 	 *
 	 * @return null|Object\Feed
 	 */
-	public function get_feed( $object ) {
+	public function get_feed($object) {
 
-		if ( is_string( $object ) ) {
-			return ! empty( $object ) ? $this->get_object( $object, 'feed', '' ) : null;
+		if (is_string($object)) {
+			return ! empty($object) ? $this->get_object($object, 'feed', '') : null;
 		}
 
-		if ( is_object( $object ) ) {
-			if ( $object instanceof Object\Calendar ) {
+		if (is_object($object)) {
+			if ($object instanceof Object\Calendar) {
 				$feed_name = '';
-				if ( empty( $object->feed ) ) {
-					if ( $feed_type = wp_get_object_terms( $object->id, 'feed_type' ) ) {
-						$feed_name = sanitize_title( current( $feed_type )->name );
+				if (empty($object->feed)) {
+					if ($feed_type = wp_get_object_terms($object->id, 'feed_type')) {
+						$feed_name = sanitize_title(current($feed_type)->name);
 					}
 				} else {
 					$feed_name = $object->feed;
 				}
-				return $this->get_object( $feed_name, 'feed', $object );
-			} elseif ( $object instanceof \WP_Post ) {
-				$calendar = $this->get_calendar( $object );
+				return $this->get_object($feed_name, 'feed', $object);
+			} elseif ($object instanceof \WP_Post) {
+				$calendar = $this->get_calendar($object);
 
-				if ( isset( $calendar->feed ) ) {
-					return $this->get_object( $calendar->feed, 'feed', $calendar );
+				if (isset($calendar->feed)) {
+					return $this->get_object($calendar->feed, 'feed', $calendar);
 				} else {
 					return null;
 				}
 
 
-			} elseif ( isset( $object->feed ) && isset( $object->id ) ) {
-				return $this->get_object( $object->feed, 'feed', $object );
+			} elseif (isset($object->feed) && isset($object->id)) {
+				return $this->get_object($object->feed, 'feed', $object);
 			}
 		}
 
-		if ( is_int( $object ) ) {
-			$calendar = $this->get_calendar( $object );
-			return isset( $calendar->feed ) ? $this->get_object( $calendar->feed, 'feed', $calendar ) : null;
+		if (is_int($object)) {
+			$calendar = $this->get_calendar($object);
+			return isset($calendar->feed) ? $this->get_object($calendar->feed, 'feed', $calendar) : null;
 		}
 
 		return null;
@@ -235,13 +235,13 @@ 
 	 *
 	 * @return null|Object\Field
 	 */
-	public function get_field( $args, $name = '' ) {
+	public function get_field($args, $name = '') {
 
-		if ( empty( $name ) ) {
-			$name = isset( $args['type'] ) ? $args['type'] : false;
+		if (empty($name)) {
+			$name = isset($args['type']) ? $args['type'] : false;
 		}
 
-		return $name ? $this->get_object( $name, 'field', $args ) : null;
+		return $name ? $this->get_object($name, 'field', $args) : null;
 	}
 
 	/**
@@ -253,8 +253,8 @@ 
 	 *
 	 * @return null|Object\Admin_Page
 	 */
-	public function get_admin_page( $name ) {
-		return $name ? $this->get_object( $name, 'admin-page' ) : null;
+	public function get_admin_page($name) {
+		return $name ? $this->get_object($name, 'admin-page') : null;
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	 *
 	 * @return null|Object
 	 */
-	private function get_object( $name, $type, $args = '' ) {
+	private function get_object($name, $type, $args = '') {
 
 		$types = array(
 			'admin-page',
@@ -279,11 +279,11 @@ 
 			'field',
 		);
 
-		if ( in_array( $type, $types ) ) {
+		if (in_array($type, $types)) {
 
-			$class_name = $this->make_class_name( $name, $type );
-			$parent     = '\\' . __NAMESPACE__ . '\Abstracts\\' . implode( '_', array_map( 'ucfirst', explode( '-', $type ) ) );
-			$class      = class_exists( $class_name ) ? new $class_name( $args ) : false;
+			$class_name = $this->make_class_name($name, $type);
+			$parent     = '\\'.__NAMESPACE__.'\Abstracts\\'.implode('_', array_map('ucfirst', explode('-', $type)));
+			$class      = class_exists($class_name) ? new $class_name($args) : false;
 
 			return $class instanceof $parent ? $class : null;
 		}
@@ -305,25 +305,25 @@ 
 	 *
 	 * @return string The class name complete with its full namespace.
 	 */
-	private function make_class_name( $name, $type ) {
-
-		if ( 'calendar' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Calendars\\';
-		} elseif ( 'calendar-view' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Calendars\Views\\';
-		} elseif ( 'feed' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Feeds\\';
-		} elseif ( 'field' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Admin\Fields\\';
-		} elseif ( 'admin-page' == $type ) {
-			$namespace = '\\' . __NAMESPACE__ . '\Admin\Pages\\';
+	private function make_class_name($name, $type) {
+
+		if ('calendar' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Calendars\\';
+		} elseif ('calendar-view' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Calendars\Views\\';
+		} elseif ('feed' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Feeds\\';
+		} elseif ('field' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Admin\Fields\\';
+		} elseif ('admin-page' == $type) {
+			$namespace = '\\'.__NAMESPACE__.'\Admin\Pages\\';
 		} else {
 			return '';
 		}
 
-		$class_name = implode( '_', array_map( 'ucfirst', explode( '-', $name ) ) );
+		$class_name = implode('_', array_map('ucfirst', explode('-', $name)));
 
-		return $namespace . $class_name;
+		return $namespace.$class_name;
 	}
 
 }

includes/feeds/admin/grouped-calendars-admin.php

Spacing +40 added lines, -40 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Feeds\Grouped_Calendars;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,15 +34,15 @@ 
 	 *
 	 * @param Grouped_Calendars $feed
 	 */
-	public function __construct( Grouped_Calendars $feed ) {
+	public function __construct(Grouped_Calendars $feed) {
 
 		$this->feed = $feed;
 
-		if ( 'calendar' == simcal_is_admin_screen() ) {
-			add_filter( 'simcal_settings_meta_tabs_li', array( $this, 'add_settings_meta_tab_li' ), 10, 1 );
-			add_action( 'simcal_settings_meta_panels', array( $this, 'add_settings_meta_panel' ), 10, 1 );
+		if ('calendar' == simcal_is_admin_screen()) {
+			add_filter('simcal_settings_meta_tabs_li', array($this, 'add_settings_meta_tab_li'), 10, 1);
+			add_action('simcal_settings_meta_panels', array($this, 'add_settings_meta_panel'), 10, 1);
 		}
-		add_action( 'simcal_process_settings_meta', array( $this, 'process_meta' ), 10, 1 );
+		add_action('simcal_process_settings_meta', array($this, 'process_meta'), 10, 1);
 	}
 
 	/**
@@ -54,8 +54,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_settings_meta_tab_li( $tabs ) {
-		return array_merge( $tabs, array(
+	public function add_settings_meta_tab_li($tabs) {
+		return array_merge($tabs, array(
 			'grouped-calendars' => array(
 				'label'   => $this->feed->name,
 				'target'  => 'grouped-calendars-settings-panel',
@@ -75,40 +75,40 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function add_settings_meta_panel( $post_id ) {
+	public function add_settings_meta_panel($post_id) {
 
 		?>
 		<div id="grouped-calendars-settings-panel" class="simcal-panel">
 			<table>
 				<thead>
-				<tr><th colspan="2"><?php _e( 'Grouped Calendar Settings', 'google-calendar-events' ); ?></th></tr>
+				<tr><th colspan="2"><?php _e('Grouped Calendar Settings', 'google-calendar-events'); ?></th></tr>
 				</thead>
 				<tbody class="simcal-panel-section">
 				<tr class="simcal-panel-field">
-					<th><label for="_grouped_calendars_source"><?php _e( 'Get Calendars From', 'google-calendar-events' ); ?></label></th>
+					<th><label for="_grouped_calendars_source"><?php _e('Get Calendars From', 'google-calendar-events'); ?></label></th>
 					<td>
 						<?php
 
-						$source = esc_attr( get_post_meta( $post_id, '_grouped_calendars_source', true ) );
-						$source = empty( $source ) ? 'ids' : $source;
+						$source = esc_attr(get_post_meta($post_id, '_grouped_calendars_source', true));
+						$source = empty($source) ? 'ids' : $source;
 
 						?>
 						<select name="_grouped_calendars_source"
 						        id="_grouped_calendars_source"
 						        class="simcal-field simcal-field-select simcal-field-inline simcal-field-show-other"
 						        data-show-field-on-choice="true">
-							<option value="ids" data-show-field="_grouped_calendars_ids" <?php selected( 'ids', $source, true ); ?>><?php _e( 'Manual selection', 'google-calendar-events' ); ?></option>
-							<option value="category" data-show-field="_grouped_calendars_category" <?php selected( 'category', $source, true ); ?>><?php _e( 'Category', 'google-calendar-events' ); ?></option>
+							<option value="ids" data-show-field="_grouped_calendars_ids" <?php selected('ids', $source, true); ?>><?php _e('Manual selection', 'google-calendar-events'); ?></option>
+							<option value="category" data-show-field="_grouped_calendars_category" <?php selected('category', $source, true); ?>><?php _e('Category', 'google-calendar-events'); ?></option>
 						</select>
-						<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e( 'Choose from which calendar feeds you want to get events from. Choose them individually or select all those belonging to calendar feed categories.', 'google-calendar-events' ); ?>"></i>
+						<i class="simcal-icon-help simcal-help-tip" data-tip="<?php _e('Choose from which calendar feeds you want to get events from. Choose them individually or select all those belonging to calendar feed categories.', 'google-calendar-events'); ?>"></i>
 						<br><br>
 						<?php
 
-						$cals = simcal_get_calendars( $post_id );
-						$meta = get_post_meta( $post_id, '_grouped_calendars_ids', true );
-						$ids  = $meta && is_array( $meta ) ? implode( ',', array_map( 'absint', $meta ) ) : absint( $meta );
+						$cals = simcal_get_calendars($post_id);
+						$meta = get_post_meta($post_id, '_grouped_calendars_ids', true);
+						$ids  = $meta && is_array($meta) ? implode(',', array_map('absint', $meta)) : absint($meta);
 
-						simcal_print_field( array(
+						simcal_print_field(array(
 							'type'        => 'select',
 							'multiselect' => 'multiselect',
 							'name'        => '_grouped_calendars_ids',
@@ -116,25 +116,25 @@ 
 							'value'       => $ids !== 0 ? $ids : '',
 							'options'     => $cals,
 							'enhanced'    => 'enhanced',
-							'style'       => 'ids' == $source ? '' : array( 'display' => 'none' ),
+							'style'       => 'ids' == $source ? '' : array('display' => 'none'),
 							'attributes'  => array(
-								'data-noresults' => __( 'No results found.', 'google-calendar-events' ),
+								'data-noresults' => __('No results found.', 'google-calendar-events'),
 							),
 						));
 
-						$meta = get_post_meta( $post_id, '_grouped_calendars_category', true );
-						$category = $meta && is_array( $meta ) ? implode( ',', array_map( 'absint', $meta ) ): '';
+						$meta = get_post_meta($post_id, '_grouped_calendars_category', true);
+						$category = $meta && is_array($meta) ? implode(',', array_map('absint', $meta)) : '';
 
-						$terms = get_terms( 'calendar_category' );
+						$terms = get_terms('calendar_category');
 
-						if ( ! empty( $terms ) ) {
+						if ( ! empty($terms)) {
 
 							$categories = array();
-							foreach ( $terms as $term ) {
-								$categories[ $term->term_id ] = $term->name;
+							foreach ($terms as $term) {
+								$categories[$term->term_id] = $term->name;
 							}
 
-							simcal_print_field( array(
+							simcal_print_field(array(
 								'type'        => 'select',
 								'multiselect' => 'multiselect',
 								'name'        => '_grouped_calendars_category',
@@ -142,17 +142,17 @@ 
 								'value'       => $category,
 								'options'     => $categories,
 								'enhanced'    => 'enhanced',
-								'style'       => 'category' == $source ? '' : array( 'display' => 'none' ),
+								'style'       => 'category' == $source ? '' : array('display' => 'none'),
 								'attributes'  => array(
-									'data-noresults' => __( 'No results found.', 'google-calendar-events' ),
+									'data-noresults' => __('No results found.', 'google-calendar-events'),
 								),
-							) );
+							));
 
 						} else {
 
 							$style = 'category' == $source ? '' : 'display: none;';
 							$style .= ' width: 100%; max-width: 500px';
-							echo '<input type="text" disabled="disabled" name="_grouped_calendars_category" id="_grouped_calendars_category" style="' . $style . '" placeholder="' . __( 'There are no calendar categories yet.', 'google-calendar-events' ) . '" />';
+							echo '<input type="text" disabled="disabled" name="_grouped_calendars_category" id="_grouped_calendars_category" style="'.$style.'" placeholder="'.__('There are no calendar categories yet.', 'google-calendar-events').'" />';
 
 						}
 
@@ -173,16 +173,16 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public function process_meta( $post_id ) {
+	public function process_meta($post_id) {
 
-		$source = isset( $_POST['_grouped_calendars_source'] ) ? sanitize_key( $_POST['_grouped_calendars_source'] ) : 'ids';
-		update_post_meta( $post_id, '_grouped_calendars_source', $source );
+		$source = isset($_POST['_grouped_calendars_source']) ? sanitize_key($_POST['_grouped_calendars_source']) : 'ids';
+		update_post_meta($post_id, '_grouped_calendars_source', $source);
 
-		$ids = isset( $_POST['_grouped_calendars_ids'] ) ? array_map( 'absint', $_POST['_grouped_calendars_ids'] ) : '';
-		update_post_meta( $post_id, '_grouped_calendars_ids', $ids );
+		$ids = isset($_POST['_grouped_calendars_ids']) ? array_map('absint', $_POST['_grouped_calendars_ids']) : '';
+		update_post_meta($post_id, '_grouped_calendars_ids', $ids);
 
-		$category = isset( $_POST['_grouped_calendars_category'] ) ? array_map( 'absint', $_POST['_grouped_calendars_category'] ) : '';
-		update_post_meta( $post_id, '_grouped_calendars_category', $category );
+		$category = isset($_POST['_grouped_calendars_category']) ? array_map('absint', $_POST['_grouped_calendars_category']) : '';
+		update_post_meta($post_id, '_grouped_calendars_category', $category);
 
 	}
 

includes/admin/meta-boxes.php

Spacing +28 added lines, -28 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Admin\Metaboxes as Metabox;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -44,8 +44,8 @@ 
 	 */
 	public function __construct() {
 
-		$settings = get_option( 'simple-calendar_settings_calendars' );
-		if ( isset( $settings['general']['attach_calendars_posts'] ) ) {
+		$settings = get_option('simple-calendar_settings_calendars');
+		if (isset($settings['general']['attach_calendars_posts'])) {
 			$this->post_types = $settings['general']['attach_calendars_posts'];
 		}
 
@@ -53,17 +53,17 @@ 
 		new Metabox\Settings();
 		new Metabox\Attach_Calendar();
 		new Metabox\Newsletter();
-		do_action( 'simcal_load_meta_boxes' );
+		do_action('simcal_load_meta_boxes');
 
 		// Add meta boxes.
-		add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 30 );
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'), 30);
 
 		// Process meta boxes.
-		add_action( 'simcal_save_settings_meta','\SimpleCalendar\Admin\Metaboxes\Settings::save', 10, 2 );
-		add_action( 'simcal_save_attach_calendar_meta','\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::save', 10, 2 );
+		add_action('simcal_save_settings_meta', '\SimpleCalendar\Admin\Metaboxes\Settings::save', 10, 2);
+		add_action('simcal_save_attach_calendar_meta', '\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::save', 10, 2);
 
 		// Save meta boxes data.
-		add_action( 'save_post', array( $this, 'save_meta_boxes' ), 1, 2 );
+		add_action('save_post', array($this, 'save_meta_boxes'), 1, 2);
 
 		// Uncomment this for debugging $_POST while saving a meta box.
 		// add_action( 'save_post', function() { echo '<pre>'; print_r( $_POST ); echo '</pre>'; die(); } );
@@ -78,19 +78,19 @@ 
 
 		add_meta_box(
 			'simcal-calendar-settings',
-			__( 'Calendar Settings', 'google-calendar-events' ),
+			__('Calendar Settings', 'google-calendar-events'),
 			'\SimpleCalendar\Admin\Metaboxes\Settings::html',
 			'calendar',
 			'normal',
 			'core'
 		);
 
-		$addons = apply_filters( 'simcal_installed_addons', array() );
-		if ( empty( $addons ) ) {
+		$addons = apply_filters('simcal_installed_addons', array());
+		if (empty($addons)) {
 
 			add_meta_box(
 				'simcal-newsletter',
-				__( 'Get 20% off all Pro Add-ons', 'google-calendar-events' ),
+				__('Get 20% off all Pro Add-ons', 'google-calendar-events'),
 				'\SimpleCalendar\Admin\Metaboxes\Newsletter::html',
 				'calendar',
 				'side',
@@ -101,7 +101,7 @@ 
 
 		add_meta_box(
 			'simcal-get-shortcode',
-			__( 'Calendar Shortcode', 'google-calendar-events' ),
+			__('Calendar Shortcode', 'google-calendar-events'),
 			'\SimpleCalendar\Admin\Metaboxes\Get_Shortcode::html',
 			'calendar',
 			'side',
@@ -109,11 +109,11 @@ 
 		);
 
 		// Add meta box if there are calendars.
-		if ( ( true == simcal_get_calendars() ) && ! empty( $this->post_types ) ) {
-			foreach ( $this->post_types as $post_type ) {
+		if ((true == simcal_get_calendars()) && ! empty($this->post_types)) {
+			foreach ($this->post_types as $post_type) {
 				add_meta_box(
 					'simcal-attach-calendar',
-					__( 'Attach Calendar', 'google-calendar-events' ),
+					__('Attach Calendar', 'google-calendar-events'),
 					'\SimpleCalendar\Admin\Metaboxes\Attach_Calendar::html',
 					$post_type,
 					'side',
@@ -122,7 +122,7 @@ 
 			}
 		}
 
-		do_action( 'simcal_add_meta_boxes' );
+		do_action('simcal_add_meta_boxes');
 	}
 
 	/**
@@ -135,30 +135,30 @@ 
 	 *
 	 * @return void
 	 */
-	public function save_meta_boxes( $post_id, $post ) {
+	public function save_meta_boxes($post_id, $post) {
 
 		// $post_id and $post are required.
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Don't save meta boxes for revisions or autosaves.
-		if ( defined( 'DOING_AUTOSAVE' ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if (defined('DOING_AUTOSAVE') || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $_POST['simcal_meta_nonce'] ) || ! wp_verify_nonce( $_POST['simcal_meta_nonce'], 'simcal_save_data' ) ) {
+		if (empty($_POST['simcal_meta_nonce']) || ! wp_verify_nonce($_POST['simcal_meta_nonce'], 'simcal_save_data')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $_POST['post_ID'] ) || $_POST['post_ID'] != $post_id ) {
+		if (empty($_POST['post_ID']) || $_POST['post_ID'] != $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if ( ! current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
@@ -171,13 +171,13 @@ 
 		self::$saved_meta_boxes = true;
 
 		// Check the post type.
-		if ( 'calendar' == $post->post_type ) {
-			do_action( 'simcal_save_settings_meta', $post_id, $post );
-		} elseif ( in_array( $post->post_type, $this->post_types ) ) {
-			do_action( 'simcal_save_attach_calendar_meta', $post_id, $post );
+		if ('calendar' == $post->post_type) {
+			do_action('simcal_save_settings_meta', $post_id, $post);
+		} elseif (in_array($post->post_type, $this->post_types)) {
+			do_action('simcal_save_attach_calendar_meta', $post_id, $post);
 		}
 
-		do_action( 'simcal_save_meta_boxes', $post_id, $post );
+		do_action('simcal_save_meta_boxes', $post_id, $post);
 	}
 
 }

includes/admin/fields/license.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,10 +34,10 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
-		$this->addon      = isset( $field['addon'] ) ? esc_attr( $field['addon'] ) : '';
+	public function __construct($field) {
+		$this->addon      = isset($field['addon']) ? esc_attr($field['addon']) : '';
 		$this->type_class = 'simcal-field-license';
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -47,11 +47,11 @@ 
 	 */
 	public function html() {
 
-		if ( ! empty( $this->addon ) ) {
+		if ( ! empty($this->addon)) {
 
-			$status = apply_filters( 'simcal_addon_status_' . $this->addon, simcal_get_license_status( $this->addon ) );
+			$status = apply_filters('simcal_addon_status_'.$this->addon, simcal_get_license_status($this->addon));
 
-			if ( $status !== 'valid' ) {
+			if ($status !== 'valid') {
 				$display_activate   = 'display: inline-block';
 				$display_deactivate = 'display: none';
 				$active             = 'valid' == $status ? 'display: block' : 'display: none';
@@ -59,7 +59,7 @@ 
 			} else {
 				$display_activate   = $active = 'display: none';
 				$display_deactivate = 'display: inline-block';
-				$disabled           = empty( $this->value ) ? '' : 'disabled="disabled"';
+				$disabled           = empty($this->value) ? '' : 'disabled="disabled"';
 			}
 
 			?>
@@ -74,16 +74,16 @@ 
 				<span class="simcal-addon-manage-license-buttons">
 
 					<button class="button-secondary simcal-addon-manage-license deactivate" data-add-on="<?php echo $this->addon; ?>" style="<?php echo $display_deactivate; ?>">
-				        <i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e( 'Deactivate', 'google-calendar-events' ); ?>
+				        <i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e('Deactivate', 'google-calendar-events'); ?>
 					</button>
 
 					<button class="button-secondary simcal-addon-manage-license activate" data-add-on="<?php echo $this->addon; ?>" style="<?php echo $display_activate; ?>">
-						<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e( 'Activate', 'google-calendar-events' ); ?>
+						<i class="simcal-icon-spinner simcal-icon-spin" style="display: none;"></i><?php _e('Activate', 'google-calendar-events'); ?>
 					</button>
 
 					<span class="error" style="color: red; display: none"> </span>
 
-					<strong class="label" style="color:green; <?php echo $active; ?>"> <?php _e( '(active)', 'google-calendar-events' ); ?></strong>
+					<strong class="label" style="color:green; <?php echo $active; ?>"> <?php _e('(active)', 'google-calendar-events'); ?></strong>
 
 				</span>
 

includes/admin/fields/checkbox.php

Spacing +21 added lines, -21 removed lines

@@ -8,7 +8,7 @@ 
 
 use SimpleCalendar\Abstracts\Field;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
@@ -28,9 +28,9 @@ 
 	 *
 	 * @param array $field
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 		$this->type_class = 'simcal-field-checkboxes';
-		parent::__construct( $field );
+		parent::__construct($field);
 	}
 
 	/**
@@ -40,33 +40,33 @@ 
 	 */
 	public function html() {
 
-		if ( ! empty( $this->options ) && count( (array) $this->options ) > 1 ) {
+		if ( ! empty($this->options) && count((array) $this->options) > 1) {
 
-			if ( ! empty( $this->description ) ) {
-				echo '<p class="description">' . wp_kses_post( $this->description ) . ' ' . $this->tooltip . '</p>';
+			if ( ! empty($this->description)) {
+				echo '<p class="description">'.wp_kses_post($this->description).' '.$this->tooltip.'</p>';
 			}
 
 			?>
-			<fieldset class="<?php echo $this->class; ?>" <?php echo ! empty( $this->style ) ? 'style="' . $this->style . '"' : ''; ?>>
+			<fieldset class="<?php echo $this->class; ?>" <?php echo ! empty($this->style) ? 'style="'.$this->style.'"' : ''; ?>>
 				<?php
 
-				if ( ! empty( $this->title ) ) {
-					echo '<legend class="screen-reader-text"><span>' . $this->title . '</span></legend>';
+				if ( ! empty($this->title)) {
+					echo '<legend class="screen-reader-text"><span>'.$this->title.'</span></legend>';
 				}
 
 				?>
 				<ul>
-					<?php foreach ( $this->options as $option => $name ) : ?>
+					<?php foreach ($this->options as $option => $name) : ?>
 						<li>
-							<label for="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>">
+							<label for="<?php echo $this->id.'-'.trim(strval($option)); ?>">
 								<input name="<?php echo $this->name; ?>"
-								       id="<?php echo $this->id . '-' . trim( strval( $option ) ); ?>"
+								       id="<?php echo $this->id.'-'.trim(strval($option)); ?>"
 								       class="simcal-field simcal-field-checkbox"
 								       type="checkbox"
-								       value="<?php echo trim( strval( $option ) ); ?>"
-										<?php checked( $this->value, 'yes', true ); ?>
+								       value="<?php echo trim(strval($option)); ?>"
+										<?php checked($this->value, 'yes', true); ?>
 									<?php echo $this->attributes; ?>
-									/><?php echo esc_attr( $name ); ?>
+									/><?php echo esc_attr($name); ?>
 							</label>
 						</li>
 					<?php endforeach; ?>
@@ -77,8 +77,8 @@ 
 		} else {
 
 			?>
-			<span class="simcal-field-bool" <?php echo $this->style ? 'style="' . $this->style . '"' : ''; ?>>
-				<?php if ( ! empty( $this->title ) ) : ?>
+			<span class="simcal-field-bool" <?php echo $this->style ? 'style="'.$this->style.'"' : ''; ?>>
+				<?php if ( ! empty($this->title)) : ?>
 					<span class="screen-reader-text"><?php echo $this->title; ?></span>
 				<?php endif; ?>
 				<input name="<?php echo $this->name; ?>"
@@ -86,15 +86,15 @@ 
 				       id="<?php echo $this->id; ?>"
 				       class="simcal-field simcal-field-checkbox <?php echo $this->class; ?>"
 				       value="yes"
-					<?php checked( $this->value, 'yes', true ); ?>
-					<?php echo $this->attributes; ?>/><?php echo ( ! empty( $this->text ) ? $this->text : __( 'Yes', 'google-calendar-events' ) ); ?>
+					<?php checked($this->value, 'yes', true); ?>
+					<?php echo $this->attributes; ?>/><?php echo ( ! empty($this->text) ? $this->text : __('Yes', 'google-calendar-events')); ?>
 			</span>
 			<?php
 
 			echo $this->tooltip;
 
-			if ( ! empty( $this->description ) ) {
-				echo '<p class="description">' . wp_kses_post( $this->description ) . '</p>';
+			if ( ! empty($this->description)) {
+				echo '<p class="description">'.wp_kses_post($this->description).'</p>';
 			}
 
 		}

includes/admin/menus.php

Indentation +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
 			$links = array();
 			$links['add-ons'] = '<a href="' . simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'plugin-listing' ) . '" target="_blank" >' .
-			                           __( 'Add-ons', 'google-calendar-events' ) . '</a>';
+									   __( 'Add-ons', 'google-calendar-events' ) . '</a>';
 
 			return apply_filters( 'simcal_plugin_action_links', array_merge( $meta_links, $links ) );
 		}

Spacing +36 added lines, -36 removed lines

@@ -6,7 +6,7 @@ 
  */
 namespace SimpleCalendar\Admin;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -44,17 +44,17 @@ 
 
 		self::$main_menu = 'edit.php?post_type=calendar';
 
-		add_action( 'admin_menu', array( __CLASS__, 'add_menu_items' ) );
+		add_action('admin_menu', array(__CLASS__, 'add_menu_items'));
 
-		self::$plugin = plugin_basename( SIMPLE_CALENDAR_MAIN_FILE );
+		self::$plugin = plugin_basename(SIMPLE_CALENDAR_MAIN_FILE);
 
 		new Welcome();
 
 		// Links and meta content in plugins page.
-		add_filter( 'plugin_action_links_' . self::$plugin, array( __CLASS__, 'plugin_action_links' ), 10, 5 );
-		add_filter( 'plugin_row_meta', array( __CLASS__, 'plugin_row_meta' ), 10, 2 );
+		add_filter('plugin_action_links_'.self::$plugin, array(__CLASS__, 'plugin_action_links'), 10, 5);
+		add_filter('plugin_row_meta', array(__CLASS__, 'plugin_row_meta'), 10, 2);
 		// Custom text in admin footer.
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ), 1 );
+		add_filter('admin_footer_text', array($this, 'admin_footer_text'), 1);
 	}
 
 	/**
@@ -66,41 +66,41 @@ 
 
 		add_submenu_page(
 			self::$main_menu,
-			__( 'Settings', 'google-calendar-events' ),
-			__( 'Settings', 'google-calendar-events' ),
+			__('Settings', 'google-calendar-events'),
+			__('Settings', 'google-calendar-events'),
 			'manage_options',
 			'simple-calendar_settings',
-			function () {
-				$page = new Pages( 'settings' );
+			function() {
+				$page = new Pages('settings');
 				$page->html();
 			}
 		);
 
 		add_submenu_page(
 			self::$main_menu,
-			__( 'Add-ons', 'google-calendar-events' ),
-			__( 'Add-ons', 'google-calendar-events' ),
+			__('Add-ons', 'google-calendar-events'),
+			__('Add-ons', 'google-calendar-events'),
 			'manage_options',
 			'simple-calendar_add_ons',
 			function() {
-				$page = new Pages( 'add-ons' );
+				$page = new Pages('add-ons');
 				$page->html();
 			}
 		);
 
 		add_submenu_page(
 			self::$main_menu,
-			__( 'Tools', 'google-calendar-events' ),
-			__( 'Tools', 'google-calendar-events' ),
+			__('Tools', 'google-calendar-events'),
+			__('Tools', 'google-calendar-events'),
 			'manage_options',
 			'simple-calendar_tools',
-			function () {
-				$page = new Pages( 'tools' );
+			function() {
+				$page = new Pages('tools');
 				$page->html();
 			}
 		);
 
-		do_action( 'simcal_admin_add_menu_items' );
+		do_action('simcal_admin_add_menu_items');
 	}
 
 	/**
@@ -113,15 +113,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function plugin_action_links( $action_links, $file ) {
+	public static function plugin_action_links($action_links, $file) {
 
-		if ( self::$plugin == $file ) {
+		if (self::$plugin == $file) {
 
 			$links = array();
-			$links['settings']  = '<a href="' . admin_url( 'edit.php?post_type=calendar&page=simple-calendar_settings' ) . '">' . __( 'Settings', 'google-calendar-events' ) . '</a>';
-			$links['feeds']     = '<a href="' . admin_url( 'edit.php?post_type=calendar' ) . '">' . __( 'Calendars', 'google-calendar-events' ) . '</a>';
+			$links['settings']  = '<a href="'.admin_url('edit.php?post_type=calendar&page=simple-calendar_settings').'">'.__('Settings', 'google-calendar-events').'</a>';
+			$links['feeds']     = '<a href="'.admin_url('edit.php?post_type=calendar').'">'.__('Calendars', 'google-calendar-events').'</a>';
 
-			return apply_filters( 'simcal_plugin_action_links', array_merge( $links, $action_links ) );
+			return apply_filters('simcal_plugin_action_links', array_merge($links, $action_links));
 		}
 
 		return $action_links;
@@ -137,15 +137,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function plugin_row_meta( $meta_links, $file ) {
+	public static function plugin_row_meta($meta_links, $file) {
 
-		if ( self::$plugin == $file ) {
+		if (self::$plugin == $file) {
 
 			$links = array();
-			$links['add-ons'] = '<a href="' . simcal_ga_campaign_url( simcal_get_url( 'addons' ), 'core-plugin', 'plugin-listing' ) . '" target="_blank" >' .
-			                           __( 'Add-ons', 'google-calendar-events' ) . '</a>';
+			$links['add-ons'] = '<a href="'.simcal_ga_campaign_url(simcal_get_url('addons'), 'core-plugin', 'plugin-listing').'" target="_blank" >'.
+			                           __('Add-ons', 'google-calendar-events').'</a>';
 
-			return apply_filters( 'simcal_plugin_action_links', array_merge( $meta_links, $links ) );
+			return apply_filters('simcal_plugin_action_links', array_merge($meta_links, $links));
 		}
 
 		return $meta_links;
@@ -162,13 +162,13 @@ 
 	 *
 	 * @return string|void
 	 */
-	public function admin_footer_text( $footer_text ) {
+	public function admin_footer_text($footer_text) {
 
 		// Check to make sure we're on a SimpleCal admin page
 		$screen = simcal_is_admin_screen();
-		if ( $screen !== false ) {
+		if ($screen !== false) {
 
-			if ( 'calendar' == $screen ) {
+			if ('calendar' == $screen) {
 
 				// Add Drip promo signup form (@see Newsletter meta box).
 
@@ -196,23 +196,23 @@ 
 			}
 
 			// Change the footer text
-			if ( ! get_option( 'simple-calendar_admin_footer_text_rated' ) ) {
+			if ( ! get_option('simple-calendar_admin_footer_text_rated')) {
 
 				$footer_text = sprintf(
-					__( 'If you like <strong>Simple Calendar</strong> please leave us a %s&#9733;&#9733;&#9733;&#9733;&#9733; rating on WordPress.org%s. A huge thank you in advance!', 'google-calendar-events' ),
-					'<a href="https://wordpress.org/support/view/plugin-reviews/google-calendar-events?filter=5#postform" target="_blank" class="simcal-rating-link" data-rated="' . esc_attr__( 'Thanks :)', 'google-calendar-events' ) . '">', '</a>'
+					__('If you like <strong>Simple Calendar</strong> please leave us a %s&#9733;&#9733;&#9733;&#9733;&#9733; rating on WordPress.org%s. A huge thank you in advance!', 'google-calendar-events'),
+					'<a href="https://wordpress.org/support/view/plugin-reviews/google-calendar-events?filter=5#postform" target="_blank" class="simcal-rating-link" data-rated="'.esc_attr__('Thanks :)', 'google-calendar-events').'">', '</a>'
 				);
 
 				$footer_text .= '<script type="text/javascript">';
 				$footer_text .= "jQuery( 'a.simcal-rating-link' ).click( function() {
-						jQuery.post( '" . \SimpleCalendar\plugin()->ajax_url() . "', { action: 'simcal_rated' } );
+						jQuery.post( '" . \SimpleCalendar\plugin()->ajax_url()."', { action: 'simcal_rated' } );
 						jQuery( this ).parent().text( jQuery( this ).data( 'rated' ) );
 					});";
 				$footer_text .= '</script>';
 
 			} else {
 
-				$footer_text = __( 'Thanks for using Simple Calendar!', 'google-calendar-events' );
+				$footer_text = __('Thanks for using Simple Calendar!', 'google-calendar-events');
 
 			}