diff --git a/composer.json b/composer.json
index ec3f7756f6365984e26347281d1a1248956f7161..27ba496574bc815bab1ef0b19106ce8781a2ccba 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
},
{
"type": "vcs",
- "url": "https://github.com/demiankatz/Summon"
+ "url": "https://github.com/summon/Summon.php"
},
{
"type": "package",
diff --git a/composer.lock b/composer.lock
index df7d6e41737a04fa9d90dd04da9b17b0808f6716..d1103e0440005b96eac8115048c21c4899ad6b13 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,5 +1,5 @@
{
- "hash": "c516fa0d575b47b9d78683aa619eb196",
+ "hash": "c85013a99e68dc21b8f76f586fe2f491",
"packages": [
{
"name": "johnwohlers/sip2",
@@ -285,12 +285,12 @@
"version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/demiankatz/Summon.git",
+ "url": "https://github.com/summon/Summon.php.git",
"reference": "c77862d88e5d928d04ef8491d63177c91a4732de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/demiankatz/Summon/zipball/c77862d88e5d928d04ef8491d63177c91a4732de",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/c77862d88e5d928d04ef8491d63177c91a4732de",
"reference": "c77862d88e5d928d04ef8491d63177c91a4732de",
"shasum": ""
},
@@ -311,8 +311,7 @@
],
"description": "Library for interacting with Serials Solutions' Summon API.",
"support": {
- "source": "https://github.com/demiankatz/Summon/tree/master",
- "issues": "https://github.com/demiankatz/Summon/issues"
+ "source": "https://github.com/summon/Summon.php/tree/master"
},
"time": "2013-02-22 14:04:58"
},
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 1ea64728de1e24a2dbfe6b669eeafae890f7c206..16edd0e011089ce1d7f62fb3f36e9d8069384a0f 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e::getLoader();
+return ComposerAutoloaderInitb7ac78c929223e6d74304803bfb502a0::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index e9ebda06a66506d297a9e456cd6ff01f04218d37..aab528b482fb168f65b64260d7772c7949ae0701 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php generated by Composer
-class ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e
+class ComposerAutoloaderInitb7ac78c929223e6d74304803bfb502a0
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e', 'loadClassLoader'));
+ spl_autoload_register(array('ComposerAutoloaderInitb7ac78c929223e6d74304803bfb502a0', 'loadClassLoader'));
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitf8edfa470619c0f3266e059ebb0f621e', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitb7ac78c929223e6d74304803bfb502a0', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 605715cc907e395be31619271d7181fe1c79dcef..e47fd8478be33fbaf8feaf45d0e33d283f95d36d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -41,12 +41,12 @@
"version_normalized": "9999999-dev",
"source": {
"type": "git",
- "url": "https://github.com/demiankatz/Summon.git",
+ "url": "https://github.com/summon/Summon.php.git",
"reference": "c77862d88e5d928d04ef8491d63177c91a4732de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/demiankatz/Summon/zipball/c77862d88e5d928d04ef8491d63177c91a4732de",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/c77862d88e5d928d04ef8491d63177c91a4732de",
"reference": "c77862d88e5d928d04ef8491d63177c91a4732de",
"shasum": ""
},
@@ -69,8 +69,7 @@
],
"description": "Library for interacting with Serials Solutions' Summon API.",
"support": {
- "source": "https://github.com/demiankatz/Summon/tree/master",
- "issues": "https://github.com/demiankatz/Summon/issues"
+ "source": "https://github.com/summon/Summon.php/tree/master"
}
},
{
@@ -382,104 +381,6 @@
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
},
- {
- "name": "zendframework/zendrest",
- "version": "2.0.1",
- "version_normalized": "2.0.1.0",
- "dist": {
- "type": "zip",
- "url": "http://packages.zendframework.com/composer/ZendRest-2.0.1.zip",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zend-http": ">=2.0.0",
- "zendframework/zend-uri": ">=2.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "ZendRest": "library/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": " ",
- "homepage": "http://packages.zendframework.com/",
- "keywords": [
- "rest",
- "zf2"
- ],
- "support": {
- "email": "fw-general-subscribe@lists.zend.com",
- "irc": "irc://irc.freenode.net/zftalk",
- "issues": "https://github.com/zendframework/zf2/issues",
- "source": "https://github.com/zendframework/zf2"
- }
- },
- {
- "name": "zendframework/zendservice-amazon",
- "version": "2.0.2",
- "version_normalized": "2.0.2.0",
- "dist": {
- "type": "zip",
- "url": "http://packages.zendframework.com/composer/ZendService_Amazon-2.0.2.zip",
- "reference": null,
- "shasum": null
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zend-crypt": ">=2.0.0",
- "zendframework/zend-http": ">=2.0.0",
- "zendframework/zend-json": ">=2.0.0",
- "zendframework/zendrest": ">=2.0.0"
- },
- "require-dev": {
- "zendframework/zend-i18n": ">=2.0.0"
- },
- "suggest": {
- "zendframework/zend-uri": "Zend\\Uri component"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "ZendService": "library/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": "OOP wrapper for the Amazon web service",
- "homepage": "http://packages.zendframework.com/",
- "keywords": [
- "amazon",
- "ec2",
- "s3",
- "simpledb",
- "sqs",
- "zf2"
- ],
- "support": {
- "email": "fw-general-subscribe@lists.zend.com",
- "irc": "irc://irc.freenode.net/zftalk",
- "issues": "https://github.com/zendframework/zf2/issues",
- "source": "https://github.com/zendframework/zf2"
- }
- },
{
"name": "zendframework/zendframework",
"version": "2.1.3",
@@ -579,5 +480,103 @@
"issues": "https://github.com/zendframework/zf2/issues",
"source": "https://github.com/zendframework/zf2"
}
+ },
+ {
+ "name": "zendframework/zendrest",
+ "version": "2.0.1",
+ "version_normalized": "2.0.1.0",
+ "dist": {
+ "type": "zip",
+ "url": "http://packages.zendframework.com/composer/ZendRest-2.0.1.zip",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-uri": ">=2.0.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "ZendRest": "library/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": " ",
+ "homepage": "http://packages.zendframework.com/",
+ "keywords": [
+ "rest",
+ "zf2"
+ ],
+ "support": {
+ "email": "fw-general-subscribe@lists.zend.com",
+ "irc": "irc://irc.freenode.net/zftalk",
+ "issues": "https://github.com/zendframework/zf2/issues",
+ "source": "https://github.com/zendframework/zf2"
+ }
+ },
+ {
+ "name": "zendframework/zendservice-amazon",
+ "version": "2.0.2",
+ "version_normalized": "2.0.2.0",
+ "dist": {
+ "type": "zip",
+ "url": "http://packages.zendframework.com/composer/ZendService_Amazon-2.0.2.zip",
+ "reference": null,
+ "shasum": null
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "zendframework/zend-crypt": ">=2.0.0",
+ "zendframework/zend-http": ">=2.0.0",
+ "zendframework/zend-json": ">=2.0.0",
+ "zendframework/zendrest": ">=2.0.0"
+ },
+ "require-dev": {
+ "zendframework/zend-i18n": ">=2.0.0"
+ },
+ "suggest": {
+ "zendframework/zend-uri": "Zend\\Uri component"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "ZendService": "library/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "OOP wrapper for the Amazon web service",
+ "homepage": "http://packages.zendframework.com/",
+ "keywords": [
+ "amazon",
+ "ec2",
+ "s3",
+ "simpledb",
+ "sqs",
+ "zf2"
+ ],
+ "support": {
+ "email": "fw-general-subscribe@lists.zend.com",
+ "irc": "irc://irc.freenode.net/zftalk",
+ "issues": "https://github.com/zendframework/zf2/issues",
+ "source": "https://github.com/zendframework/zf2"
+ }
}
]
diff --git a/vendor/mobileesp/mdetect/mdetect.php b/vendor/mobileesp/mdetect/mdetect.php
index 63c90dda6c7f557a7ad87a22e2cb2f3b48ceb663..acff58d2abbdab3366353660ee2bf1e035679cf2 100644
--- a/vendor/mobileesp/mdetect/mdetect.php
+++ b/vendor/mobileesp/mdetect/mdetect.php
@@ -1,1033 +1,1033 @@
-<?php
-
-/* *******************************************
-// Copyright 2010-2012, Anthony Hand
-//
-// File version date: April 23, 2012
-// Update:
-// - Updated DetectAmazonSilk(): Fixed an issue in the detection logic.
-//
-// File version date: April 22, 2012 - Second update
-// Update: To address additional Kindle issues...
-// - Updated DetectRichCSS(): Excluded e-Ink Kindle devices.
-// - Created DetectAmazonSilk(): Created to detect Kindle Fire devices in Silk mode.
-// - Updated DetectMobileQuick(): Updated to include e-Ink Kindle devices and the Kindle Fire in Silk mode.
-//
-// File version date: April 11, 2012
-// Update:
-// - Added a new variable for the new BlackBerry Curve Touch (9380): deviceBBCurveTouch.
-// - Updated DetectBlackBerryTouch() to support the new BlackBerry Curve Touch (9380).
-// - Updated DetectKindle(): Added the missing 'this' class identifier for the DetectAndroid() call.
-//
-// File version date: January 21, 2012
-// Update:
-// - Added the constructor method per new features in PHP 5.0: __construct().
-// - Moved Windows Phone 7 to the iPhone Tier. WP7.5's IE 9-based browser is good enough now.
-// - Added a new variable for 2 versions of the new BlackBerry Bold Touch (9900 and 9930): deviceBBBoldTouch.
-// - Updated DetectBlackBerryTouch() to support the 2 versions of the new BlackBerry Bold Touch (9900 and 9930).
-// - Updated DetectKindle() to focus on eInk devices only. The Kindle Fire should be detected as a regular Android device.
-//
-// File version date: August 22, 2011
-// Update:
-// - Updated DetectAndroidTablet() to fix a bug introduced in the last fix! The true/false returns were mixed up.
-//
-// File version date: August 16, 2011
-// Update:
-// - Updated DetectAndroidTablet() to exclude Opera Mini, which was falsely reporting as running on a tablet device when on a phone.
-//
-//
-// LICENSE INFORMATION
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-// either express or implied. See the License for the specific
-// language governing permissions and limitations under the License.
-//
-//
-// ABOUT THIS PROJECT
-// Project Owner: Anthony Hand
-// Email: anthony.hand@gmail.com
-// Web Site: http://www.mobileesp.com
-// Source Files: http://code.google.com/p/mobileesp/
-//
-// Versions of this code are available for:
-// PHP, JavaScript, Java, ASP.NET (C#), and Ruby
-//
-// *******************************************
-*/
-
-
-
-//**************************
-// The uagent_info class encapsulates information about
-// a browser's connection to your web site.
-// You can use it to find out whether the browser asking for
-// your site's content is probably running on a mobile device.
-// The methods were written so you can be as granular as you want.
-// For example, enquiring whether it's as specific as an iPod Touch or
-// as general as a smartphone class device.
-// The object's methods return 1 for true, or 0 for false.
-class uagent_info
-{
- var $useragent = "";
- var $httpaccept = "";
-
- //standardized values for true and false.
- var $true = 1;
- var $false = 0;
-
- //Let's store values for quickly accessing the same info multiple times.
- var $isIphone = 0; //Stores whether the device is an iPhone or iPod Touch.
- var $isAndroidPhone = 0; //Stores whether the device is a (small-ish) Android phone or media player.
- var $isTierTablet = 0; //Stores whether is the Tablet (HTML5-capable, larger screen) tier of devices.
- var $isTierIphone = 0; //Stores whether is the iPhone tier of devices.
- var $isTierRichCss = 0; //Stores whether the device can probably support Rich CSS, but JavaScript support is not assumed. (e.g., newer BlackBerry, Windows Mobile)
- var $isTierGenericMobile = 0; //Stores whether it is another mobile device, which cannot be assumed to support CSS or JS (eg, older BlackBerry, RAZR)
-
- //Initialize some initial smartphone string variables.
- var $engineWebKit = 'webkit';
- var $deviceIphone = 'iphone';
- var $deviceIpod = 'ipod';
- var $deviceIpad = 'ipad';
- var $deviceMacPpc = 'macintosh'; //Used for disambiguation
-
- var $deviceAndroid = 'android';
- var $deviceGoogleTV = 'googletv';
- var $deviceXoom = 'xoom'; //Motorola Xoom
- var $deviceHtcFlyer = 'htc_flyer'; //HTC Flyer
-
- var $deviceNuvifone = 'nuvifone'; //Garmin Nuvifone
-
- var $deviceSymbian = 'symbian';
- var $deviceS60 = 'series60';
- var $deviceS70 = 'series70';
- var $deviceS80 = 'series80';
- var $deviceS90 = 'series90';
-
- var $deviceWinPhone7 = 'windows phone os 7';
- var $deviceWinMob = 'windows ce';
- var $deviceWindows = 'windows';
- var $deviceIeMob = 'iemobile';
- var $devicePpc = 'ppc'; //Stands for PocketPC
- var $enginePie = 'wm5 pie'; //An old Windows Mobile
-
- var $deviceBB = 'blackberry';
- var $vndRIM = 'vnd.rim'; //Detectable when BB devices emulate IE or Firefox
- var $deviceBBStorm = 'blackberry95'; //Storm 1 and 2
- var $deviceBBBold = 'blackberry97'; //Bold 97x0 (non-touch)
- var $deviceBBBoldTouch = 'blackberry 99'; //Bold 99x0 (touchscreen)
- var $deviceBBTour = 'blackberry96'; //Tour
- var $deviceBBCurve = 'blackberry89'; //Curve2
- var $deviceBBCurveTouch = 'blackberry 938'; //Curve Touch
- var $deviceBBTorch = 'blackberry 98'; //Torch
- var $deviceBBPlaybook = 'playbook'; //PlayBook tablet
-
- var $devicePalm = 'palm';
- var $deviceWebOS = 'webos'; //For Palm's line of WebOS devices
- var $deviceWebOShp = 'hpwos'; //For HP's line of WebOS devices
-
- var $engineBlazer = 'blazer'; //Old Palm browser
- var $engineXiino = 'xiino'; //Another old Palm
-
- var $deviceKindle = 'kindle'; //Amazon Kindle, eInk one
- var $engineSilk = 'silk'; //Amazon's accelerated Silk browser for Kindle Fire
-
- //Initialize variables for mobile-specific content.
- var $vndwap = 'vnd.wap';
- var $wml = 'wml';
-
- //Initialize variables for other random devices and mobile browsers.
- var $deviceTablet = 'tablet'; //Generic term for slate and tablet devices
- var $deviceBrew = 'brew';
- var $deviceDanger = 'danger';
- var $deviceHiptop = 'hiptop';
- var $devicePlaystation = 'playstation';
- var $deviceNintendoDs = 'nitro';
- var $deviceNintendo = 'nintendo';
- var $deviceWii = 'wii';
- var $deviceXbox = 'xbox';
- var $deviceArchos = 'archos';
-
- var $engineOpera = 'opera'; //Popular browser
- var $engineNetfront = 'netfront'; //Common embedded OS browser
- var $engineUpBrowser = 'up.browser'; //common on some phones
- var $engineOpenWeb = 'openweb'; //Transcoding by OpenWave server
- var $deviceMidp = 'midp'; //a mobile Java technology
- var $uplink = 'up.link';
- var $engineTelecaQ = 'teleca q'; //a modern feature phone browser
-
- var $devicePda = 'pda'; //some devices report themselves as PDAs
- var $mini = 'mini'; //Some mobile browsers put 'mini' in their names.
- var $mobile = 'mobile'; //Some mobile browsers put 'mobile' in their user agent strings.
- var $mobi = 'mobi'; //Some mobile browsers put 'mobi' in their user agent strings.
-
- //Use Maemo, Tablet, and Linux to test for Nokia's Internet Tablets.
- var $maemo = 'maemo';
- var $linux = 'linux';
- var $qtembedded = 'qt embedded'; //for Sony Mylo and others
- var $mylocom2 = 'com2'; //for Sony Mylo also
-
- //In some UserAgents, the only clue is the manufacturer.
- var $manuSonyEricsson = "sonyericsson";
- var $manuericsson = "ericsson";
- var $manuSamsung1 = "sec-sgh";
- var $manuSony = "sony";
- var $manuHtc = "htc"; //Popular Android and WinMo manufacturer
-
- //In some UserAgents, the only clue is the operator.
- var $svcDocomo = "docomo";
- var $svcKddi = "kddi";
- var $svcVodafone = "vodafone";
-
- //Disambiguation strings.
- var $disUpdate = "update"; //pda vs. update
-
-
- //**************************
- //The constructor. Allows the latest PHP (5.0+) to locate a constructor object and initialize the object.
- function __construct()
- {
- $this->uagent_info();
- }
-
-
- //**************************
- //The object initializer. Initializes several default variables.
- function uagent_info()
- {
- $this->useragent = isset($_SERVER['HTTP_USER_AGENT'])?strtolower($_SERVER['HTTP_USER_AGENT']):'';
- $this->httpaccept = isset($_SERVER['HTTP_ACCEPT'])?strtolower($_SERVER['HTTP_ACCEPT']):'';
-
- //Let's initialize some values to save cycles later.
- $this->InitDeviceScan();
- }
-
- //**************************
- // Initialize Key Stored Values.
- function InitDeviceScan()
- {
- global $isIphone, $isAndroidPhone, $isTierTablet, $isTierIphone;
-
- //We'll use these 4 variables to speed other processing. They're super common.
- $this->isIphone = $this->DetectIphoneOrIpod();
- $this->isAndroidPhone = $this->DetectAndroidPhone();
- $this->isTierIphone = $this->DetectTierIphone();
- $this->isTierTablet = $this->DetectTierTablet();
-
- //Optional: Comment these out if you don't need them.
- global $isTierRichCss, $isTierGenericMobile;
- $this->isTierRichCss = $this->DetectTierRichCss();
- $this->isTierGenericMobile = $this->DetectTierOtherPhones();
- }
-
- //**************************
- //Returns the contents of the User Agent value, in lower case.
- function Get_Uagent()
- {
- return $this->useragent;
- }
-
- //**************************
- //Returns the contents of the HTTP Accept value, in lower case.
- function Get_HttpAccept()
- {
- return $this->httpaccept;
- }
-
-
- //**************************
- // Detects if the current device is an iPhone.
- function DetectIphone()
- {
- if (stripos($this->useragent, $this->deviceIphone) > -1)
- {
- //The iPad and iPod Touch say they're an iPhone. So let's disambiguate.
- if ($this->DetectIpad() == $this->true ||
- $this->DetectIpod() == $this->true)
- return $this->false;
- //Yay! It's an iPhone!
- else
- return $this->true;
- }
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is an iPod Touch.
- function DetectIpod()
- {
- if (stripos($this->useragent, $this->deviceIpod) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is an iPad tablet.
- function DetectIpad()
- {
- if (stripos($this->useragent, $this->deviceIpad) > -1 &&
- $this->DetectWebkit() == $this->true)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is an iPhone or iPod Touch.
- function DetectIphoneOrIpod()
- {
- //We repeat the searches here because some iPods may report themselves as an iPhone, which would be okay.
- if (stripos($this->useragent, $this->deviceIphone) > -1 ||
- stripos($this->useragent, $this->deviceIpod) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects *any* iOS device: iPhone, iPod Touch, iPad.
- function DetectIos()
- {
- if (($this->DetectIphoneOrIpod() == $this->true) ||
- ($this->DetectIpad() == $this->true))
- return $this->true;
- else
- return $this->false;
- }
-
-
- //**************************
- // Detects *any* Android OS-based device: phone, tablet, and multi-media player.
- // Also detects Google TV.
- function DetectAndroid()
- {
- if ((stripos($this->useragent, $this->deviceAndroid) > -1) ||
- ($this->DetectGoogleTV() == $this->true))
- return $this->true;
- //Special check for the HTC Flyer 7" tablet
- if ((stripos($this->useragent, $this->deviceHtcFlyer) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is a (small-ish) Android OS-based device
- // used for calling and/or multi-media (like a Samsung Galaxy Player).
- // Google says these devices will have 'Android' AND 'mobile' in user agent.
- // Ignores tablets (Honeycomb and later).
- function DetectAndroidPhone()
- {
- if (($this->DetectAndroid() == $this->true) &&
- (stripos($this->useragent, $this->mobile) > -1))
- return $this->true;
- //Special check for Android phones with Opera Mobile. They should report here.
- if (($this->DetectOperaAndroidPhone() == $this->true))
- return $this->true;
- //Special check for the HTC Flyer 7" tablet. It should report here.
- if ((stripos($this->useragent, $this->deviceHtcFlyer) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is a (self-reported) Android tablet.
- // Google says these devices will have 'Android' and NOT 'mobile' in their user agent.
- function DetectAndroidTablet()
- {
- //First, let's make sure we're on an Android device.
- if ($this->DetectAndroid() == $this->false)
- return $this->false;
-
- //Special check for Opera Android Phones. They should NOT report here.
- if ($this->DetectOperaMobile() == $this->true)
- return $this->false;
- //Special check for the HTC Flyer 7" tablet. It should NOT report here.
- if ((stripos($this->useragent, $this->deviceHtcFlyer) > -1))
- return $this->false;
-
- //Otherwise, if it's Android and does NOT have 'mobile' in it, Google says it's a tablet.
- if (stripos($this->useragent, $this->mobile) > -1)
- return $this->false;
- else
- return $this->true;
- }
-
- //**************************
- // Detects if the current device is an Android OS-based device and
- // the browser is based on WebKit.
- function DetectAndroidWebKit()
- {
- if (($this->DetectAndroid() == $this->true) &&
- ($this->DetectWebkit() == $this->true))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is a GoogleTV.
- function DetectGoogleTV()
- {
- if (stripos($this->useragent, $this->deviceGoogleTV) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is based on WebKit.
- function DetectWebkit()
- {
- if (stripos($this->useragent, $this->engineWebKit) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
-
- //**************************
- // Detects if the current browser is the Nokia S60 Open Source Browser.
- function DetectS60OssBrowser()
- {
- //First, test for WebKit, then make sure it's either Symbian or S60.
- if ($this->DetectWebkit() == $this->true)
- {
- if (stripos($this->useragent, $this->deviceSymbian) > -1 ||
- stripos($this->useragent, $this->deviceS60) > -1)
- {
- return $this->true;
- }
- else
- return $this->false;
- }
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is any Symbian OS-based device,
- // including older S60, Series 70, Series 80, Series 90, and UIQ,
- // or other browsers running on these devices.
- function DetectSymbianOS()
- {
- if (stripos($this->useragent, $this->deviceSymbian) > -1 ||
- stripos($this->useragent, $this->deviceS60) > -1 ||
- stripos($this->useragent, $this->deviceS70) > -1 ||
- stripos($this->useragent, $this->deviceS80) > -1 ||
- stripos($this->useragent, $this->deviceS90) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a
- // Windows Phone 7 device.
- function DetectWindowsPhone7()
- {
- if (stripos($this->useragent, $this->deviceWinPhone7) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a Windows Mobile device.
- // Excludes Windows Phone 7 devices.
- // Focuses on Windows Mobile 6.xx and earlier.
- function DetectWindowsMobile()
- {
- if ($this->DetectWindowsPhone7() == $this->true)
- return $this->false;
- //Most devices use 'Windows CE', but some report 'iemobile'
- // and some older ones report as 'PIE' for Pocket IE.
- if (stripos($this->useragent, $this->deviceWinMob) > -1 ||
- stripos($this->useragent, $this->deviceIeMob) > -1 ||
- stripos($this->useragent, $this->enginePie) > -1)
- return $this->true;
- //Test for Windows Mobile PPC but not old Macintosh PowerPC.
- if (stripos($this->useragent, $this->devicePpc) > -1
- && !(stripos($this->useragent, $this->deviceMacPpc) > 1))
- return $this->true;
- //Test for certain Windwos Mobile-based HTC devices.
- if (stripos($this->useragent, $this->manuHtc) > -1 &&
- stripos($this->useragent, $this->deviceWindows) > -1)
- return $this->true;
- if ($this->DetectWapWml() == $this->true &&
- stripos($this->useragent, $this->deviceWindows) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is any BlackBerry device.
- // Includes the PlayBook.
- function DetectBlackBerry()
- {
- if ((stripos($this->useragent, $this->deviceBB) > -1) ||
- (stripos($this->httpaccept, $this->vndRIM) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is on a BlackBerry tablet device.
- // Examples: PlayBook
- function DetectBlackBerryTablet()
- {
- if ((stripos($this->useragent, $this->deviceBBPlaybook) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a BlackBerry phone device AND uses a
- // WebKit-based browser. These are signatures for the new BlackBerry OS 6.
- // Examples: Torch. Includes the Playbook.
- function DetectBlackBerryWebKit()
- {
- if (($this->DetectBlackBerry() == $this->true) &&
- ($this->DetectWebkit() == $this->true))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a BlackBerry Touch phone device with
- // a large screen, such as the Storm, Torch, and Bold Touch. Excludes the Playbook.
- function DetectBlackBerryTouch()
- {
- if ((stripos($this->useragent, $this->deviceBBStorm) > -1) ||
- (stripos($this->useragent, $this->deviceBBTorch) > -1) ||
- (stripos($this->useragent, $this->deviceBBBoldTouch) > -1) ||
- (stripos($this->useragent, $this->deviceBBCurveTouch) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a BlackBerry OS 5 device AND
- // has a more capable recent browser. Excludes the Playbook.
- // Examples, Storm, Bold, Tour, Curve2
- // Excludes the new BlackBerry OS 6 and 7 browser!!
- function DetectBlackBerryHigh()
- {
- //Disambiguate for BlackBerry OS 6 or 7 (WebKit) browser
- if ($this->DetectBlackBerryWebKit() == $this->true)
- return $this->false;
- if ($this->DetectBlackBerry() == $this->true)
- {
- if (($this->DetectBlackBerryTouch() == $this->true) ||
- stripos($this->useragent, $this->deviceBBBold) > -1 ||
- stripos($this->useragent, $this->deviceBBTour) > -1 ||
- stripos($this->useragent, $this->deviceBBCurve) > -1)
- {
- return $this->true;
- }
- else
- return $this->false;
- }
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a BlackBerry device AND
- // has an older, less capable browser.
- // Examples: Pearl, 8800, Curve1.
- function DetectBlackBerryLow()
- {
- if ($this->DetectBlackBerry() == $this->true)
- {
- //Assume that if it's not in the High tier, then it's Low.
- if (($this->DetectBlackBerryHigh() == $this->true) ||
- ($this->DetectBlackBerryWebKit() == $this->true))
- return $this->false;
- else
- return $this->true;
- }
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is on a PalmOS device.
- function DetectPalmOS()
- {
- //Most devices nowadays report as 'Palm', but some older ones reported as Blazer or Xiino.
- if (stripos($this->useragent, $this->devicePalm) > -1 ||
- stripos($this->useragent, $this->engineBlazer) > -1 ||
- stripos($this->useragent, $this->engineXiino) > -1)
- {
- //Make sure it's not WebOS first
- if ($this->DetectPalmWebOS() == $this->true)
- return $this->false;
- else
- return $this->true;
- }
- else
- return $this->false;
- }
-
-
- //**************************
- // Detects if the current browser is on a Palm device
- // running the new WebOS.
- function DetectPalmWebOS()
- {
- if (stripos($this->useragent, $this->deviceWebOS) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is on an HP tablet running WebOS.
- function DetectWebOSTablet()
- {
- if ((stripos($this->useragent, $this->deviceWebOShp) > -1)
- && (stripos($this->useragent, $this->deviceTablet) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a
- // Garmin Nuvifone.
- function DetectGarminNuvifone()
- {
- if (stripos($this->useragent, $this->deviceNuvifone) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
-
- //**************************
- // Check to see whether the device is any device
- // in the 'smartphone' category.
- function DetectSmartphone()
- {
- global $isIphone, $isAndroidPhone, $isTierIphone;
-
- if (($this->isIphone == $this->true)
- || ($this->isAndroidPhone == $this->true)
- || ($this->isTierIphone == $this->true)
- || ($this->DetectS60OssBrowser() == $this->true)
- || ($this->DetectSymbianOS() == $this->true)
- || ($this->DetectWindowsMobile() == $this->true)
- || ($this->DetectWindowsPhone7() == $this->true)
- || ($this->DetectBlackBerry() == $this->true)
- || ($this->DetectPalmWebOS() == $this->true)
- || ($this->DetectPalmOS() == $this->true)
- || ($this->DetectGarminNuvifone() == $this->true))
- return $this->true;
- else
- return $this->false;
- }
-
-
- //**************************
- // Detects whether the device is a Brew-powered device.
- function DetectBrewDevice()
- {
- if (stripos($this->useragent, $this->deviceBrew) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects the Danger Hiptop device.
- function DetectDangerHiptop()
- {
- if (stripos($this->useragent, $this->deviceDanger) > -1 ||
- stripos($this->useragent, $this->deviceHiptop) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is Opera Mobile or Mini.
- function DetectOperaMobile()
- {
- if (stripos($this->useragent, $this->engineOpera) > -1)
- {
- if ((stripos($this->useragent, $this->mini) > -1) ||
- (stripos($this->useragent, $this->mobi) > -1))
- return $this->true;
- else
- return $this->false;
- }
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is Opera Mobile
- // running on an Android phone.
- function DetectOperaAndroidPhone()
- {
- if ((stripos($this->useragent, $this->engineOpera) > -1) &&
- (stripos($this->useragent, $this->deviceAndroid) > -1) &&
- (stripos($this->useragent, $this->mobi) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is Opera Mobile
- // running on an Android tablet.
- function DetectOperaAndroidTablet()
- {
- if ((stripos($this->useragent, $this->engineOpera) > -1) &&
- (stripos($this->useragent, $this->deviceAndroid) > -1) &&
- (stripos($this->useragent, $this->deviceTablet) > -1))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects whether the device supports WAP or WML.
- function DetectWapWml()
- {
- if (stripos($this->httpaccept, $this->vndwap) > -1 ||
- stripos($this->httpaccept, $this->wml) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is an Amazon Kindle (eInk devices only).
- // Note: For the Kindle Fire, use the normal Android methods.
- function DetectKindle()
- {
- if (stripos($this->useragent, $this->deviceKindle) > -1 &&
- $this->DetectAndroid() == $this->false)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current Amazon device is using the Silk Browser.
- // Note: Typically used by the the Kindle Fire.
- function DetectAmazonSilk()
- {
- if (stripos($this->useragent, $this->engineSilk) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
-
- //**************************
- // The quick way to detect for a mobile device.
- // Will probably detect most recent/current mid-tier Feature Phones
- // as well as smartphone-class devices. Excludes Apple iPads and other modern tablets.
- function DetectMobileQuick()
- {
- //Let's exclude tablets
- if ($this->isTierTablet == $this->true)
- return $this->false;
-
- //Most mobile browsing is done on smartphones
- if ($this->DetectSmartphone() == $this->true)
- return $this->true;
-
- if (($this->DetectWapWml() == $this->true)
- || ($this->DetectBrewDevice() == $this->true)
- || ($this->DetectOperaMobile() == $this->true))
- return $this->true;
-
- if ((stripos($this->useragent, $this->engineNetfront) > -1)
- || (stripos($this->useragent, $this->engineUpBrowser) > -1)
- || (stripos($this->useragent, $this->engineOpenWeb) > -1))
- return $this->true;
-
- if (($this->DetectDangerHiptop() == $this->true)
- || ($this->DetectMidpCapable() == $this->true)
- || ($this->DetectMaemoTablet() == $this->true)
- || ($this->DetectArchos() == $this->true))
- return $this->true;
-
- if ((stripos($this->useragent, $this->devicePda) > -1) &&
- !(stripos($this->useragent, $this->disUpdate) > -1))
- return $this->true;
- if (stripos($this->useragent, $this->mobile) > -1)
- return $this->true;
-
- //We also look for Kindle devices
- if ($this->DetectKindle() == $this->true ||
- $this->DetectAmazonSilk() == $this->true)
- return $this->true;
-
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is a Sony Playstation.
- function DetectSonyPlaystation()
- {
- if (stripos($this->useragent, $this->devicePlaystation) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is a Nintendo game device.
- function DetectNintendo()
- {
- if (stripos($this->useragent, $this->deviceNintendo) > -1 ||
- stripos($this->useragent, $this->deviceWii) > -1 ||
- stripos($this->useragent, $this->deviceNintendoDs) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is a Microsoft Xbox.
- function DetectXbox()
- {
- if (stripos($this->useragent, $this->deviceXbox) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is an Internet-capable game console.
- function DetectGameConsole()
- {
- if ($this->DetectSonyPlaystation() == $this->true)
- return $this->true;
- else if ($this->DetectNintendo() == $this->true)
- return $this->true;
- else if ($this->DetectXbox() == $this->true)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device supports MIDP, a mobile Java technology.
- function DetectMidpCapable()
- {
- if (stripos($this->useragent, $this->deviceMidp) > -1 ||
- stripos($this->httpaccept, $this->deviceMidp) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is on one of the Maemo-based Nokia Internet Tablets.
- function DetectMaemoTablet()
- {
- if (stripos($this->useragent, $this->maemo) > -1)
- return $this->true;
- //For Nokia N810, must be Linux + Tablet, or else it could be something else.
- if ((stripos($this->useragent, $this->linux) > -1)
- && (stripos($this->useragent, $this->deviceTablet) > -1)
- && ($this->DetectWebOSTablet() == $this->false)
- && ($this->DetectAndroid() == $this->false))
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current device is an Archos media player/Internet tablet.
- function DetectArchos()
- {
- if (stripos($this->useragent, $this->deviceArchos) > -1)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // Detects if the current browser is a Sony Mylo device.
- function DetectSonyMylo()
- {
- if (stripos($this->useragent, $this->manuSony) > -1)
- {
- if ((stripos($this->useragent, $this->qtembedded) > -1) ||
- (stripos($this->useragent, $this->mylocom2) > -1))
- {
- return $this->true;
- }
- else
- return $this->false;
- }
- else
- return $this->false;
- }
-
-
- //**************************
- // The longer and more thorough way to detect for a mobile device.
- // Will probably detect most feature phones,
- // smartphone-class devices, Internet Tablets,
- // Internet-enabled game consoles, etc.
- // This ought to catch a lot of the more obscure and older devices, also --
- // but no promises on thoroughness!
- function DetectMobileLong()
- {
- if ($this->DetectMobileQuick() == $this->true)
- return $this->true;
- if ($this->DetectGameConsole() == $this->true)
- return $this->true;
- if ($this->DetectSonyMylo() == $this->true)
- return $this->true;
-
- //Detect older phones from certain manufacturers and operators.
- if (stripos($this->useragent, $this->uplink) > -1)
- return $this->true;
- if (stripos($this->useragent, $this->manuSonyEricsson) > -1)
- return $this->true;
- if (stripos($this->useragent, $this->manuericsson) > -1)
- return $this->true;
-
- if (stripos($this->useragent, $this->manuSamsung1) > -1)
- return $this->true;
- if (stripos($this->useragent, $this->svcDocomo) > -1)
- return $this->true;
- if (stripos($this->useragent, $this->svcKddi) > -1)
- return $this->true;
- if (stripos($this->useragent, $this->svcVodafone) > -1)
- return $this->true;
-
- else
- return $this->false;
- }
-
-
-
- //*****************************
- // For Mobile Web Site Design
- //*****************************
-
- //**************************
- // The quick way to detect for a tier of devices.
- // This method detects for the new generation of
- // HTML 5 capable, larger screen tablets.
- // Includes iPad, Android (e.g., Xoom), BB Playbook, WebOS, etc.
- function DetectTierTablet()
- {
- if (($this->DetectIpad() == $this->true)
- || ($this->DetectAndroidTablet() == $this->true)
- || ($this->DetectBlackBerryTablet() == $this->true)
- || ($this->DetectWebOSTablet() == $this->true))
- return $this->true;
- else
- return $this->false;
- }
-
-
- //**************************
- // The quick way to detect for a tier of devices.
- // This method detects for devices which can
- // display iPhone-optimized web content.
- // Includes iPhone, iPod Touch, Android, Windows Phone 7, WebOS, etc.
- function DetectTierIphone()
- {
- if (($this->isIphone == $this->true) ||
- ($this->isAndroidPhone == $this->true))
- return $this->true;
-
- if (($this->DetectBlackBerryWebKit() == $this->true) &&
- ($this->DetectBlackBerryTouch() == $this->true))
- return $this->true;
- if ($this->DetectWindowsPhone7() == $this->true)
- return $this->true;
- if ($this->DetectPalmWebOS() == $this->true)
- return $this->true;
- if ($this->DetectGarminNuvifone() == $this->true)
- return $this->true;
- else
- return $this->false;
- }
-
- //**************************
- // The quick way to detect for a tier of devices.
- // This method detects for devices which are likely to be capable
- // of viewing CSS content optimized for the iPhone,
- // but may not necessarily support JavaScript.
- // Excludes all iPhone Tier devices.
- function DetectTierRichCss()
- {
- if ($this->DetectMobileQuick() == $this->true)
- {
- //Exclude iPhone Tier and e-Ink Kindle devices
- if (($this->DetectTierIphone() == $this->true) ||
- ($this->DetectKindle() == $this->true))
- return $this->false;
-
- //The following devices are explicitly ok.
- if ($this->DetectWebkit() == $this->true) //Any WebKit
- return $this->true;
- if ($this->DetectS60OssBrowser() == $this->true)
- return $this->true;
-
- //Note: 'High' BlackBerry devices ONLY
- if ($this->DetectBlackBerryHigh() == $this->true)
- return $this->true;
-
- //Older Windows 'Mobile' isn't good enough for iPhone Tier.
- if ($this->DetectWindowsMobile() == $this->true)
- return $this->true;
- if (stripos($this->useragent, $this->engineTelecaQ) > -1)
- return $this->true;
-
- //default
- else
- return $this->false;
- }
- else
- return $this->false;
- }
-
- //**************************
- // The quick way to detect for a tier of devices.
- // This method detects for all other types of phones,
- // but excludes the iPhone and RichCSS Tier devices.
- function DetectTierOtherPhones()
- {
- //Exclude devices in the other 2 categories
- if (($this->DetectMobileLong() == $this->true)
- && ($this->DetectTierIphone() == $this->false)
- && ($this->DetectTierRichCss() == $this->false))
- return $this->true;
- else
- return $this->false;
- }
-
-
-}
-
-
-//Was informed by a MobileESP user that it's a best practice
-// to omit the closing ?> marks here. They can sometimes
+<?php
+
+/* *******************************************
+// Copyright 2010-2012, Anthony Hand
+//
+// File version date: April 23, 2012
+// Update:
+// - Updated DetectAmazonSilk(): Fixed an issue in the detection logic.
+//
+// File version date: April 22, 2012 - Second update
+// Update: To address additional Kindle issues...
+// - Updated DetectRichCSS(): Excluded e-Ink Kindle devices.
+// - Created DetectAmazonSilk(): Created to detect Kindle Fire devices in Silk mode.
+// - Updated DetectMobileQuick(): Updated to include e-Ink Kindle devices and the Kindle Fire in Silk mode.
+//
+// File version date: April 11, 2012
+// Update:
+// - Added a new variable for the new BlackBerry Curve Touch (9380): deviceBBCurveTouch.
+// - Updated DetectBlackBerryTouch() to support the new BlackBerry Curve Touch (9380).
+// - Updated DetectKindle(): Added the missing 'this' class identifier for the DetectAndroid() call.
+//
+// File version date: January 21, 2012
+// Update:
+// - Added the constructor method per new features in PHP 5.0: __construct().
+// - Moved Windows Phone 7 to the iPhone Tier. WP7.5's IE 9-based browser is good enough now.
+// - Added a new variable for 2 versions of the new BlackBerry Bold Touch (9900 and 9930): deviceBBBoldTouch.
+// - Updated DetectBlackBerryTouch() to support the 2 versions of the new BlackBerry Bold Touch (9900 and 9930).
+// - Updated DetectKindle() to focus on eInk devices only. The Kindle Fire should be detected as a regular Android device.
+//
+// File version date: August 22, 2011
+// Update:
+// - Updated DetectAndroidTablet() to fix a bug introduced in the last fix! The true/false returns were mixed up.
+//
+// File version date: August 16, 2011
+// Update:
+// - Updated DetectAndroidTablet() to exclude Opera Mini, which was falsely reporting as running on a tablet device when on a phone.
+//
+//
+// LICENSE INFORMATION
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+// either express or implied. See the License for the specific
+// language governing permissions and limitations under the License.
+//
+//
+// ABOUT THIS PROJECT
+// Project Owner: Anthony Hand
+// Email: anthony.hand@gmail.com
+// Web Site: http://www.mobileesp.com
+// Source Files: http://code.google.com/p/mobileesp/
+//
+// Versions of this code are available for:
+// PHP, JavaScript, Java, ASP.NET (C#), and Ruby
+//
+// *******************************************
+*/
+
+
+
+//**************************
+// The uagent_info class encapsulates information about
+// a browser's connection to your web site.
+// You can use it to find out whether the browser asking for
+// your site's content is probably running on a mobile device.
+// The methods were written so you can be as granular as you want.
+// For example, enquiring whether it's as specific as an iPod Touch or
+// as general as a smartphone class device.
+// The object's methods return 1 for true, or 0 for false.
+class uagent_info
+{
+ var $useragent = "";
+ var $httpaccept = "";
+
+ //standardized values for true and false.
+ var $true = 1;
+ var $false = 0;
+
+ //Let's store values for quickly accessing the same info multiple times.
+ var $isIphone = 0; //Stores whether the device is an iPhone or iPod Touch.
+ var $isAndroidPhone = 0; //Stores whether the device is a (small-ish) Android phone or media player.
+ var $isTierTablet = 0; //Stores whether is the Tablet (HTML5-capable, larger screen) tier of devices.
+ var $isTierIphone = 0; //Stores whether is the iPhone tier of devices.
+ var $isTierRichCss = 0; //Stores whether the device can probably support Rich CSS, but JavaScript support is not assumed. (e.g., newer BlackBerry, Windows Mobile)
+ var $isTierGenericMobile = 0; //Stores whether it is another mobile device, which cannot be assumed to support CSS or JS (eg, older BlackBerry, RAZR)
+
+ //Initialize some initial smartphone string variables.
+ var $engineWebKit = 'webkit';
+ var $deviceIphone = 'iphone';
+ var $deviceIpod = 'ipod';
+ var $deviceIpad = 'ipad';
+ var $deviceMacPpc = 'macintosh'; //Used for disambiguation
+
+ var $deviceAndroid = 'android';
+ var $deviceGoogleTV = 'googletv';
+ var $deviceXoom = 'xoom'; //Motorola Xoom
+ var $deviceHtcFlyer = 'htc_flyer'; //HTC Flyer
+
+ var $deviceNuvifone = 'nuvifone'; //Garmin Nuvifone
+
+ var $deviceSymbian = 'symbian';
+ var $deviceS60 = 'series60';
+ var $deviceS70 = 'series70';
+ var $deviceS80 = 'series80';
+ var $deviceS90 = 'series90';
+
+ var $deviceWinPhone7 = 'windows phone os 7';
+ var $deviceWinMob = 'windows ce';
+ var $deviceWindows = 'windows';
+ var $deviceIeMob = 'iemobile';
+ var $devicePpc = 'ppc'; //Stands for PocketPC
+ var $enginePie = 'wm5 pie'; //An old Windows Mobile
+
+ var $deviceBB = 'blackberry';
+ var $vndRIM = 'vnd.rim'; //Detectable when BB devices emulate IE or Firefox
+ var $deviceBBStorm = 'blackberry95'; //Storm 1 and 2
+ var $deviceBBBold = 'blackberry97'; //Bold 97x0 (non-touch)
+ var $deviceBBBoldTouch = 'blackberry 99'; //Bold 99x0 (touchscreen)
+ var $deviceBBTour = 'blackberry96'; //Tour
+ var $deviceBBCurve = 'blackberry89'; //Curve2
+ var $deviceBBCurveTouch = 'blackberry 938'; //Curve Touch
+ var $deviceBBTorch = 'blackberry 98'; //Torch
+ var $deviceBBPlaybook = 'playbook'; //PlayBook tablet
+
+ var $devicePalm = 'palm';
+ var $deviceWebOS = 'webos'; //For Palm's line of WebOS devices
+ var $deviceWebOShp = 'hpwos'; //For HP's line of WebOS devices
+
+ var $engineBlazer = 'blazer'; //Old Palm browser
+ var $engineXiino = 'xiino'; //Another old Palm
+
+ var $deviceKindle = 'kindle'; //Amazon Kindle, eInk one
+ var $engineSilk = 'silk'; //Amazon's accelerated Silk browser for Kindle Fire
+
+ //Initialize variables for mobile-specific content.
+ var $vndwap = 'vnd.wap';
+ var $wml = 'wml';
+
+ //Initialize variables for other random devices and mobile browsers.
+ var $deviceTablet = 'tablet'; //Generic term for slate and tablet devices
+ var $deviceBrew = 'brew';
+ var $deviceDanger = 'danger';
+ var $deviceHiptop = 'hiptop';
+ var $devicePlaystation = 'playstation';
+ var $deviceNintendoDs = 'nitro';
+ var $deviceNintendo = 'nintendo';
+ var $deviceWii = 'wii';
+ var $deviceXbox = 'xbox';
+ var $deviceArchos = 'archos';
+
+ var $engineOpera = 'opera'; //Popular browser
+ var $engineNetfront = 'netfront'; //Common embedded OS browser
+ var $engineUpBrowser = 'up.browser'; //common on some phones
+ var $engineOpenWeb = 'openweb'; //Transcoding by OpenWave server
+ var $deviceMidp = 'midp'; //a mobile Java technology
+ var $uplink = 'up.link';
+ var $engineTelecaQ = 'teleca q'; //a modern feature phone browser
+
+ var $devicePda = 'pda'; //some devices report themselves as PDAs
+ var $mini = 'mini'; //Some mobile browsers put 'mini' in their names.
+ var $mobile = 'mobile'; //Some mobile browsers put 'mobile' in their user agent strings.
+ var $mobi = 'mobi'; //Some mobile browsers put 'mobi' in their user agent strings.
+
+ //Use Maemo, Tablet, and Linux to test for Nokia's Internet Tablets.
+ var $maemo = 'maemo';
+ var $linux = 'linux';
+ var $qtembedded = 'qt embedded'; //for Sony Mylo and others
+ var $mylocom2 = 'com2'; //for Sony Mylo also
+
+ //In some UserAgents, the only clue is the manufacturer.
+ var $manuSonyEricsson = "sonyericsson";
+ var $manuericsson = "ericsson";
+ var $manuSamsung1 = "sec-sgh";
+ var $manuSony = "sony";
+ var $manuHtc = "htc"; //Popular Android and WinMo manufacturer
+
+ //In some UserAgents, the only clue is the operator.
+ var $svcDocomo = "docomo";
+ var $svcKddi = "kddi";
+ var $svcVodafone = "vodafone";
+
+ //Disambiguation strings.
+ var $disUpdate = "update"; //pda vs. update
+
+
+ //**************************
+ //The constructor. Allows the latest PHP (5.0+) to locate a constructor object and initialize the object.
+ function __construct()
+ {
+ $this->uagent_info();
+ }
+
+
+ //**************************
+ //The object initializer. Initializes several default variables.
+ function uagent_info()
+ {
+ $this->useragent = isset($_SERVER['HTTP_USER_AGENT'])?strtolower($_SERVER['HTTP_USER_AGENT']):'';
+ $this->httpaccept = isset($_SERVER['HTTP_ACCEPT'])?strtolower($_SERVER['HTTP_ACCEPT']):'';
+
+ //Let's initialize some values to save cycles later.
+ $this->InitDeviceScan();
+ }
+
+ //**************************
+ // Initialize Key Stored Values.
+ function InitDeviceScan()
+ {
+ global $isIphone, $isAndroidPhone, $isTierTablet, $isTierIphone;
+
+ //We'll use these 4 variables to speed other processing. They're super common.
+ $this->isIphone = $this->DetectIphoneOrIpod();
+ $this->isAndroidPhone = $this->DetectAndroidPhone();
+ $this->isTierIphone = $this->DetectTierIphone();
+ $this->isTierTablet = $this->DetectTierTablet();
+
+ //Optional: Comment these out if you don't need them.
+ global $isTierRichCss, $isTierGenericMobile;
+ $this->isTierRichCss = $this->DetectTierRichCss();
+ $this->isTierGenericMobile = $this->DetectTierOtherPhones();
+ }
+
+ //**************************
+ //Returns the contents of the User Agent value, in lower case.
+ function Get_Uagent()
+ {
+ return $this->useragent;
+ }
+
+ //**************************
+ //Returns the contents of the HTTP Accept value, in lower case.
+ function Get_HttpAccept()
+ {
+ return $this->httpaccept;
+ }
+
+
+ //**************************
+ // Detects if the current device is an iPhone.
+ function DetectIphone()
+ {
+ if (stripos($this->useragent, $this->deviceIphone) > -1)
+ {
+ //The iPad and iPod Touch say they're an iPhone. So let's disambiguate.
+ if ($this->DetectIpad() == $this->true ||
+ $this->DetectIpod() == $this->true)
+ return $this->false;
+ //Yay! It's an iPhone!
+ else
+ return $this->true;
+ }
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is an iPod Touch.
+ function DetectIpod()
+ {
+ if (stripos($this->useragent, $this->deviceIpod) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is an iPad tablet.
+ function DetectIpad()
+ {
+ if (stripos($this->useragent, $this->deviceIpad) > -1 &&
+ $this->DetectWebkit() == $this->true)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is an iPhone or iPod Touch.
+ function DetectIphoneOrIpod()
+ {
+ //We repeat the searches here because some iPods may report themselves as an iPhone, which would be okay.
+ if (stripos($this->useragent, $this->deviceIphone) > -1 ||
+ stripos($this->useragent, $this->deviceIpod) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects *any* iOS device: iPhone, iPod Touch, iPad.
+ function DetectIos()
+ {
+ if (($this->DetectIphoneOrIpod() == $this->true) ||
+ ($this->DetectIpad() == $this->true))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // Detects *any* Android OS-based device: phone, tablet, and multi-media player.
+ // Also detects Google TV.
+ function DetectAndroid()
+ {
+ if ((stripos($this->useragent, $this->deviceAndroid) > -1) ||
+ ($this->DetectGoogleTV() == $this->true))
+ return $this->true;
+ //Special check for the HTC Flyer 7" tablet
+ if ((stripos($this->useragent, $this->deviceHtcFlyer) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is a (small-ish) Android OS-based device
+ // used for calling and/or multi-media (like a Samsung Galaxy Player).
+ // Google says these devices will have 'Android' AND 'mobile' in user agent.
+ // Ignores tablets (Honeycomb and later).
+ function DetectAndroidPhone()
+ {
+ if (($this->DetectAndroid() == $this->true) &&
+ (stripos($this->useragent, $this->mobile) > -1))
+ return $this->true;
+ //Special check for Android phones with Opera Mobile. They should report here.
+ if (($this->DetectOperaAndroidPhone() == $this->true))
+ return $this->true;
+ //Special check for the HTC Flyer 7" tablet. It should report here.
+ if ((stripos($this->useragent, $this->deviceHtcFlyer) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is a (self-reported) Android tablet.
+ // Google says these devices will have 'Android' and NOT 'mobile' in their user agent.
+ function DetectAndroidTablet()
+ {
+ //First, let's make sure we're on an Android device.
+ if ($this->DetectAndroid() == $this->false)
+ return $this->false;
+
+ //Special check for Opera Android Phones. They should NOT report here.
+ if ($this->DetectOperaMobile() == $this->true)
+ return $this->false;
+ //Special check for the HTC Flyer 7" tablet. It should NOT report here.
+ if ((stripos($this->useragent, $this->deviceHtcFlyer) > -1))
+ return $this->false;
+
+ //Otherwise, if it's Android and does NOT have 'mobile' in it, Google says it's a tablet.
+ if (stripos($this->useragent, $this->mobile) > -1)
+ return $this->false;
+ else
+ return $this->true;
+ }
+
+ //**************************
+ // Detects if the current device is an Android OS-based device and
+ // the browser is based on WebKit.
+ function DetectAndroidWebKit()
+ {
+ if (($this->DetectAndroid() == $this->true) &&
+ ($this->DetectWebkit() == $this->true))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is a GoogleTV.
+ function DetectGoogleTV()
+ {
+ if (stripos($this->useragent, $this->deviceGoogleTV) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is based on WebKit.
+ function DetectWebkit()
+ {
+ if (stripos($this->useragent, $this->engineWebKit) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // Detects if the current browser is the Nokia S60 Open Source Browser.
+ function DetectS60OssBrowser()
+ {
+ //First, test for WebKit, then make sure it's either Symbian or S60.
+ if ($this->DetectWebkit() == $this->true)
+ {
+ if (stripos($this->useragent, $this->deviceSymbian) > -1 ||
+ stripos($this->useragent, $this->deviceS60) > -1)
+ {
+ return $this->true;
+ }
+ else
+ return $this->false;
+ }
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is any Symbian OS-based device,
+ // including older S60, Series 70, Series 80, Series 90, and UIQ,
+ // or other browsers running on these devices.
+ function DetectSymbianOS()
+ {
+ if (stripos($this->useragent, $this->deviceSymbian) > -1 ||
+ stripos($this->useragent, $this->deviceS60) > -1 ||
+ stripos($this->useragent, $this->deviceS70) > -1 ||
+ stripos($this->useragent, $this->deviceS80) > -1 ||
+ stripos($this->useragent, $this->deviceS90) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a
+ // Windows Phone 7 device.
+ function DetectWindowsPhone7()
+ {
+ if (stripos($this->useragent, $this->deviceWinPhone7) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a Windows Mobile device.
+ // Excludes Windows Phone 7 devices.
+ // Focuses on Windows Mobile 6.xx and earlier.
+ function DetectWindowsMobile()
+ {
+ if ($this->DetectWindowsPhone7() == $this->true)
+ return $this->false;
+ //Most devices use 'Windows CE', but some report 'iemobile'
+ // and some older ones report as 'PIE' for Pocket IE.
+ if (stripos($this->useragent, $this->deviceWinMob) > -1 ||
+ stripos($this->useragent, $this->deviceIeMob) > -1 ||
+ stripos($this->useragent, $this->enginePie) > -1)
+ return $this->true;
+ //Test for Windows Mobile PPC but not old Macintosh PowerPC.
+ if (stripos($this->useragent, $this->devicePpc) > -1
+ && !(stripos($this->useragent, $this->deviceMacPpc) > 1))
+ return $this->true;
+ //Test for certain Windwos Mobile-based HTC devices.
+ if (stripos($this->useragent, $this->manuHtc) > -1 &&
+ stripos($this->useragent, $this->deviceWindows) > -1)
+ return $this->true;
+ if ($this->DetectWapWml() == $this->true &&
+ stripos($this->useragent, $this->deviceWindows) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is any BlackBerry device.
+ // Includes the PlayBook.
+ function DetectBlackBerry()
+ {
+ if ((stripos($this->useragent, $this->deviceBB) > -1) ||
+ (stripos($this->httpaccept, $this->vndRIM) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is on a BlackBerry tablet device.
+ // Examples: PlayBook
+ function DetectBlackBerryTablet()
+ {
+ if ((stripos($this->useragent, $this->deviceBBPlaybook) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a BlackBerry phone device AND uses a
+ // WebKit-based browser. These are signatures for the new BlackBerry OS 6.
+ // Examples: Torch. Includes the Playbook.
+ function DetectBlackBerryWebKit()
+ {
+ if (($this->DetectBlackBerry() == $this->true) &&
+ ($this->DetectWebkit() == $this->true))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a BlackBerry Touch phone device with
+ // a large screen, such as the Storm, Torch, and Bold Touch. Excludes the Playbook.
+ function DetectBlackBerryTouch()
+ {
+ if ((stripos($this->useragent, $this->deviceBBStorm) > -1) ||
+ (stripos($this->useragent, $this->deviceBBTorch) > -1) ||
+ (stripos($this->useragent, $this->deviceBBBoldTouch) > -1) ||
+ (stripos($this->useragent, $this->deviceBBCurveTouch) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a BlackBerry OS 5 device AND
+ // has a more capable recent browser. Excludes the Playbook.
+ // Examples, Storm, Bold, Tour, Curve2
+ // Excludes the new BlackBerry OS 6 and 7 browser!!
+ function DetectBlackBerryHigh()
+ {
+ //Disambiguate for BlackBerry OS 6 or 7 (WebKit) browser
+ if ($this->DetectBlackBerryWebKit() == $this->true)
+ return $this->false;
+ if ($this->DetectBlackBerry() == $this->true)
+ {
+ if (($this->DetectBlackBerryTouch() == $this->true) ||
+ stripos($this->useragent, $this->deviceBBBold) > -1 ||
+ stripos($this->useragent, $this->deviceBBTour) > -1 ||
+ stripos($this->useragent, $this->deviceBBCurve) > -1)
+ {
+ return $this->true;
+ }
+ else
+ return $this->false;
+ }
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a BlackBerry device AND
+ // has an older, less capable browser.
+ // Examples: Pearl, 8800, Curve1.
+ function DetectBlackBerryLow()
+ {
+ if ($this->DetectBlackBerry() == $this->true)
+ {
+ //Assume that if it's not in the High tier, then it's Low.
+ if (($this->DetectBlackBerryHigh() == $this->true) ||
+ ($this->DetectBlackBerryWebKit() == $this->true))
+ return $this->false;
+ else
+ return $this->true;
+ }
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is on a PalmOS device.
+ function DetectPalmOS()
+ {
+ //Most devices nowadays report as 'Palm', but some older ones reported as Blazer or Xiino.
+ if (stripos($this->useragent, $this->devicePalm) > -1 ||
+ stripos($this->useragent, $this->engineBlazer) > -1 ||
+ stripos($this->useragent, $this->engineXiino) > -1)
+ {
+ //Make sure it's not WebOS first
+ if ($this->DetectPalmWebOS() == $this->true)
+ return $this->false;
+ else
+ return $this->true;
+ }
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // Detects if the current browser is on a Palm device
+ // running the new WebOS.
+ function DetectPalmWebOS()
+ {
+ if (stripos($this->useragent, $this->deviceWebOS) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is on an HP tablet running WebOS.
+ function DetectWebOSTablet()
+ {
+ if ((stripos($this->useragent, $this->deviceWebOShp) > -1)
+ && (stripos($this->useragent, $this->deviceTablet) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a
+ // Garmin Nuvifone.
+ function DetectGarminNuvifone()
+ {
+ if (stripos($this->useragent, $this->deviceNuvifone) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // Check to see whether the device is any device
+ // in the 'smartphone' category.
+ function DetectSmartphone()
+ {
+ global $isIphone, $isAndroidPhone, $isTierIphone;
+
+ if (($this->isIphone == $this->true)
+ || ($this->isAndroidPhone == $this->true)
+ || ($this->isTierIphone == $this->true)
+ || ($this->DetectS60OssBrowser() == $this->true)
+ || ($this->DetectSymbianOS() == $this->true)
+ || ($this->DetectWindowsMobile() == $this->true)
+ || ($this->DetectWindowsPhone7() == $this->true)
+ || ($this->DetectBlackBerry() == $this->true)
+ || ($this->DetectPalmWebOS() == $this->true)
+ || ($this->DetectPalmOS() == $this->true)
+ || ($this->DetectGarminNuvifone() == $this->true))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // Detects whether the device is a Brew-powered device.
+ function DetectBrewDevice()
+ {
+ if (stripos($this->useragent, $this->deviceBrew) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects the Danger Hiptop device.
+ function DetectDangerHiptop()
+ {
+ if (stripos($this->useragent, $this->deviceDanger) > -1 ||
+ stripos($this->useragent, $this->deviceHiptop) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is Opera Mobile or Mini.
+ function DetectOperaMobile()
+ {
+ if (stripos($this->useragent, $this->engineOpera) > -1)
+ {
+ if ((stripos($this->useragent, $this->mini) > -1) ||
+ (stripos($this->useragent, $this->mobi) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is Opera Mobile
+ // running on an Android phone.
+ function DetectOperaAndroidPhone()
+ {
+ if ((stripos($this->useragent, $this->engineOpera) > -1) &&
+ (stripos($this->useragent, $this->deviceAndroid) > -1) &&
+ (stripos($this->useragent, $this->mobi) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is Opera Mobile
+ // running on an Android tablet.
+ function DetectOperaAndroidTablet()
+ {
+ if ((stripos($this->useragent, $this->engineOpera) > -1) &&
+ (stripos($this->useragent, $this->deviceAndroid) > -1) &&
+ (stripos($this->useragent, $this->deviceTablet) > -1))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects whether the device supports WAP or WML.
+ function DetectWapWml()
+ {
+ if (stripos($this->httpaccept, $this->vndwap) > -1 ||
+ stripos($this->httpaccept, $this->wml) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is an Amazon Kindle (eInk devices only).
+ // Note: For the Kindle Fire, use the normal Android methods.
+ function DetectKindle()
+ {
+ if (stripos($this->useragent, $this->deviceKindle) > -1 &&
+ $this->DetectAndroid() == $this->false)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current Amazon device is using the Silk Browser.
+ // Note: Typically used by the the Kindle Fire.
+ function DetectAmazonSilk()
+ {
+ if (stripos($this->useragent, $this->engineSilk) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // The quick way to detect for a mobile device.
+ // Will probably detect most recent/current mid-tier Feature Phones
+ // as well as smartphone-class devices. Excludes Apple iPads and other modern tablets.
+ function DetectMobileQuick()
+ {
+ //Let's exclude tablets
+ if ($this->isTierTablet == $this->true)
+ return $this->false;
+
+ //Most mobile browsing is done on smartphones
+ if ($this->DetectSmartphone() == $this->true)
+ return $this->true;
+
+ if (($this->DetectWapWml() == $this->true)
+ || ($this->DetectBrewDevice() == $this->true)
+ || ($this->DetectOperaMobile() == $this->true))
+ return $this->true;
+
+ if ((stripos($this->useragent, $this->engineNetfront) > -1)
+ || (stripos($this->useragent, $this->engineUpBrowser) > -1)
+ || (stripos($this->useragent, $this->engineOpenWeb) > -1))
+ return $this->true;
+
+ if (($this->DetectDangerHiptop() == $this->true)
+ || ($this->DetectMidpCapable() == $this->true)
+ || ($this->DetectMaemoTablet() == $this->true)
+ || ($this->DetectArchos() == $this->true))
+ return $this->true;
+
+ if ((stripos($this->useragent, $this->devicePda) > -1) &&
+ !(stripos($this->useragent, $this->disUpdate) > -1))
+ return $this->true;
+ if (stripos($this->useragent, $this->mobile) > -1)
+ return $this->true;
+
+ //We also look for Kindle devices
+ if ($this->DetectKindle() == $this->true ||
+ $this->DetectAmazonSilk() == $this->true)
+ return $this->true;
+
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is a Sony Playstation.
+ function DetectSonyPlaystation()
+ {
+ if (stripos($this->useragent, $this->devicePlaystation) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is a Nintendo game device.
+ function DetectNintendo()
+ {
+ if (stripos($this->useragent, $this->deviceNintendo) > -1 ||
+ stripos($this->useragent, $this->deviceWii) > -1 ||
+ stripos($this->useragent, $this->deviceNintendoDs) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is a Microsoft Xbox.
+ function DetectXbox()
+ {
+ if (stripos($this->useragent, $this->deviceXbox) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is an Internet-capable game console.
+ function DetectGameConsole()
+ {
+ if ($this->DetectSonyPlaystation() == $this->true)
+ return $this->true;
+ else if ($this->DetectNintendo() == $this->true)
+ return $this->true;
+ else if ($this->DetectXbox() == $this->true)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device supports MIDP, a mobile Java technology.
+ function DetectMidpCapable()
+ {
+ if (stripos($this->useragent, $this->deviceMidp) > -1 ||
+ stripos($this->httpaccept, $this->deviceMidp) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is on one of the Maemo-based Nokia Internet Tablets.
+ function DetectMaemoTablet()
+ {
+ if (stripos($this->useragent, $this->maemo) > -1)
+ return $this->true;
+ //For Nokia N810, must be Linux + Tablet, or else it could be something else.
+ if ((stripos($this->useragent, $this->linux) > -1)
+ && (stripos($this->useragent, $this->deviceTablet) > -1)
+ && ($this->DetectWebOSTablet() == $this->false)
+ && ($this->DetectAndroid() == $this->false))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current device is an Archos media player/Internet tablet.
+ function DetectArchos()
+ {
+ if (stripos($this->useragent, $this->deviceArchos) > -1)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // Detects if the current browser is a Sony Mylo device.
+ function DetectSonyMylo()
+ {
+ if (stripos($this->useragent, $this->manuSony) > -1)
+ {
+ if ((stripos($this->useragent, $this->qtembedded) > -1) ||
+ (stripos($this->useragent, $this->mylocom2) > -1))
+ {
+ return $this->true;
+ }
+ else
+ return $this->false;
+ }
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // The longer and more thorough way to detect for a mobile device.
+ // Will probably detect most feature phones,
+ // smartphone-class devices, Internet Tablets,
+ // Internet-enabled game consoles, etc.
+ // This ought to catch a lot of the more obscure and older devices, also --
+ // but no promises on thoroughness!
+ function DetectMobileLong()
+ {
+ if ($this->DetectMobileQuick() == $this->true)
+ return $this->true;
+ if ($this->DetectGameConsole() == $this->true)
+ return $this->true;
+ if ($this->DetectSonyMylo() == $this->true)
+ return $this->true;
+
+ //Detect older phones from certain manufacturers and operators.
+ if (stripos($this->useragent, $this->uplink) > -1)
+ return $this->true;
+ if (stripos($this->useragent, $this->manuSonyEricsson) > -1)
+ return $this->true;
+ if (stripos($this->useragent, $this->manuericsson) > -1)
+ return $this->true;
+
+ if (stripos($this->useragent, $this->manuSamsung1) > -1)
+ return $this->true;
+ if (stripos($this->useragent, $this->svcDocomo) > -1)
+ return $this->true;
+ if (stripos($this->useragent, $this->svcKddi) > -1)
+ return $this->true;
+ if (stripos($this->useragent, $this->svcVodafone) > -1)
+ return $this->true;
+
+ else
+ return $this->false;
+ }
+
+
+
+ //*****************************
+ // For Mobile Web Site Design
+ //*****************************
+
+ //**************************
+ // The quick way to detect for a tier of devices.
+ // This method detects for the new generation of
+ // HTML 5 capable, larger screen tablets.
+ // Includes iPad, Android (e.g., Xoom), BB Playbook, WebOS, etc.
+ function DetectTierTablet()
+ {
+ if (($this->DetectIpad() == $this->true)
+ || ($this->DetectAndroidTablet() == $this->true)
+ || ($this->DetectBlackBerryTablet() == $this->true)
+ || ($this->DetectWebOSTablet() == $this->true))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+ //**************************
+ // The quick way to detect for a tier of devices.
+ // This method detects for devices which can
+ // display iPhone-optimized web content.
+ // Includes iPhone, iPod Touch, Android, Windows Phone 7, WebOS, etc.
+ function DetectTierIphone()
+ {
+ if (($this->isIphone == $this->true) ||
+ ($this->isAndroidPhone == $this->true))
+ return $this->true;
+
+ if (($this->DetectBlackBerryWebKit() == $this->true) &&
+ ($this->DetectBlackBerryTouch() == $this->true))
+ return $this->true;
+ if ($this->DetectWindowsPhone7() == $this->true)
+ return $this->true;
+ if ($this->DetectPalmWebOS() == $this->true)
+ return $this->true;
+ if ($this->DetectGarminNuvifone() == $this->true)
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // The quick way to detect for a tier of devices.
+ // This method detects for devices which are likely to be capable
+ // of viewing CSS content optimized for the iPhone,
+ // but may not necessarily support JavaScript.
+ // Excludes all iPhone Tier devices.
+ function DetectTierRichCss()
+ {
+ if ($this->DetectMobileQuick() == $this->true)
+ {
+ //Exclude iPhone Tier and e-Ink Kindle devices
+ if (($this->DetectTierIphone() == $this->true) ||
+ ($this->DetectKindle() == $this->true))
+ return $this->false;
+
+ //The following devices are explicitly ok.
+ if ($this->DetectWebkit() == $this->true) //Any WebKit
+ return $this->true;
+ if ($this->DetectS60OssBrowser() == $this->true)
+ return $this->true;
+
+ //Note: 'High' BlackBerry devices ONLY
+ if ($this->DetectBlackBerryHigh() == $this->true)
+ return $this->true;
+
+ //Older Windows 'Mobile' isn't good enough for iPhone Tier.
+ if ($this->DetectWindowsMobile() == $this->true)
+ return $this->true;
+ if (stripos($this->useragent, $this->engineTelecaQ) > -1)
+ return $this->true;
+
+ //default
+ else
+ return $this->false;
+ }
+ else
+ return $this->false;
+ }
+
+ //**************************
+ // The quick way to detect for a tier of devices.
+ // This method detects for all other types of phones,
+ // but excludes the iPhone and RichCSS Tier devices.
+ function DetectTierOtherPhones()
+ {
+ //Exclude devices in the other 2 categories
+ if (($this->DetectMobileLong() == $this->true)
+ && ($this->DetectTierIphone() == $this->false)
+ && ($this->DetectTierRichCss() == $this->false))
+ return $this->true;
+ else
+ return $this->false;
+ }
+
+
+}
+
+
+//Was informed by a MobileESP user that it's a best practice
+// to omit the closing ?> marks here. They can sometimes
// cause errors with HTML headers.
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/bin/scripts/pear.bat b/vendor/pear-pear.php.net/PEAR/bin/scripts/pear.bat
index d7675bbfdf26fb5610662ca3eaa262b9d85ac8d4..7f58376084aa014075f3bc1fdb75c3b7e9a902e6 100644
--- a/vendor/pear-pear.php.net/PEAR/bin/scripts/pear.bat
+++ b/vendor/pear-pear.php.net/PEAR/bin/scripts/pear.bat
@@ -1,111 +1,111 @@
-@ECHO OFF
-
-REM ----------------------------------------------------------------------
-REM PHP version 5
-REM ----------------------------------------------------------------------
-REM Copyright (c) 1997-2010 The Authors
-REM ----------------------------------------------------------------------
-REM http://opensource.org/licenses/bsd-license.php New BSD License
-REM ----------------------------------------------------------------------
-REM Authors: Alexander Merz (alexmerz@php.net)
-REM ----------------------------------------------------------------------
-REM
-REM Last updated 12/29/2004 ($Id$ is not replaced if the file is binary)
-
-REM change this lines to match the paths of your system
-REM -------------------
-
-
-REM Test to see if this is a raw pear.bat (uninstalled version)
-SET TMPTMPTMPTMPT=@includ
-SET PMTPMTPMT=%TMPTMPTMPTMPT%e_path@
-FOR %%x IN ("@include_path@") DO (if %%x=="%PMTPMTPMT%" GOTO :NOTINSTALLED)
-
-REM Check PEAR global ENV, set them if they do not exist
-IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
-IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
-IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
-
-GOTO :INSTALLED
-
-:NOTINSTALLED
-ECHO WARNING: This is a raw, uninstalled pear.bat
-
-REM Check to see if we can grab the directory of this file (Windows NT+)
-IF %~n0 == pear (
-FOR %%x IN (cli\php.exe php.exe) DO (if "%%~$PATH:x" NEQ "" (
-SET "PHP_PEAR_PHP_BIN=%%~$PATH:x"
-echo Using PHP Executable "%PHP_PEAR_PHP_BIN%"
-"%PHP_PEAR_PHP_BIN%" -v
-GOTO :NEXTTEST
-))
-GOTO :FAILAUTODETECT
-:NEXTTEST
-IF "%PHP_PEAR_PHP_BIN%" NEQ "" (
-
-REM We can use this PHP to run a temporary php file to get the dirname of pear
-
-echo ^<?php $s=getcwd^(^);chdir^($a=dirname^(__FILE__^).'\\'^);if^(stristr^($a,'\\scripts'^)^)$a=dirname^(dirname^($a^)^).'\\';$f=fopen^($s.'\\~a.a','wb'^);echo$s.'\\~a.a';fwrite^($f,$a^);fclose^($f^);chdir^($s^);?^> > ~~getloc.php
-"%PHP_PEAR_PHP_BIN%" ~~getloc.php
-set /p PHP_PEAR_BIN_DIR=fakeprompt < ~a.a
-DEL ~a.a
-DEL ~~getloc.php
-set "PHP_PEAR_INSTALL_DIR=%PHP_PEAR_BIN_DIR%pear"
-
-REM Make sure there is a pearcmd.php at our disposal
-
-IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php (
-IF EXIST %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php COPY %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-IF EXIST pearcmd.php COPY pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-IF EXIST %~dp0\scripts\pearcmd.php COPY %~dp0\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-)
-)
-GOTO :INSTALLED
-) ELSE (
-REM Windows Me/98 cannot succeed, so allow the batch to fail
-)
-:FAILAUTODETECT
-echo WARNING: failed to auto-detect pear information
-:INSTALLED
-
-REM Check Folders and files
-IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
-IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
-IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
-IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
-
-REM launch pearcmd
-GOTO RUN
-:PEAR_INSTALL_ERROR
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_INSTALL_DIR%
-GOTO END
-:PEAR_INSTALL_ERROR2
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
-ECHO pearcmd.php could not be found there.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_INSTALL_DIR%
-GOTO END
-:PEAR_BIN_ERROR
-ECHO PHP_PEAR_BIN_DIR is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_BIN_DIR%
-GOTO END
-:PEAR_PHPBIN_ERROR
-ECHO PHP_PEAR_PHP_BIN is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_PHP_BIN%
-GOTO END
-:RUN
-"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d open_basedir="" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d register_argc_argv="On" -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
-:END
+@ECHO OFF
+
+REM ----------------------------------------------------------------------
+REM PHP version 5
+REM ----------------------------------------------------------------------
+REM Copyright (c) 1997-2010 The Authors
+REM ----------------------------------------------------------------------
+REM http://opensource.org/licenses/bsd-license.php New BSD License
+REM ----------------------------------------------------------------------
+REM Authors: Alexander Merz (alexmerz@php.net)
+REM ----------------------------------------------------------------------
+REM
+REM Last updated 12/29/2004 ($Id$ is not replaced if the file is binary)
+
+REM change this lines to match the paths of your system
+REM -------------------
+
+
+REM Test to see if this is a raw pear.bat (uninstalled version)
+SET TMPTMPTMPTMPT=@includ
+SET PMTPMTPMT=%TMPTMPTMPTMPT%e_path@
+FOR %%x IN ("@include_path@") DO (if %%x=="%PMTPMTPMT%" GOTO :NOTINSTALLED)
+
+REM Check PEAR global ENV, set them if they do not exist
+IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
+IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
+IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
+
+GOTO :INSTALLED
+
+:NOTINSTALLED
+ECHO WARNING: This is a raw, uninstalled pear.bat
+
+REM Check to see if we can grab the directory of this file (Windows NT+)
+IF %~n0 == pear (
+FOR %%x IN (cli\php.exe php.exe) DO (if "%%~$PATH:x" NEQ "" (
+SET "PHP_PEAR_PHP_BIN=%%~$PATH:x"
+echo Using PHP Executable "%PHP_PEAR_PHP_BIN%"
+"%PHP_PEAR_PHP_BIN%" -v
+GOTO :NEXTTEST
+))
+GOTO :FAILAUTODETECT
+:NEXTTEST
+IF "%PHP_PEAR_PHP_BIN%" NEQ "" (
+
+REM We can use this PHP to run a temporary php file to get the dirname of pear
+
+echo ^<?php $s=getcwd^(^);chdir^($a=dirname^(__FILE__^).'\\'^);if^(stristr^($a,'\\scripts'^)^)$a=dirname^(dirname^($a^)^).'\\';$f=fopen^($s.'\\~a.a','wb'^);echo$s.'\\~a.a';fwrite^($f,$a^);fclose^($f^);chdir^($s^);?^> > ~~getloc.php
+"%PHP_PEAR_PHP_BIN%" ~~getloc.php
+set /p PHP_PEAR_BIN_DIR=fakeprompt < ~a.a
+DEL ~a.a
+DEL ~~getloc.php
+set "PHP_PEAR_INSTALL_DIR=%PHP_PEAR_BIN_DIR%pear"
+
+REM Make sure there is a pearcmd.php at our disposal
+
+IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php (
+IF EXIST %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php COPY %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+IF EXIST pearcmd.php COPY pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+IF EXIST %~dp0\scripts\pearcmd.php COPY %~dp0\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+)
+)
+GOTO :INSTALLED
+) ELSE (
+REM Windows Me/98 cannot succeed, so allow the batch to fail
+)
+:FAILAUTODETECT
+echo WARNING: failed to auto-detect pear information
+:INSTALLED
+
+REM Check Folders and files
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
+IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
+IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
+
+REM launch pearcmd
+GOTO RUN
+:PEAR_INSTALL_ERROR
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_INSTALL_ERROR2
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO pearcmd.php could not be found there.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_BIN_ERROR
+ECHO PHP_PEAR_BIN_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_BIN_DIR%
+GOTO END
+:PEAR_PHPBIN_ERROR
+ECHO PHP_PEAR_PHP_BIN is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_PHP_BIN%
+GOTO END
+:RUN
+"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d open_basedir="" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d register_argc_argv="On" -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+:END
@ECHO ON
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/bin/scripts/peardev.bat b/vendor/pear-pear.php.net/PEAR/bin/scripts/peardev.bat
index 8b67c7d9fbe62d474d14b5e64abdfcd487d16d51..48e03872b4ae01e5644a7905c69f9d09d24e1008 100644
--- a/vendor/pear-pear.php.net/PEAR/bin/scripts/peardev.bat
+++ b/vendor/pear-pear.php.net/PEAR/bin/scripts/peardev.bat
@@ -1,115 +1,115 @@
-@ECHO OFF
-
-REM ----------------------------------------------------------------------
-REM PHP version 5
-REM ----------------------------------------------------------------------
-REM Copyright (c) 1997-2004 The PHP Group
-REM ----------------------------------------------------------------------
-REM This source file is subject to version 3.0 of the PHP license,
-REM that is bundled with this package in the file LICENSE, and is
-REM available at through the world-wide-web at
-REM http://www.php.net/license/3_0.txt.
-REM If you did not receive a copy of the PHP license and are unable to
-REM obtain it through the world-wide-web, please send a note to
-REM license@php.net so we can mail you a copy immediately.
-REM ----------------------------------------------------------------------
-REM Authors: Alexander Merz (alexmerz@php.net)
-REM ----------------------------------------------------------------------
-REM
-REM $Id: peardev.bat,v 1.6 2007-09-03 03:00:17 cellog Exp $
-
-REM change this lines to match the paths of your system
-REM -------------------
-
-
-REM Test to see if this is a raw pear.bat (uninstalled version)
-SET TMPTMPTMPTMPT=@includ
-SET PMTPMTPMT=%TMPTMPTMPTMPT%e_path@
-FOR %%x IN ("@include_path@") DO (if %%x=="%PMTPMTPMT%" GOTO :NOTINSTALLED)
-
-REM Check PEAR global ENV, set them if they do not exist
-IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
-IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
-IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
-GOTO :INSTALLED
-
-:NOTINSTALLED
-ECHO WARNING: This is a raw, uninstalled pear.bat
-
-REM Check to see if we can grab the directory of this file (Windows NT+)
-IF %~n0 == pear (
-FOR %%x IN (cli\php.exe php.exe) DO (if "%%~$PATH:x" NEQ "" (
-SET "PHP_PEAR_PHP_BIN=%%~$PATH:x"
-echo Using PHP Executable "%PHP_PEAR_PHP_BIN%"
-"%PHP_PEAR_PHP_BIN%" -v
-GOTO :NEXTTEST
-))
-GOTO :FAILAUTODETECT
-:NEXTTEST
-IF "%PHP_PEAR_PHP_BIN%" NEQ "" (
-
-REM We can use this PHP to run a temporary php file to get the dirname of pear
-
-echo ^<?php $s=getcwd^(^);chdir^($a=dirname^(__FILE__^).'\\'^);if^(stristr^($a,'\\scripts'^)^)$a=dirname^(dirname^($a^)^).'\\';$f=fopen^($s.'\\~a.a','wb'^);echo$s.'\\~a.a';fwrite^($f,$a^);fclose^($f^);chdir^($s^);?^> > ~~getloc.php
-"%PHP_PEAR_PHP_BIN%" ~~getloc.php
-set /p PHP_PEAR_BIN_DIR=fakeprompt < ~a.a
-DEL ~a.a
-DEL ~~getloc.php
-set "PHP_PEAR_INSTALL_DIR=%PHP_PEAR_BIN_DIR%pear"
-
-REM Make sure there is a pearcmd.php at our disposal
-
-IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php (
-IF EXIST %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php COPY %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-IF EXIST pearcmd.php COPY pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-IF EXIST %~dp0\scripts\pearcmd.php COPY %~dp0\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-)
-)
-GOTO :INSTALLED
-) ELSE (
-REM Windows Me/98 cannot succeed, so allow the batch to fail
-)
-:FAILAUTODETECT
-echo WARNING: failed to auto-detect pear information
-:INSTALLED
-
-REM Check Folders and files
-IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
-IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
-IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
-IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
-REM launch pearcmd
-GOTO RUN
-:PEAR_INSTALL_ERROR
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_INSTALL_DIR%
-GOTO END
-:PEAR_INSTALL_ERROR2
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
-ECHO pearcmd.php could not be found there.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_INSTALL_DIR%
-GOTO END
-:PEAR_BIN_ERROR
-ECHO PHP_PEAR_BIN_DIR is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_BIN_DIR%
-GOTO END
-:PEAR_PHPBIN_ERROR
-ECHO PHP_PEAR_PHP_BIN is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_PHP_BIN%
-GOTO END
-:RUN
-"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d memory_limit="-1" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d open_basedir="" -d output_buffering=1 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
-:END
+@ECHO OFF
+
+REM ----------------------------------------------------------------------
+REM PHP version 5
+REM ----------------------------------------------------------------------
+REM Copyright (c) 1997-2004 The PHP Group
+REM ----------------------------------------------------------------------
+REM This source file is subject to version 3.0 of the PHP license,
+REM that is bundled with this package in the file LICENSE, and is
+REM available at through the world-wide-web at
+REM http://www.php.net/license/3_0.txt.
+REM If you did not receive a copy of the PHP license and are unable to
+REM obtain it through the world-wide-web, please send a note to
+REM license@php.net so we can mail you a copy immediately.
+REM ----------------------------------------------------------------------
+REM Authors: Alexander Merz (alexmerz@php.net)
+REM ----------------------------------------------------------------------
+REM
+REM $Id: peardev.bat,v 1.6 2007-09-03 03:00:17 cellog Exp $
+
+REM change this lines to match the paths of your system
+REM -------------------
+
+
+REM Test to see if this is a raw pear.bat (uninstalled version)
+SET TMPTMPTMPTMPT=@includ
+SET PMTPMTPMT=%TMPTMPTMPTMPT%e_path@
+FOR %%x IN ("@include_path@") DO (if %%x=="%PMTPMTPMT%" GOTO :NOTINSTALLED)
+
+REM Check PEAR global ENV, set them if they do not exist
+IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
+IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
+IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
+GOTO :INSTALLED
+
+:NOTINSTALLED
+ECHO WARNING: This is a raw, uninstalled pear.bat
+
+REM Check to see if we can grab the directory of this file (Windows NT+)
+IF %~n0 == pear (
+FOR %%x IN (cli\php.exe php.exe) DO (if "%%~$PATH:x" NEQ "" (
+SET "PHP_PEAR_PHP_BIN=%%~$PATH:x"
+echo Using PHP Executable "%PHP_PEAR_PHP_BIN%"
+"%PHP_PEAR_PHP_BIN%" -v
+GOTO :NEXTTEST
+))
+GOTO :FAILAUTODETECT
+:NEXTTEST
+IF "%PHP_PEAR_PHP_BIN%" NEQ "" (
+
+REM We can use this PHP to run a temporary php file to get the dirname of pear
+
+echo ^<?php $s=getcwd^(^);chdir^($a=dirname^(__FILE__^).'\\'^);if^(stristr^($a,'\\scripts'^)^)$a=dirname^(dirname^($a^)^).'\\';$f=fopen^($s.'\\~a.a','wb'^);echo$s.'\\~a.a';fwrite^($f,$a^);fclose^($f^);chdir^($s^);?^> > ~~getloc.php
+"%PHP_PEAR_PHP_BIN%" ~~getloc.php
+set /p PHP_PEAR_BIN_DIR=fakeprompt < ~a.a
+DEL ~a.a
+DEL ~~getloc.php
+set "PHP_PEAR_INSTALL_DIR=%PHP_PEAR_BIN_DIR%pear"
+
+REM Make sure there is a pearcmd.php at our disposal
+
+IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php (
+IF EXIST %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php COPY %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+IF EXIST pearcmd.php COPY pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+IF EXIST %~dp0\scripts\pearcmd.php COPY %~dp0\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+)
+)
+GOTO :INSTALLED
+) ELSE (
+REM Windows Me/98 cannot succeed, so allow the batch to fail
+)
+:FAILAUTODETECT
+echo WARNING: failed to auto-detect pear information
+:INSTALLED
+
+REM Check Folders and files
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
+IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
+IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
+REM launch pearcmd
+GOTO RUN
+:PEAR_INSTALL_ERROR
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_INSTALL_ERROR2
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO pearcmd.php could not be found there.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_BIN_ERROR
+ECHO PHP_PEAR_BIN_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_BIN_DIR%
+GOTO END
+:PEAR_PHPBIN_ERROR
+ECHO PHP_PEAR_PHP_BIN is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_PHP_BIN%
+GOTO END
+:RUN
+"%PHP_PEAR_PHP_BIN%" -C -d date.timezone=UTC -d memory_limit="-1" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" -d variables_order=EGPCS -d open_basedir="" -d output_buffering=1 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -f "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+:END
@ECHO ON
\ No newline at end of file
diff --git a/vendor/pear-pear.php.net/PEAR/bin/scripts/pecl.bat b/vendor/pear-pear.php.net/PEAR/bin/scripts/pecl.bat
index e7c823bc144a858309b904e11a82e5eb704bf9aa..f604284de0305ec53569572cdcda230d0366746d 100644
--- a/vendor/pear-pear.php.net/PEAR/bin/scripts/pecl.bat
+++ b/vendor/pear-pear.php.net/PEAR/bin/scripts/pecl.bat
@@ -1,115 +1,115 @@
-@ECHO OFF
-
-REM ----------------------------------------------------------------------
-REM PHP version 5
-REM ----------------------------------------------------------------------
-REM Copyright (c) 1997-2004 The PHP Group
-REM ----------------------------------------------------------------------
-REM This source file is subject to version 3.0 of the PHP license,
-REM that is bundled with this package in the file LICENSE, and is
-REM available at through the world-wide-web at
-REM http://www.php.net/license/3_0.txt.
-REM If you did not receive a copy of the PHP license and are unable to
-REM obtain it through the world-wide-web, please send a note to
-REM license@php.net so we can mail you a copy immediately.
-REM ----------------------------------------------------------------------
-REM Authors: Alexander Merz (alexmerz@php.net)
-REM ----------------------------------------------------------------------
-REM
-REM Last updated 02/08/2004 ($Id$ is not replaced if the file is binary)
-
-REM change this lines to match the paths of your system
-REM -------------------
-
-
-REM Test to see if this is a raw pear.bat (uninstalled version)
-SET TMPTMPTMPTMPT=@includ
-SET PMTPMTPMT=%TMPTMPTMPTMPT%e_path@
-FOR %%x IN ("@include_path@") DO (if %%x=="%PMTPMTPMT%" GOTO :NOTINSTALLED)
-
-REM Check PEAR global ENV, set them if they do not exist
-IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
-IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
-IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
-GOTO :INSTALLED
-
-:NOTINSTALLED
-ECHO WARNING: This is a raw, uninstalled pear.bat
-
-REM Check to see if we can grab the directory of this file (Windows NT+)
-IF %~n0 == pear (
-FOR %%x IN (cli\php.exe php.exe) DO (if "%%~$PATH:x" NEQ "" (
-SET "PHP_PEAR_PHP_BIN=%%~$PATH:x"
-echo Using PHP Executable "%PHP_PEAR_PHP_BIN%"
-"%PHP_PEAR_PHP_BIN%" -v
-GOTO :NEXTTEST
-))
-GOTO :FAILAUTODETECT
-:NEXTTEST
-IF "%PHP_PEAR_PHP_BIN%" NEQ "" (
-
-REM We can use this PHP to run a temporary php file to get the dirname of pear
-
-echo ^<?php $s=getcwd^(^);chdir^($a=dirname^(__FILE__^).'\\'^);if^(stristr^($a,'\\scripts'^)^)$a=dirname^(dirname^($a^)^).'\\';$f=fopen^($s.'\\~a.a','wb'^);echo$s.'\\~a.a';fwrite^($f,$a^);fclose^($f^);chdir^($s^);?^> > ~~getloc.php
-"%PHP_PEAR_PHP_BIN%" ~~getloc.php
-set /p PHP_PEAR_BIN_DIR=fakeprompt < ~a.a
-DEL ~a.a
-DEL ~~getloc.php
-set "PHP_PEAR_INSTALL_DIR=%PHP_PEAR_BIN_DIR%pear"
-
-REM Make sure there is a pearcmd.php at our disposal
-
-IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php (
-IF EXIST %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php COPY %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-IF EXIST pearcmd.php COPY pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-IF EXIST %~dp0\scripts\pearcmd.php COPY %~dp0\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
-)
-)
-GOTO :INSTALLED
-) ELSE (
-REM Windows Me/98 cannot succeed, so allow the batch to fail
-)
-:FAILAUTODETECT
-echo WARNING: failed to auto-detect pear information
-:INSTALLED
-
-REM Check Folders and files
-IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
-IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
-IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
-IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
-REM launch pearcmd
-GOTO RUN
-:PEAR_INSTALL_ERROR
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_INSTALL_DIR%
-GOTO END
-:PEAR_INSTALL_ERROR2
-ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
-ECHO pearcmd.php could not be found there.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_INSTALL_DIR%
-GOTO END
-:PEAR_BIN_ERROR
-ECHO PHP_PEAR_BIN_DIR is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_BIN_DIR%
-GOTO END
-:PEAR_PHPBIN_ERROR
-ECHO PHP_PEAR_PHP_BIN is not set correctly.
-ECHO Please fix it using your environment variable or modify
-ECHO the default value in pear.bat
-ECHO The current value is:
-ECHO %PHP_PEAR_PHP_BIN%
-GOTO END
-:RUN
-"%PHP_PEAR_PHP_BIN%" -C -n -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -d register_argc_argv="On" -d variables_order=EGPCS -f "%PHP_PEAR_INSTALL_DIR%\peclcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
-:END
+@ECHO OFF
+
+REM ----------------------------------------------------------------------
+REM PHP version 5
+REM ----------------------------------------------------------------------
+REM Copyright (c) 1997-2004 The PHP Group
+REM ----------------------------------------------------------------------
+REM This source file is subject to version 3.0 of the PHP license,
+REM that is bundled with this package in the file LICENSE, and is
+REM available at through the world-wide-web at
+REM http://www.php.net/license/3_0.txt.
+REM If you did not receive a copy of the PHP license and are unable to
+REM obtain it through the world-wide-web, please send a note to
+REM license@php.net so we can mail you a copy immediately.
+REM ----------------------------------------------------------------------
+REM Authors: Alexander Merz (alexmerz@php.net)
+REM ----------------------------------------------------------------------
+REM
+REM Last updated 02/08/2004 ($Id$ is not replaced if the file is binary)
+
+REM change this lines to match the paths of your system
+REM -------------------
+
+
+REM Test to see if this is a raw pear.bat (uninstalled version)
+SET TMPTMPTMPTMPT=@includ
+SET PMTPMTPMT=%TMPTMPTMPTMPT%e_path@
+FOR %%x IN ("@include_path@") DO (if %%x=="%PMTPMTPMT%" GOTO :NOTINSTALLED)
+
+REM Check PEAR global ENV, set them if they do not exist
+IF "%PHP_PEAR_INSTALL_DIR%"=="" SET "PHP_PEAR_INSTALL_DIR=@include_path@"
+IF "%PHP_PEAR_BIN_DIR%"=="" SET "PHP_PEAR_BIN_DIR=@bin_dir@"
+IF "%PHP_PEAR_PHP_BIN%"=="" SET "PHP_PEAR_PHP_BIN=@php_bin@"
+GOTO :INSTALLED
+
+:NOTINSTALLED
+ECHO WARNING: This is a raw, uninstalled pear.bat
+
+REM Check to see if we can grab the directory of this file (Windows NT+)
+IF %~n0 == pear (
+FOR %%x IN (cli\php.exe php.exe) DO (if "%%~$PATH:x" NEQ "" (
+SET "PHP_PEAR_PHP_BIN=%%~$PATH:x"
+echo Using PHP Executable "%PHP_PEAR_PHP_BIN%"
+"%PHP_PEAR_PHP_BIN%" -v
+GOTO :NEXTTEST
+))
+GOTO :FAILAUTODETECT
+:NEXTTEST
+IF "%PHP_PEAR_PHP_BIN%" NEQ "" (
+
+REM We can use this PHP to run a temporary php file to get the dirname of pear
+
+echo ^<?php $s=getcwd^(^);chdir^($a=dirname^(__FILE__^).'\\'^);if^(stristr^($a,'\\scripts'^)^)$a=dirname^(dirname^($a^)^).'\\';$f=fopen^($s.'\\~a.a','wb'^);echo$s.'\\~a.a';fwrite^($f,$a^);fclose^($f^);chdir^($s^);?^> > ~~getloc.php
+"%PHP_PEAR_PHP_BIN%" ~~getloc.php
+set /p PHP_PEAR_BIN_DIR=fakeprompt < ~a.a
+DEL ~a.a
+DEL ~~getloc.php
+set "PHP_PEAR_INSTALL_DIR=%PHP_PEAR_BIN_DIR%pear"
+
+REM Make sure there is a pearcmd.php at our disposal
+
+IF NOT EXIST %PHP_PEAR_INSTALL_DIR%\pearcmd.php (
+IF EXIST %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php COPY %PHP_PEAR_INSTALL_DIR%\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+IF EXIST pearcmd.php COPY pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+IF EXIST %~dp0\scripts\pearcmd.php COPY %~dp0\scripts\pearcmd.php %PHP_PEAR_INSTALL_DIR%\pearcmd.php
+)
+)
+GOTO :INSTALLED
+) ELSE (
+REM Windows Me/98 cannot succeed, so allow the batch to fail
+)
+:FAILAUTODETECT
+echo WARNING: failed to auto-detect pear information
+:INSTALLED
+
+REM Check Folders and files
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%" GOTO PEAR_INSTALL_ERROR
+IF NOT EXIST "%PHP_PEAR_INSTALL_DIR%\pearcmd.php" GOTO PEAR_INSTALL_ERROR2
+IF NOT EXIST "%PHP_PEAR_BIN_DIR%" GOTO PEAR_BIN_ERROR
+IF NOT EXIST "%PHP_PEAR_PHP_BIN%" GOTO PEAR_PHPBIN_ERROR
+REM launch pearcmd
+GOTO RUN
+:PEAR_INSTALL_ERROR
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_INSTALL_ERROR2
+ECHO PHP_PEAR_INSTALL_DIR is not set correctly.
+ECHO pearcmd.php could not be found there.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_INSTALL_DIR%
+GOTO END
+:PEAR_BIN_ERROR
+ECHO PHP_PEAR_BIN_DIR is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_BIN_DIR%
+GOTO END
+:PEAR_PHPBIN_ERROR
+ECHO PHP_PEAR_PHP_BIN is not set correctly.
+ECHO Please fix it using your environment variable or modify
+ECHO the default value in pear.bat
+ECHO The current value is:
+ECHO %PHP_PEAR_PHP_BIN%
+GOTO END
+:RUN
+"%PHP_PEAR_PHP_BIN%" -C -n -d date.timezone=UTC -d output_buffering=1 -d safe_mode=0 -d "include_path='%PHP_PEAR_INSTALL_DIR%'" -d register_argc_argv="On" -d variables_order=EGPCS -f "%PHP_PEAR_INSTALL_DIR%\peclcmd.php" -- %1 %2 %3 %4 %5 %6 %7 %8 %9
+:END
@ECHO ON
\ No newline at end of file
diff --git a/vendor/zendframework/zendservice-amazon/tests/ZendService/Amazon/S3/_files/testdata.html b/vendor/zendframework/zendservice-amazon/tests/ZendService/Amazon/S3/_files/testdata.html
index 9f95c31a0b71100db23b63741069d592dc5ae472..5313b54cb0425820d7f82219cbcbeff6a33ad734 100644
--- a/vendor/zendframework/zendservice-amazon/tests/ZendService/Amazon/S3/_files/testdata.html
+++ b/vendor/zendframework/zendservice-amazon/tests/ZendService/Amazon/S3/_files/testdata.html
@@ -1,3 +1,3 @@
-<h1>test!</h1>
-
-test!
+<h1>test!</h1>
+
+test!