From c8a35bf02ea4baae4afbcab15ce91a281283addc Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Thu, 25 Feb 2010 14:10:10 +0000
Subject: [PATCH] fixes #1175 - update to ZF 1.10.2
git-svn-id: http://dev.piwik.org/svn/trunk@1870 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
libs/Zend/Auth/Adapter/Ldap.php | 19 ++++--
libs/Zend/Cache/Manager.php | 4 +-
libs/Zend/Db/Statement/Pdo/Oci.php | 24 +++++++-
libs/Zend/Db/Table/Abstract.php | 8 +--
libs/Zend/Db/Table/Row/Abstract.php | 4 +-
libs/Zend/Feed/Pubsubhubbub/Subscriber.php | 7 +--
libs/Zend/Http/Client.php | 11 ++--
libs/Zend/Http/Cookie.php | 38 ++++++++----
libs/Zend/Loader/PluginLoader.php | 10 +++-
libs/Zend/Validate.php | 4 +-
libs/Zend/Validate/Digits.php | 4 +-
libs/Zend/Validate/EmailAddress.php | 7 +--
libs/Zend/Validate/File/IsCompressed.php | 40 +++++++++----
libs/Zend/Validate/File/IsImage.php | 68 +++++++++++++++++-----
libs/Zend/Validate/Hostname.php | 8 ++-
libs/Zend/Validate/PostCode.php | 3 +-
libs/Zend/Version.php | 4 +-
17 files changed, 185 insertions(+), 78 deletions(-)
diff --git a/libs/Zend/Auth/Adapter/Ldap.php b/libs/Zend/Auth/Adapter/Ldap.php
index 6d86a4423a..11b21daa18 100644
--- a/libs/Zend/Auth/Adapter/Ldap.php
+++ b/libs/Zend/Auth/Adapter/Ldap.php
@@ -17,7 +17,7 @@
* @subpackage Zend_Auth_Adapter
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Ldap.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Ldap.php 21009 2010-02-09 14:06:42Z sgehrig $
*/
/**
@@ -317,10 +317,15 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface
/*
* Fixes problem when authenticated user is not allowed to retrieve
* group-membership information or own account.
- * This requires that the user specified with "username" and "password"
- * in the Zend_Ldap options is able to retrieve the required information.
+ * This requires that the user specified with "username" and optionally
+ * "password" in the Zend_Ldap options is able to retrieve the required
+ * information.
*/
- $ldap->bind();
+ $requireRebind = false;
+ if (isset($options['username'])) {
+ $ldap->bind();
+ $requireRebind = true;
+ }
$dn = $ldap->getCanonicalAccountName($canonicalName, Zend_Ldap::ACCTNAME_FORM_DN);
$groupResult = $this->_checkGroupMembership($ldap, $canonicalName, $dn, $adapterOptions);
@@ -329,8 +334,10 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface
$messages[0] = '';
$messages[1] = '';
$messages[] = "$canonicalName authentication successful";
- // rebinding with authenticated user
- $ldap->bind($dn, $password);
+ if ($requireRebind === true) {
+ // rebinding with authenticated user
+ $ldap->bind($dn, $password);
+ }
return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $canonicalName, $messages);
} else {
$messages[0] = 'Account is not a member of the specified group';
diff --git a/libs/Zend/Cache/Manager.php b/libs/Zend/Cache/Manager.php
index e4739bc9e8..a409a2b816 100644
--- a/libs/Zend/Cache/Manager.php
+++ b/libs/Zend/Cache/Manager.php
@@ -22,6 +22,9 @@
/** @see Zend_Cache_Exception */
require_once 'Zend/Cache/Exception.php';
+/** @see Zend_Cache */
+require_once 'Zend/Cache.php';
+
/**
* @category Zend
* @package Zend_Cache
@@ -86,7 +89,6 @@ class Zend_Cache_Manager
'name' => 'Capture',
'options' => array(
'ignore_user_abort' => true,
-// 'automatic_serialization' => true
),
),
'backend' => array(
diff --git a/libs/Zend/Db/Statement/Pdo/Oci.php b/libs/Zend/Db/Statement/Pdo/Oci.php
index 247354f8af..49d82c2870 100644
--- a/libs/Zend/Db/Statement/Pdo/Oci.php
+++ b/libs/Zend/Db/Statement/Pdo/Oci.php
@@ -17,7 +17,7 @@
* @subpackage Statement
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Oci.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Oci.php 21105 2010-02-19 21:27:09Z mikaelkael $
*/
/**
@@ -66,4 +66,26 @@ class Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo
}
return $results;
}
+
+
+ /**
+ * Fetches a row from the result set.
+ *
+ * @param int $style OPTIONAL Fetch mode for this fetch operation.
+ * @param int $cursor OPTIONAL Absolute, relative, or other.
+ * @param int $offset OPTIONAL Number for absolute or relative cursors.
+ * @return mixed Array, object, or scalar depending on fetch mode.
+ * @throws Zend_Db_Statement_Exception
+ */
+ public function fetch($style = null, $cursor = null, $offset = null)
+ {
+ $row = parent::fetch($style, $cursor, $offset);
+
+ $remove = $this->_adapter->foldCase('zend_db_rownum');
+ if (is_array($row) && array_key_exists($remove, $row)) {
+ unset($row[$remove]);
+ }
+
+ return $row;
+ }
}
\ No newline at end of file
diff --git a/libs/Zend/Db/Table/Abstract.php b/libs/Zend/Db/Table/Abstract.php
index 6b4531b5cf..24235eb01d 100644
--- a/libs/Zend/Db/Table/Abstract.php
+++ b/libs/Zend/Db/Table/Abstract.php
@@ -17,7 +17,7 @@
* @subpackage Table
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Abstract.php 21079 2010-02-18 18:15:49Z tech13 $
*/
/**
@@ -823,11 +823,7 @@ abstract class Zend_Db_Table_Abstract
$metadata = $this->_db->describeTable($this->_name, $this->_schema);
// If $this has a metadata cache, then cache the metadata
if (null !== $this->_metadataCache && !$this->_metadataCache->save($metadata, $cacheId)) {
- /**
- * @see Zend_Db_Table_Exception
- */
- require_once 'Zend/Db/Table/Exception.php';
- throw new Zend_Db_Table_Exception('Failed saving metadata to metadataCache');
+ trigger_error('Failed saving metadata to metadataCache', E_USER_NOTICE);
}
}
diff --git a/libs/Zend/Db/Table/Row/Abstract.php b/libs/Zend/Db/Table/Row/Abstract.php
index 646674e91d..944f4382f6 100644
--- a/libs/Zend/Db/Table/Row/Abstract.php
+++ b/libs/Zend/Db/Table/Row/Abstract.php
@@ -17,7 +17,7 @@
* @subpackage Table
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Abstract.php 20571 2010-01-24 15:40:22Z mikaelkael $
+ * @version $Id: Abstract.php 21102 2010-02-19 21:13:37Z ralph $
*/
/**
@@ -1051,7 +1051,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess
}
$joinCond = implode(' AND ', $joinCond);
- $select->from(array('i' => $interName), Zend_Db_Select::SQL_WILDCARD, $interSchema)
+ $select->from(array('i' => $interName), array(), $interSchema)
->joinInner(array('m' => $matchName), $joinCond, Zend_Db_Select::SQL_WILDCARD, $matchSchema)
->setIntegrityCheck(false);
diff --git a/libs/Zend/Feed/Pubsubhubbub/Subscriber.php b/libs/Zend/Feed/Pubsubhubbub/Subscriber.php
index 4a19583a1d..35a4ccf96c 100644
--- a/libs/Zend/Feed/Pubsubhubbub/Subscriber.php
+++ b/libs/Zend/Feed/Pubsubhubbub/Subscriber.php
@@ -639,7 +639,6 @@ class Zend_Feed_Pubsubhubbub_Subscriber
$client->setUri($url);
$client->setRawData($this->_getRequestParameters($url, $mode));
$response = $client->request();
- echo $client->getLastRequest();
if ($response->getStatus() !== 204
&& $response->getStatus() !== 202
) {
@@ -721,7 +720,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber
* Establish a persistent verify_token and attach key to callback
* URL's path/querystring
*/
- $key = $this->_generateSubscriptionKey($params);
+ $key = $this->_generateSubscriptionKey($params, $hubUrl);
$token = $this->_generateVerifyToken();
$params['hub.verify_token'] = $token;
@@ -791,9 +790,9 @@ class Zend_Feed_Pubsubhubbub_Subscriber
* @param string $hubUrl The Hub Server URL for which this token will apply
* @return string
*/
- protected function _generateSubscriptionKey(array $params)
+ protected function _generateSubscriptionKey(array $params, $hubUrl)
{
- $keyBase = $params['hub.topic'] . $params['hub.callback'];
+ $keyBase = $params['hub.topic'] . $hubUrl;
$key = md5($keyBase);
return $key;
}
diff --git a/libs/Zend/Http/Client.php b/libs/Zend/Http/Client.php
index 1e58946573..d765f51f65 100644
--- a/libs/Zend/Http/Client.php
+++ b/libs/Zend/Http/Client.php
@@ -16,7 +16,7 @@
* @category Zend
* @package Zend_Http
* @subpackage Client
- * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Client.php 21020 2010-02-11 17:27:23Z shahar $
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -117,7 +117,8 @@ class Zend_Http_Client
'keepalive' => false,
'storeresponse' => true,
'strict' => true,
- 'output_stream' => false,
+ 'output_stream' => false,
+ 'encodecookies' => true,
);
/**
@@ -640,7 +641,7 @@ class Zend_Http_Client
return $this;
}
- if ($value !== null) {
+ if ($value !== null && $this->config['encodecookies']) {
$value = urlencode($value);
}
@@ -648,7 +649,9 @@ class Zend_Http_Client
if ($cookie instanceof Zend_Http_Cookie) {
$this->cookiejar->addCookie($cookie);
} elseif (is_string($cookie) && $value !== null) {
- $cookie = Zend_Http_Cookie::fromString("{$cookie}={$value}", $this->uri);
+ $cookie = Zend_Http_Cookie::fromString("{$cookie}={$value}",
+ $this->uri,
+ $this->config['encodecookies']);
$this->cookiejar->addCookie($cookie);
}
} else {
diff --git a/libs/Zend/Http/Cookie.php b/libs/Zend/Http/Cookie.php
index 498d25f418..987d7951ab 100644
--- a/libs/Zend/Http/Cookie.php
+++ b/libs/Zend/Http/Cookie.php
@@ -17,7 +17,7 @@
* @package Zend_Http
* @subpackage Cookie
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version $Id: Cookie.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Cookie.php 21020 2010-02-11 17:27:23Z shahar $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -88,6 +88,13 @@ class Zend_Http_Cookie
*/
protected $secure;
+ /**
+ * Whether the cookie value has been encoded/decoded
+ *
+ * @var boolean
+ */
+ protected $encodeValue;
+
/**
* Cookie object constructor
*
@@ -258,7 +265,10 @@ class Zend_Http_Cookie
*/
public function __toString()
{
- return $this->name . '=' . urlencode($this->value) . ';';
+ if ($this->encodeValue) {
+ return $this->name . '=' . urlencode($this->value) . ';';
+ }
+ return $this->name . '=' . $this->value . ';';
}
/**
@@ -266,14 +276,16 @@ class Zend_Http_Cookie
* (for example the value of the Set-Cookie HTTP header)
*
* @param string $cookieStr
- * @param Zend_Uri_Http|string $ref_uri Reference URI for default values (domain, path)
+ * @param Zend_Uri_Http|string $refUri Reference URI for default values (domain, path)
+ * @param boolean $encodeValue Weither or not the cookie's value should be
+ * passed through urlencode/urldecode
* @return Zend_Http_Cookie A new Zend_Http_Cookie object or false on failure.
*/
- public static function fromString($cookieStr, $ref_uri = null)
+ public static function fromString($cookieStr, $refUri = null, $encodeValue = true)
{
// Set default values
- if (is_string($ref_uri)) {
- $ref_uri = Zend_Uri_Http::factory($ref_uri);
+ if (is_string($refUri)) {
+ $refUri = Zend_Uri_Http::factory($refUri);
}
$name = '';
@@ -290,12 +302,14 @@ class Zend_Http_Cookie
// Get the name and value of the cookie
list($name, $value) = explode('=', trim(array_shift($parts)), 2);
$name = trim($name);
- $value = urldecode(trim($value));
+ if ($encodeValue) {
+ $value = urldecode(trim($value));
+ }
// Set default domain and path
- if ($ref_uri instanceof Zend_Uri_Http) {
- $domain = $ref_uri->getHost();
- $path = $ref_uri->getPath();
+ if ($refUri instanceof Zend_Uri_Http) {
+ $domain = $refUri->getHost();
+ $path = $refUri->getPath();
$path = substr($path, 0, strrpos($path, '/'));
}
@@ -342,7 +356,9 @@ class Zend_Http_Cookie
}
if ($name !== '') {
- return new self($name, $value, $domain, $expires, $path, $secure);
+ $ret = new self($name, $value, $domain, $expires, $path, $secure);
+ $ret->encodeValue = ($encodeValue) ? true : false;
+ return $ret;
} else {
return false;
}
diff --git a/libs/Zend/Loader/PluginLoader.php b/libs/Zend/Loader/PluginLoader.php
index bd70375357..0c63bae366 100644
--- a/libs/Zend/Loader/PluginLoader.php
+++ b/libs/Zend/Loader/PluginLoader.php
@@ -17,7 +17,7 @@
* @subpackage PluginLoader
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: PluginLoader.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: PluginLoader.php 21170 2010-02-23 19:50:16Z matthew $
*/
/** Zend_Loader_PluginLoader_Interface */
@@ -126,6 +126,12 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
if($prefix == "") {
return $prefix;
}
+
+ $last = strlen($prefix) - 1;
+ if ($prefix{$last} == '\\') {
+ return $prefix;
+ }
+
return rtrim($prefix, '_') . '_';
}
@@ -408,10 +414,8 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface
if ($this->_useStaticRegistry) {
self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name] = $className;
- self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name] = (isset($loadFile) ? $loadFile : '');
} else {
$this->_loadedPlugins[$name] = $className;
- $this->_loadedPluginPaths[$name] = (isset($loadFile) ? $loadFile : '');
}
return $className;
}
diff --git a/libs/Zend/Validate.php b/libs/Zend/Validate.php
index 7a9216cd13..b3d4026a76 100644
--- a/libs/Zend/Validate.php
+++ b/libs/Zend/Validate.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Validate.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Validate.php 21097 2010-02-19 20:11:34Z thomas $
*/
/**
@@ -197,7 +197,7 @@ class Zend_Validate implements Zend_Validate_Interface
$namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Validate'));
$className = ucfirst($classBaseName);
try {
- if (!class_exists($className)) {
+ if (!class_exists($className, false)) {
require_once 'Zend/Loader.php';
foreach($namespaces as $namespace) {
$class = $namespace . '_' . $className;
diff --git a/libs/Zend/Validate/Digits.php b/libs/Zend/Validate/Digits.php
index d6528dde01..6439d37e05 100644
--- a/libs/Zend/Validate/Digits.php
+++ b/libs/Zend/Validate/Digits.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Digits.php 20096 2010-01-06 02:05:09Z bkarwin $
+ * @version $Id: Digits.php 21136 2010-02-22 22:30:50Z thomas $
*/
/**
@@ -49,7 +49,7 @@ class Zend_Validate_Digits extends Zend_Validate_Abstract
* @var array
*/
protected $_messageTemplates = array(
- self::NOT_DIGITS => "'%value%' contains not only digit characters",
+ self::NOT_DIGITS => "'%value%' contains characters which are not digits; but only digits are allowed",
self::STRING_EMPTY => "'%value%' is an empty string",
self::INVALID => "Invalid type given, value should be string, integer or float",
);
diff --git a/libs/Zend/Validate/EmailAddress.php b/libs/Zend/Validate/EmailAddress.php
index dd426cd492..ff5630e108 100644
--- a/libs/Zend/Validate/EmailAddress.php
+++ b/libs/Zend/Validate/EmailAddress.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: EmailAddress.php 20910 2010-02-04 19:36:26Z thomas $
+ * @version $Id: EmailAddress.php 21083 2010-02-18 19:29:20Z thomas $
*/
/**
@@ -441,10 +441,9 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
*/
private function _validateMXRecords()
{
- $result = true;
$mxHosts = array();
- getmxrr($this->_hostname, $mxHosts);
- if ($this->_options['deep'] && function_exists('checkdnsrr')) {
+ $result = getmxrr($this->_hostname, $mxHosts);
+ if ($result && $this->_options['deep'] && function_exists('checkdnsrr')) {
$validAddress = false;
$reserved = true;
foreach ($mxHosts as $hostname) {
diff --git a/libs/Zend/Validate/File/IsCompressed.php b/libs/Zend/Validate/File/IsCompressed.php
index d2b8a25430..3b7983f264 100644
--- a/libs/Zend/Validate/File/IsCompressed.php
+++ b/libs/Zend/Validate/File/IsCompressed.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: IsCompressed.php 20358 2010-01-17 19:03:49Z thomas $
+ * @version $Id: IsCompressed.php 21138 2010-02-22 22:37:11Z thomas $
*/
/**
@@ -63,23 +63,39 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType
}
$temp = array();
- $default = array(
- 'application/x-tar',
- 'application/x-cpio',
- 'application/x-debian-package',
- 'application/x-archive',
+ // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
+ $default = array(
+ 'application/arj',
+ 'application/gnutar',
+ 'application/lha',
+ 'application/lzx',
+ 'application/vnd.ms-cab-compressed',
+ 'application/x-ace-compressed',
'application/x-arc',
+ 'application/x-archive',
'application/x-arj',
- 'application/x-lharc',
+ 'application/x-bzip',
+ 'application/x-bzip2',
+ 'application/x-cab-compressed',
+ 'application/x-compress',
+ 'application/x-compressed',
+ 'application/x-cpio',
+ 'application/x-debian-package',
+ 'application/x-eet',
+ 'application/x-gzip',
+ 'application/x-java-pack200',
'application/x-lha',
+ 'application/x-lharc',
+ 'application/x-lzh',
+ 'application/x-lzma',
+ 'application/x-lzx',
'application/x-rar',
+ 'application/x-sit',
+ 'application/x-stuffit',
+ 'application/x-tar',
'application/zip',
'application/zoo',
- 'application/x-eet',
- 'application/x-java-pack200',
- 'application/x-compress',
- 'application/x-gzip',
- 'application/x-bzip2'
+ 'multipart/x-gzip',
);
if (is_array($mimetype)) {
diff --git a/libs/Zend/Validate/File/IsImage.php b/libs/Zend/Validate/File/IsImage.php
index 77756277f0..cfff3e3c55 100644
--- a/libs/Zend/Validate/File/IsImage.php
+++ b/libs/Zend/Validate/File/IsImage.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: IsImage.php 20358 2010-01-17 19:03:49Z thomas $
+ * @version $Id: IsImage.php 21138 2010-02-22 22:37:11Z thomas $
*/
/**
@@ -46,7 +46,7 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
*/
protected $_messageTemplates = array(
self::FALSE_TYPE => "File '%value%' is no image, '%type%' detected",
- self::NOT_DETECTED => "The mimetype of file '%value%' could not been detected",
+ self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected",
self::NOT_READABLE => "File '%value%' can not be read",
);
@@ -63,27 +63,63 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType
}
$temp = array();
+ // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
+ // http://www.iana.org/assignments/media-types/image/
$default = array(
- 'image/x-quicktime',
+ 'application/cdf',
+ 'application/dicom',
+ 'application/fractals',
+ 'application/postscript',
+ 'application/vnd.hp-hpgl',
+ 'application/vnd.oasis.opendocument.graphics',
+ 'application/x-cdf',
+ 'application/x-cmu-raster',
+ 'application/x-ima',
+ 'application/x-inventor',
+ 'application/x-koan',
+ 'application/x-portable-anymap',
+ 'application/x-world-x-3dmf',
+ 'image/bmp',
+ 'image/c',
+ 'image/cgm',
+ 'image/fif',
+ 'image/gif',
+ 'image/jpeg',
+ 'image/jpm',
+ 'image/jpx',
'image/jp2',
- 'image/x-xpmi',
- 'image/x-portable-bitmap',
- 'image/x-portable-greymap',
- 'image/x-portable-pixmap',
- 'image/x-niff',
- 'image/tiff',
+ 'image/naplps',
+ 'image/pjpeg',
'image/png',
- 'image/x-unknown',
- 'image/gif',
- 'image/x-ms-bmp',
- 'application/dicom',
+ 'image/svg',
+ 'image/svg+xml',
+ 'image/tiff',
'image/vnd.adobe.photoshop',
'image/vnd.djvu',
+ 'image/vnd.fpx',
+ 'image/vnd.net-fpx',
+ 'image/x-cmu-raster',
+ 'image/x-cmx',
+ 'image/x-coreldraw',
'image/x-cpi',
- 'image/jpeg',
+ 'image/x-emf',
'image/x-ico',
- 'image/x-coreldraw',
- 'image/svg+xml'
+ 'image/x-icon',
+ 'image/x-jg',
+ 'image/x-ms-bmp',
+ 'image/x-niff',
+ 'image/x-pict',
+ 'image/x-pcx',
+ 'image/x-portable-anymap',
+ 'image/x-portable-bitmap',
+ 'image/x-portable-greymap',
+ 'image/x-portable-pixmap',
+ 'image/x-quicktime',
+ 'image/x-rgb',
+ 'image/x-tiff',
+ 'image/x-unknown',
+ 'image/x-windows-bmp',
+ 'image/x-xpmi',
);
if (is_array($mimetype)) {
diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php
index 04f656dab8..3199767b76 100644
--- a/libs/Zend/Validate/Hostname.php
+++ b/libs/Zend/Validate/Hostname.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Hostname.php 20358 2010-01-17 19:03:49Z thomas $
+ * @version $Id: Hostname.php 21063 2010-02-15 23:00:17Z thomas $
*/
/**
@@ -200,6 +200,12 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
'DE' => array(1 => '/^[\x{002d}0-9a-zà -öø-ÿăąÄćĉÄÄ‹ÄđĕěėęēğÄġģĥħÄĩįīıĵķĺľļłńňņŋÅÅ‘ÅœĸŕřŗśÅšşťţŧÅůűũųūŵŷźžż]{1,63}$/iu'),
'DK' => array(1 => '/^[\x{002d}0-9a-zäéöü]{1,63}$/iu'),
'ES' => array(1 => '/^[\x{002d}0-9a-zà áçèéÃïñòóúü·]{1,63}$/iu'),
+ 'EU' => array(1 => '/^[\x{002d}0-9a-zà -öø-ÿ]{1,63}$/iu',
+ 2 => '/^[\x{002d}0-9a-zÄăąćĉċÄÄđēĕėęěÄğġģĥħĩīÄįıĵķĺļľŀłńņňʼnŋÅÅőœŕŗřśÅšťŧũūÅůűųŵŷźżž]{1,63}$/iu',
+ 3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu',
+ 4 => '/^[\x{002d}0-9a-zÎάÎήίΰαβγδεζηθικλμνξοπÏςστυφχψωϊϋόÏÏŽ]{1,63}$/iu',
+ 5 => '/^[\x{002d}0-9a-zабвгдежзийклмнопрÑтуфхцчшщъыьÑÑŽÑ]{1,63}$/iu',
+ 6 => '/^[\x{002d}0-9a-zá¼€-ἇá¼-ἕἠ-ἧἰ-á¼·á½€-á½…á½-á½—á½ -ὧὰ-ÏŽá¾€-ᾇá¾-á¾—á¾ -ᾧᾰ-ᾴᾶᾷῂῃῄῆῇá¿-Îá¿–á¿—á¿ -ῧῲῳῴῶῷ]{1,63}$/iu'),
'FI' => array(1 => '/^[\x{002d}0-9a-zäåö]{1,63}$/iu'),
'GR' => array(1 => '/^[\x{002d}0-9a-zΆΈΉΊΌΎ-ΡΣ-ÏŽá¼€-ἕἘ-á¼á¼ -ὅὈ-á½á½-ὗὙὛá½á½Ÿ-ώᾀ-ᾴᾶ-ᾼῂῃῄῆ-á¿Œá¿-á¿“á¿–-Ίῠ-Ῥῲῳῴῶ-ῼ]{1,63}$/iu'),
'HK' => 'Zend/Validate/Hostname/Cn.php',
diff --git a/libs/Zend/Validate/PostCode.php b/libs/Zend/Validate/PostCode.php
index 5892009ab5..b6bafe0f93 100644
--- a/libs/Zend/Validate/PostCode.php
+++ b/libs/Zend/Validate/PostCode.php
@@ -16,7 +16,7 @@
* @package Zend_Validate
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: PostCode.php 20532 2010-01-22 20:18:23Z thomas $
+ * @version $Id: PostCode.php 21107 2010-02-19 21:40:22Z thomas $
*/
/**
@@ -193,6 +193,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract
*/
public function isValid($value)
{
+ $this->_setValue($value);
if (!is_string($value) && !is_int($value)) {
$this->_error(self::INVALID);
return false;
diff --git a/libs/Zend/Version.php b/libs/Zend/Version.php
index 3f77a2fd1f..602247666e 100644
--- a/libs/Zend/Version.php
+++ b/libs/Zend/Version.php
@@ -16,7 +16,7 @@
* @package Zend_Version
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Version.php 20999 2010-02-08 21:58:31Z matthew $
+ * @version $Id: Version.php 21181 2010-02-23 22:02:38Z matthew $
*/
/**
@@ -32,7 +32,7 @@ final class Zend_Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '1.10.1';
+ const VERSION = '1.10.2';
/**
* Compare the specified Zend Framework version string $version
--
GitLab