From 485096bb3b444e1b227965e29285498d89b7e536 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 10:15:05 -0400 Subject: [PATCH 01/25] Remove duplicate keys in ini file --- core/configs/database.ini | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/configs/database.ini b/core/configs/database.ini index 73d4a2c18..aed3acd2b 100644 --- a/core/configs/database.ini +++ b/core/configs/database.ini @@ -7,8 +7,6 @@ database.params.port = 3306 database.params.username = root database.params.password = set_your_password database.params.dbname = midas3 -database.params.port = 3306 - [development] database.type=pdo @@ -19,7 +17,6 @@ database.params.port = 3306 database.params.username = root database.params.password = set_your_password database.params.dbname = midas3 -database.params.port = 3306 [testing] database.type=pdo @@ -30,4 +27,3 @@ database.params.port = 3306 database.params.username = root database.params.password = set_your_password database.params.dbname = midas3_test -database.params.port = 3306 From 129f55e6f5fb9b746e119721c7315ec3bd2069d8 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 12:18:13 -0400 Subject: [PATCH 02/25] Fix PDO error when accessing installation page --- core/AppController.php | 2 +- core/Bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/AppController.php b/core/AppController.php index ce16bc6fb..d9d71ecf2 100644 --- a/core/AppController.php +++ b/core/AppController.php @@ -98,7 +98,7 @@ public function preDispatch() $user->setExpirationSeconds(60 * Zend_Registry::get('configGlobal')->session->lifetime); } - if($user->Dao == null) + if($user->Dao == null && $fc->getRequest()->getControllerName() != 'install') { $userModel = MidasLoader::loadModel('User'); $cookieData = $this->getRequest()->getCookie('midasUtil'); diff --git a/core/Bootstrap.php b/core/Bootstrap.php index 04ee4615e..08b52645a 100644 --- a/core/Bootstrap.php +++ b/core/Bootstrap.php @@ -133,7 +133,6 @@ protected function _initConfig() 'message' => 'message', 'datetime' => 'timestamp', 'module' => 'module'); - $writerDb = new Zend_Log_Writer_Db($db, 'errorlog', $columnMapping); if($configGlobal->environment == 'production') { $formatter = new Zend_Log_Formatter_Simple(); @@ -162,6 +161,7 @@ protected function _initConfig() if($configDatabase->database->adapter == 'PDO_MYSQL' && $configDatabase->database->params->password != 'set_your_password') { + $writerDb = new Zend_Log_Writer_Db($db, 'errorlog', $columnMapping); $logger->addWriter($writerDb); $logger->setEventItem('datetime', date('Y-m-d H:i:s')); $logger->setEventItem('module', 'unknown'); From 4eddc188b009ed24e84c220cc01bfadd9afce24b Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 12:19:52 -0400 Subject: [PATCH 03/25] Remove duplicate case in switch statement --- .../controllers/components/ImagemagickComponent.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php b/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php index 08117f579..0cd197562 100644 --- a/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php +++ b/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php @@ -136,7 +136,6 @@ public function createThumbnailFromPath($name, $fullPath, $width, $height, $exac case 'avi': case 'mov': case 'flv': - case 'mp4': case 'rm': // If this is a video, we have to have the file extension, so symlink it if(function_exists('symlink') && symlink($fullPath, $fullPath.'.'.$ext)) From 9cff9fa06a04509c8717fc9e493cca797badd96b Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 12:26:12 -0400 Subject: [PATCH 04/25] Remove duplicate array keys --- core/models/base/BitstreamModelBase.php | 1 - modules/packages/controllers/components/ApiComponent.php | 1 - 2 files changed, 2 deletions(-) diff --git a/core/models/base/BitstreamModelBase.php b/core/models/base/BitstreamModelBase.php index 0fac521f5..32a72f4f0 100644 --- a/core/models/base/BitstreamModelBase.php +++ b/core/models/base/BitstreamModelBase.php @@ -37,7 +37,6 @@ public function __construct() 'sizebytes' => array('type' => MIDAS_DATA), 'checksum' => array('type' => MIDAS_DATA), 'path' => array('type' => MIDAS_DATA), - 'assetstore_id' => array('type' => MIDAS_DATA), 'date' => array('type' => MIDAS_DATA), 'itemrevision' => array('type' => MIDAS_MANY_TO_ONE, 'model' => 'ItemRevision', 'parent_column' => 'itemrevision_id', 'child_column' => 'itemrevision_id'), 'assetstore' => array('type' => MIDAS_MANY_TO_ONE, 'model' => 'Assetstore', 'parent_column' => 'assetstore_id', 'child_column' => 'assetstore_id'), diff --git a/modules/packages/controllers/components/ApiComponent.php b/modules/packages/controllers/components/ApiComponent.php index 7eac558bb..2d00032b5 100644 --- a/modules/packages/controllers/components/ApiComponent.php +++ b/modules/packages/controllers/components/ApiComponent.php @@ -108,7 +108,6 @@ public function extensionList($args) 'repository_url' => $dao->getRepositoryUrl(), 'submissiontype' => $dao->getSubmissiontype(), 'package' => $dao->getPackagetype(), - 'name' => $dao->getItem()->getName(), 'productname' => $dao->getProductname(), 'category' => $dao->getCategory(), 'description' => $dao->getDescription(), From 8ff3d80f2ebba4e072f818b5d4ea1cabb1df5376 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 12:30:56 -0400 Subject: [PATCH 05/25] Remove assignment with left and right sides equal --- modules/scheduler/Notification.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/scheduler/Notification.php b/modules/scheduler/Notification.php index 00ac515fc..98473951d 100644 --- a/modules/scheduler/Notification.php +++ b/modules/scheduler/Notification.php @@ -59,10 +59,6 @@ public function scheduleTask($params) { $params['fire_time'] = date("Y-m-d H:i:s", $params['fire_time']); } - else - { - $params['fire_time'] = $params['fire_time']; - } if(!$params['run_only_once']) { From 4a6b62ce62f0e29ffebfbf00041067456d06ecea Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 13:11:32 -0400 Subject: [PATCH 06/25] Remove redundant closing tags --- core/ApiController.php | 1 - core/Notification.php | 1 - core/constant/api.php | 1 - core/constant/apierror.php | 1 - core/constant/community.php | 1 - core/constant/datatype.php | 2 -- core/constant/error.php | 1 - core/constant/feed.php | 1 - core/constant/folder.php | 1 - core/constant/global.php | 1 - core/constant/group.php | 1 - core/constant/item.php | 2 -- core/constant/metadata.php | 1 - core/constant/notification.php | 2 -- core/constant/policy.php | 1 - core/constant/resourcetype.php | 1 - core/constant/task.php | 1 - core/constant/user.php | 1 - core/controllers/components/ExportComponent.php | 1 - core/controllers/components/UploadComponent.php | 1 - core/controllers/forms/ApikeyForm.php | 1 - core/controllers/forms/AssetstoreForm.php | 1 - core/controllers/forms/CommunityForm.php | 1 - core/controllers/forms/FolderForm.php | 1 - core/controllers/forms/ImportForm.php | 1 - core/controllers/forms/ItemForm.php | 1 - core/controllers/forms/MigrateForm.php | 1 - core/database/upgrade/3.0.1.php | 1 - core/database/upgrade/3.0.10.php | 3 --- core/database/upgrade/3.0.11.php | 3 --- core/database/upgrade/3.0.12.php | 3 --- core/database/upgrade/3.0.13.php | 3 --- core/database/upgrade/3.0.14.php | 3 --- core/database/upgrade/3.0.15.php | 3 --- core/database/upgrade/3.0.16.php | 3 --- core/database/upgrade/3.0.2.php | 1 - core/database/upgrade/3.0.3.php | 1 - core/database/upgrade/3.0.4.php | 1 - core/database/upgrade/3.0.5.php | 1 - core/database/upgrade/3.0.6.php | 2 -- core/database/upgrade/3.0.7.php | 3 --- core/database/upgrade/3.0.8.php | 3 --- core/database/upgrade/3.0.9.php | 3 --- core/database/upgrade/3.1.0.php | 3 --- core/database/upgrade/3.1.1.php | 3 --- core/database/upgrade/3.1.2.php | 3 --- core/database/upgrade/3.1.3.php | 1 - core/database/upgrade/3.1.4.php | 1 - core/database/upgrade/3.2.0.php | 1 - core/database/upgrade/3.2.1.php | 1 - core/database/upgrade/3.2.10.php | 1 - core/database/upgrade/3.2.11.php | 1 - core/database/upgrade/3.2.12.php | 1 - core/database/upgrade/3.2.13.php | 1 - core/database/upgrade/3.2.14.php | 1 - core/database/upgrade/3.2.2.php | 1 - core/database/upgrade/3.2.3.php | 1 - core/database/upgrade/3.2.4.php | 1 - core/database/upgrade/3.2.5.php | 1 - core/database/upgrade/3.2.6.php | 1 - core/database/upgrade/3.2.7.php | 1 - core/database/upgrade/3.2.8.php | 1 - core/database/upgrade/3.2.9.php | 1 - core/include.php | 3 --- core/models/AppDao.php | 2 -- core/models/AppModel.php | 1 - core/models/GlobalDao.php | 1 - core/models/MIDASDatabaseMongo.php | 1 - core/models/MIDASDatabasePdo.php | 1 - core/models/MIDASModuleInstallScript.php | 1 - core/models/MIDASUpgrade.php | 1 - core/models/base/TokenModelBase.php | 1 - core/models/base/UserapiModelBase.php | 1 - core/models/dao/ActivedownloadDao.php | 1 - core/models/dao/AssetstoreDao.php | 1 - core/models/dao/BitstreamDao.php | 1 - core/models/dao/CommunityDao.php | 1 - core/models/dao/CommunityInvitationDao.php | 1 - core/models/dao/ErrorlogDao.php | 1 - core/models/dao/FeedDao.php | 1 - core/models/dao/FeedpolicygroupDao.php | 1 - core/models/dao/FeedpolicyuserDao.php | 1 - core/models/dao/FolderDao.php | 1 - core/models/dao/FolderpolicygroupDao.php | 1 - core/models/dao/FolderpolicyuserDao.php | 1 - core/models/dao/GroupDao.php | 1 - core/models/dao/ItemDao.php | 1 - core/models/dao/ItemRevisionDao.php | 1 - core/models/dao/ItempolicyuserDao.php | 1 - core/models/dao/LicenseDao.php | 1 - core/models/dao/MetadataDao.php | 1 - core/models/dao/NewUserInvitationDao.php | 1 - core/models/dao/PendingUserDao.php | 1 - core/models/dao/ProgressDao.php | 1 - core/models/dao/SettingDao.php | 1 - core/models/dao/TokenDao.php | 1 - core/models/dao/UserDao.php | 1 - core/models/dao/UserapiDao.php | 1 - core/models/pdo/BitstreamModel.php | 1 - core/models/pdo/CommunityInvitationModel.php | 1 - core/models/pdo/ErrorlogModel.php | 1 - core/models/pdo/FeedModel.php | 1 - core/models/pdo/FeedpolicygroupModel.php | 1 - core/models/pdo/FeedpolicyuserModel.php | 1 - core/models/pdo/FolderpolicygroupModel.php | 1 - core/models/pdo/FolderpolicyuserModel.php | 1 - core/models/pdo/GroupModel.php | 1 - core/models/pdo/ItempolicygroupModel.php | 1 - core/models/pdo/ItempolicyuserModel.php | 1 - core/models/pdo/NewUserInvitationModel.php | 2 +- core/models/pdo/PendingUserModel.php | 1 - core/models/pdo/TokenModel.php | 1 - core/models/pdo/UserapiModel.php | 1 - core/models/profiler/ProductionDbProfiler.php | 1 - core/views/index/index.phtml | 1 - modules/api/AppController.php | 1 - modules/api/Notification.php | 1 - modules/api/constant/module.php | 1 - modules/api/controllers/IndexController.php | 1 - modules/api/controllers/JsonController.php | 1 - modules/api/controllers/RestController.php | 1 - modules/api/controllers/forms/ConfigForm.php | 1 - modules/archive/constant/module.php | 2 +- modules/batchmake/AppController.php | 1 - modules/batchmake/Notification.php | 3 --- modules/batchmake/constant/module.php | 3 --- modules/batchmake/controllers/forms/ConfigForm.php | 1 - modules/batchmake/database/upgrade/0.2.0.php | 1 - modules/batchmake/models/dao/CondorDagDao.php | 2 -- modules/batchmake/models/dao/CondorJobDao.php | 2 -- modules/batchmake/models/dao/ItemmetricDao.php | 2 -- modules/batchmake/models/pdo/ItemmetricModel.php | 2 -- modules/cleanup/AppController.php | 1 - modules/cleanup/Notification.php | 2 -- modules/cleanup/constant/module.php | 2 -- modules/cleanup/controllers/forms/ConfigForm.php | 1 - modules/cleanup/models/AppDao.php | 2 -- modules/cleanup/models/AppModel.php | 1 - modules/cleanup/views/index/index.phtml | 1 - modules/comments/AppController.php | 1 - modules/comments/Notification.php | 1 - modules/comments/constant/module.php | 2 -- modules/comments/models/AppDao.php | 2 -- modules/comments/models/AppModel.php | 1 - modules/comments/models/base/ItemcommentModelBase.php | 1 - modules/comments/models/dao/ItemcommentDao.php | 1 - modules/comments/models/pdo/ItemcommentModel.php | 1 - modules/communityagreement/AppController.php | 1 - modules/communityagreement/Notification.php | 1 - modules/communityagreement/constant/module.php | 1 - modules/communityagreement/controllers/forms/ConfigForm.php | 1 - modules/communityagreement/models/AppDao.php | 2 -- modules/communityagreement/models/AppModel.php | 1 - modules/dicomanonymize/AppController.php | 1 - modules/dicomanonymize/constant/module.php | 2 -- modules/dicomextractor/AppController.php | 1 - modules/dicomextractor/constant/module.php | 1 - .../dicomextractor/controllers/components/ApiComponent.php | 2 -- .../controllers/components/ApiitemComponent.php | 2 -- modules/dicomserver/AppController.php | 1 - modules/dicomserver/constant/module.php | 3 +-- modules/dicomserver/controllers/components/ApiComponent.php | 2 -- .../controllers/components/ApiserverComponent.php | 2 -- modules/dicomserver/controllers/forms/ConfigForm.php | 1 - modules/dicomserver/models/AppDao.php | 2 -- modules/dicomserver/models/AppModel.php | 1 - modules/example/AppController.php | 1 - modules/example/constant/module.php | 2 -- modules/example/database/upgrade/1.0.1.php | 1 - modules/example/views/sample/delete.phtml | 2 +- modules/keyfiles/AppController.php | 1 - modules/keyfiles/Notification.php | 2 -- modules/keyfiles/constant/module.php | 2 -- modules/keyfiles/models/AppDao.php | 2 -- modules/keyfiles/models/AppModel.php | 1 - modules/landingpage/models/AppDao.php | 2 -- modules/ldap/AppController.php | 1 - modules/ldap/Notification.php | 1 - modules/ldap/constant/module.php | 2 +- modules/ldap/controllers/forms/ConfigForm.php | 1 - modules/ldap/database/upgrade/1.0.1.php | 1 - modules/ldap/models/AppDao.php | 2 -- modules/ldap/models/AppModel.php | 1 - modules/ldap/models/base/UserModelBase.php | 2 +- modules/metadataextractor/AppController.php | 1 - modules/metadataextractor/Notification.php | 1 - modules/metadataextractor/constant/module.php | 2 -- .../controllers/components/ExtractorComponent.php | 1 - modules/metadataextractor/controllers/forms/ConfigForm.php | 1 - modules/mfa/AppController.php | 1 - modules/mfa/constant/module.php | 1 - modules/mfa/models/AppDao.php | 1 - modules/mfa/models/AppModel.php | 1 - modules/oai/AppController.php | 1 - modules/oai/Notification.php | 1 - modules/oai/constant/module.php | 2 +- modules/oai/controllers/IndexController.php | 1 - modules/oauth/AppController.php | 1 - modules/oauth/Notification.php | 1 - modules/oauth/constant/module.php | 1 - modules/oauth/controllers/AuthorizeController.php | 1 - modules/oauth/controllers/ClientController.php | 1 - modules/oauth/controllers/TokenController.php | 1 - modules/oauth/models/AppDao.php | 2 -- modules/oauth/models/AppModel.php | 1 - modules/oauth/models/base/ClientModelBase.php | 1 - modules/oauth/models/base/CodeModelBase.php | 1 - modules/oauth/models/base/TokenModelBase.php | 1 - modules/oauth/models/dao/ClientDao.php | 1 - modules/oauth/models/dao/CodeDao.php | 1 - modules/oauth/models/dao/TokenDao.php | 1 - modules/oauth/models/pdo/ClientModel.php | 1 - modules/oauth/models/pdo/CodeModel.php | 1 - modules/oauth/models/pdo/TokenModel.php | 1 - modules/packages/AppController.php | 1 - modules/packages/Notification.php | 1 - modules/packages/constant/module.php | 1 - modules/packages/models/AppDao.php | 2 -- modules/pvw/AppController.php | 2 -- modules/pvw/constant/module.php | 2 +- modules/pvw/controllers/ParaviewController.php | 1 - modules/pvw/models/AppDao.php | 2 -- modules/pvw/models/AppModel.php | 1 - modules/pvw/models/base/InstanceModelBase.php | 1 - modules/pvw/models/dao/InstanceDao.php | 1 - modules/pvw/models/pdo/InstanceModel.php | 1 - modules/ratings/AppController.php | 1 - modules/ratings/Notification.php | 2 -- modules/ratings/constant/module.php | 2 -- modules/ratings/controllers/forms/ConfigForm.php | 1 - modules/ratings/models/AppDao.php | 2 -- modules/ratings/models/AppModel.php | 1 - modules/ratings/models/base/ItemratingModelBase.php | 1 - modules/ratings/models/dao/ItemratingDao.php | 1 - modules/ratings/models/pdo/ItemratingModel.php | 2 +- modules/remoteprocessing/AppController.php | 1 - modules/remoteprocessing/Notification.php | 1 - modules/remoteprocessing/constant/module.php | 2 +- modules/remoteprocessing/database/upgrade/1.0.1.php | 1 - modules/remoteprocessing/database/upgrade/1.0.2.php | 1 - modules/remoteprocessing/models/AppDao.php | 2 -- modules/remoteprocessing/models/AppModel.php | 1 - modules/remoteprocessing/views/job/getinitexecutable.phtml | 6 ------ modules/scheduler/AppController.php | 1 - modules/scheduler/Notification.php | 1 - modules/scheduler/constant/module.php | 1 - modules/scheduler/controllers/components/EzcComponent.php | 1 - modules/scheduler/controllers/forms/ConfigForm.php | 1 - modules/scheduler/database/upgrade/1.0.1.php | 1 - modules/scheduler/database/upgrade/1.0.2.php | 1 - modules/scheduler/database/upgrade/1.0.3.php | 1 - modules/scheduler/models/AppDao.php | 2 -- modules/scheduler/models/AppModel.php | 1 - modules/scheduler/models/base/JobLogModelBase.php | 1 - modules/scheduler/models/base/JobModelBase.php | 1 - modules/scheduler/models/dao/JobDao.php | 1 - modules/scheduler/models/dao/JobLogDao.php | 1 - modules/scheduler/models/pdo/JobLogModel.php | 1 - modules/scheduler/models/pdo/JobModel.php | 1 - modules/sizequota/AppController.php | 1 - modules/sizequota/Notification.php | 1 - modules/sizequota/constant/module.php | 2 +- modules/sizequota/controllers/forms/ConfigForm.php | 1 - modules/sizequota/models/AppDao.php | 2 -- modules/sizequota/models/AppModel.php | 1 - modules/sizequota/models/base/FolderQuotaModelBase.php | 1 - modules/solr/AppController.php | 1 - modules/solr/Notification.php | 1 - modules/solr/constant/module.php | 2 -- modules/solr/controllers/forms/ConfigForm.php | 1 - modules/solr/models/AppDao.php | 2 -- modules/solr/models/AppModel.php | 1 - modules/statistics/AppController.php | 1 - modules/statistics/Notification.php | 2 -- modules/statistics/constant/module.php | 2 -- .../statistics/controllers/components/ReportComponent.php | 1 - modules/statistics/controllers/forms/ConfigForm.php | 1 - modules/statistics/database/upgrade/1.0.1.php | 1 - modules/statistics/database/upgrade/1.0.2.php | 1 - modules/statistics/models/AppDao.php | 2 -- modules/statistics/models/AppModel.php | 1 - modules/statistics/models/base/DownloadBase.php | 1 - modules/statistics/models/base/IpLocationModelBase.php | 1 - modules/statistics/models/dao/DownloadDao.php | 1 - modules/statistics/models/dao/IpLocationDao.php | 1 - modules/statistics/models/pdo/DownloadModel.php | 1 - modules/statistics/models/pdo/IpLocationModel.php | 1 - modules/thumbnailcreator/AppController.php | 1 - modules/thumbnailcreator/Notification.php | 1 - modules/thumbnailcreator/constant/module.php | 2 -- modules/thumbnailcreator/controllers/forms/ConfigForm.php | 1 - modules/thumbnailcreator/database/upgrade/1.0.1.php | 1 - modules/thumbnailcreator/database/upgrade/1.0.2.php | 2 +- modules/thumbnailcreator/models/AppDao.php | 2 -- modules/thumbnailcreator/models/AppModel.php | 1 - modules/tracker/AppController.php | 1 - modules/tracker/Notification.php | 1 - modules/tracker/constant/module.php | 1 - modules/tracker/database/upgrade/1.0.1.php | 1 - modules/tracker/database/upgrade/1.0.2.php | 1 - modules/tracker/database/upgrade/1.0.3.php | 1 - modules/tracker/database/upgrade/1.0.4.php | 1 - modules/tracker/models/AppDao.php | 2 -- modules/validation/AppController.php | 1 - modules/validation/Notification.php | 2 -- modules/validation/constant/module.php | 1 - modules/validation/models/AppDao.php | 2 -- modules/visualize/AppController.php | 1 - modules/visualize/constant/module.php | 2 +- modules/visualize/controllers/ImageController.php | 1 - modules/visualize/controllers/IndexController.php | 2 +- modules/visualize/controllers/MediaController.php | 1 - modules/visualize/controllers/ParaviewController.php | 2 -- modules/visualize/controllers/PdfController.php | 1 - modules/visualize/controllers/TxtController.php | 1 - modules/visualize/controllers/WrapperController.php | 1 - modules/visualize/models/AppDao.php | 2 -- modules/visualize/models/AppModel.php | 1 - 318 files changed, 14 insertions(+), 406 deletions(-) diff --git a/core/ApiController.php b/core/ApiController.php index 61a82e075..fface8330 100644 --- a/core/ApiController.php +++ b/core/ApiController.php @@ -217,4 +217,3 @@ public function optionsAction() } } //end class -?> \ No newline at end of file diff --git a/core/Notification.php b/core/Notification.php index 10109ecba..afd815438 100644 --- a/core/Notification.php +++ b/core/Notification.php @@ -97,4 +97,3 @@ public function tokenAuth($params) return $this->Component->Authentication->getUser(array('token' => $token), null); } } //end class -?> diff --git a/core/constant/api.php b/core/constant/api.php index ff916cc13..0198c71b4 100644 --- a/core/constant/api.php +++ b/core/constant/api.php @@ -49,4 +49,3 @@ MIDAS_API_PERMISSION_SCOPE_READ_GROUPS => 'List group membership for communities you own', MIDAS_API_PERMISSION_SCOPE_MANAGE_GROUPS => 'Manage groups for communities you own' )); -?> diff --git a/core/constant/apierror.php b/core/constant/apierror.php index f0c29bff8..b8043a3b0 100644 --- a/core/constant/apierror.php +++ b/core/constant/apierror.php @@ -28,4 +28,3 @@ define('MIDAS_INVALID_PARAMETER', -150); define('MIDAS_INVALID_POLICY', -151); define('MIDAS_HTTP_ERROR', -153); -?> diff --git a/core/constant/community.php b/core/constant/community.php index fa77d39d9..403b32ea2 100644 --- a/core/constant/community.php +++ b/core/constant/community.php @@ -22,4 +22,3 @@ define("MIDAS_COMMUNITY_PRIVATE", 1); define("MIDAS_COMMUNITY_CAN_JOIN", 1); define("MIDAS_COMMUNITY_INVITATION_ONLY", 0); -?> \ No newline at end of file diff --git a/core/constant/datatype.php b/core/constant/datatype.php index b48b1258c..a23071d3f 100644 --- a/core/constant/datatype.php +++ b/core/constant/datatype.php @@ -30,5 +30,3 @@ define("MIDAS_MANY_TO_ONE", 1003); define("MIDAS_ONE_TO_ONE", 1004); define("MIDAS_MANY_TO_MANY", 1005); - -?> \ No newline at end of file diff --git a/core/constant/error.php b/core/constant/error.php index aa0758e1c..660a97f1c 100644 --- a/core/constant/error.php +++ b/core/constant/error.php @@ -21,4 +21,3 @@ define("MIDAS_PRIORITY_INFO", 6); define("MIDAS_PRIORITY_CRITICAL", 2); define("MIDAS_PRIORITY_WARNING", 4); -?> \ No newline at end of file diff --git a/core/constant/feed.php b/core/constant/feed.php index 0e894c4fe..058c97a2c 100644 --- a/core/constant/feed.php +++ b/core/constant/feed.php @@ -33,4 +33,3 @@ define("MIDAS_FEED_CREATE_LINK_ITEM", 32); define("MIDAS_FEED_CREATE_REVISION", 40); -?> \ No newline at end of file diff --git a/core/constant/folder.php b/core/constant/folder.php index 9e51be6f4..d1ce03fad 100644 --- a/core/constant/folder.php +++ b/core/constant/folder.php @@ -20,4 +20,3 @@ define("MIDAS_FOLDER_USERPARENT", -1); define("MIDAS_FOLDER_COMMUNITYPARENT", -2); -?> \ No newline at end of file diff --git a/core/constant/global.php b/core/constant/global.php index 53364f940..5c2079a8e 100644 --- a/core/constant/global.php +++ b/core/constant/global.php @@ -44,4 +44,3 @@ { define('DATABASE_CONFIG', BASE_PATH . '/core/configs/database.ini'); } -?> \ No newline at end of file diff --git a/core/constant/group.php b/core/constant/group.php index 0ed9190fd..bd6f8a1f3 100644 --- a/core/constant/group.php +++ b/core/constant/group.php @@ -20,4 +20,3 @@ define("MIDAS_GROUP_ANONYMOUS_KEY", 0); define("MIDAS_GROUP_SERVER_KEY", -1); -?> diff --git a/core/constant/item.php b/core/constant/item.php index 4bd4f9717..2e3d71ed9 100644 --- a/core/constant/item.php +++ b/core/constant/item.php @@ -17,5 +17,3 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ - -?> diff --git a/core/constant/metadata.php b/core/constant/metadata.php index b175e26d4..77bea61da 100644 --- a/core/constant/metadata.php +++ b/core/constant/metadata.php @@ -25,4 +25,3 @@ define("MIDAS_METADATA_BOOLEAN", 4); define("MIDAS_METADATA_LONG", 5); define("MIDAS_METADATA_STRING", 6); -?> diff --git a/core/constant/notification.php b/core/constant/notification.php index f81a392da..a130f45e7 100644 --- a/core/constant/notification.php +++ b/core/constant/notification.php @@ -21,5 +21,3 @@ define("MIDAS_EVENT_PRIORITY_NORMAL",1); define("MIDAS_EVENT_PRIORITY_LOW",0); define("MIDAS_EVENT_PRIORITY_HIGH",2); - -?> diff --git a/core/constant/policy.php b/core/constant/policy.php index 37cffbf20..c3b484f5d 100644 --- a/core/constant/policy.php +++ b/core/constant/policy.php @@ -24,4 +24,3 @@ define("MIDAS_PRIVACY_PUBLIC", 0); define("MIDAS_PRIVACY_PRIVATE", 2); -?> \ No newline at end of file diff --git a/core/constant/resourcetype.php b/core/constant/resourcetype.php index 897eac1b5..ee433ef09 100644 --- a/core/constant/resourcetype.php +++ b/core/constant/resourcetype.php @@ -25,4 +25,3 @@ define("MIDAS_RESOURCE_FOLDER", 4); define("MIDAS_RESOURCE_ASSETSTORE", 5); define("MIDAS_RESOURCE_COMMUNITY", 6); -?> \ No newline at end of file diff --git a/core/constant/task.php b/core/constant/task.php index a21ea394e..f6f717cdf 100644 --- a/core/constant/task.php +++ b/core/constant/task.php @@ -19,4 +19,3 @@ =========================================================================*/ define("MIDAS_TASK_ITEM_THUMBNAIL", 0); -?> \ No newline at end of file diff --git a/core/constant/user.php b/core/constant/user.php index 3c0821b81..f6b5226f6 100644 --- a/core/constant/user.php +++ b/core/constant/user.php @@ -21,4 +21,3 @@ define("MIDAS_USER_PUBLIC", 0); define("MIDAS_USER_PRIVATE", 1); define("MIDAS_MAXIMUM_FOLDER_NUMBERS_PER_LEVEL", 1000); -?> \ No newline at end of file diff --git a/core/controllers/components/ExportComponent.php b/core/controllers/components/ExportComponent.php index 8c8ee64fe..5eb332b1c 100644 --- a/core/controllers/components/ExportComponent.php +++ b/core/controllers/components/ExportComponent.php @@ -191,4 +191,3 @@ function exportBitstreams($userDao, $targetDir, $itemIds, $shouldSymLink) } // end function exportBitstreams } // end class ExportComponent -?> diff --git a/core/controllers/components/UploadComponent.php b/core/controllers/components/UploadComponent.php index 74f1ca038..704ddd4db 100644 --- a/core/controllers/components/UploadComponent.php +++ b/core/controllers/components/UploadComponent.php @@ -407,4 +407,3 @@ public function createNewRevision($userDao, $name, $path, $changes, $itemId, $it return $item; }//end } // end class UploadComponent -?> diff --git a/core/controllers/forms/ApikeyForm.php b/core/controllers/forms/ApikeyForm.php index 800c239fd..0879b8623 100644 --- a/core/controllers/forms/ApikeyForm.php +++ b/core/controllers/forms/ApikeyForm.php @@ -39,4 +39,3 @@ public function createKeyForm() return $form; } } // end class -?> diff --git a/core/controllers/forms/AssetstoreForm.php b/core/controllers/forms/AssetstoreForm.php index e163e0c25..c61e0f759 100644 --- a/core/controllers/forms/AssetstoreForm.php +++ b/core/controllers/forms/AssetstoreForm.php @@ -71,4 +71,3 @@ public function createAssetstoreForm() return $form; } } // end class -?> diff --git a/core/controllers/forms/CommunityForm.php b/core/controllers/forms/CommunityForm.php index 5f5e060dc..5ca1efd32 100644 --- a/core/controllers/forms/CommunityForm.php +++ b/core/controllers/forms/CommunityForm.php @@ -132,4 +132,3 @@ public function createCreateGroupForm() } } // end class -?> diff --git a/core/controllers/forms/FolderForm.php b/core/controllers/forms/FolderForm.php index 539bc1472..b47f76fde 100644 --- a/core/controllers/forms/FolderForm.php +++ b/core/controllers/forms/FolderForm.php @@ -47,4 +47,3 @@ public function createEditForm() } } // end class -?> diff --git a/core/controllers/forms/ImportForm.php b/core/controllers/forms/ImportForm.php index 792de3d89..474d545b6 100644 --- a/core/controllers/forms/ImportForm.php +++ b/core/controllers/forms/ImportForm.php @@ -130,4 +130,3 @@ public function createImportForm($assetstores) return $form; } } // end class -?> diff --git a/core/controllers/forms/ItemForm.php b/core/controllers/forms/ItemForm.php index 84da38ee2..0f15fda65 100644 --- a/core/controllers/forms/ItemForm.php +++ b/core/controllers/forms/ItemForm.php @@ -62,4 +62,3 @@ public function createEditBitstreamForm() } } // end class -?> diff --git a/core/controllers/forms/MigrateForm.php b/core/controllers/forms/MigrateForm.php index dcd719286..d156ca8f6 100644 --- a/core/controllers/forms/MigrateForm.php +++ b/core/controllers/forms/MigrateForm.php @@ -102,4 +102,3 @@ public function createMigrateForm($assetstores) return $form; } } // end class -?> diff --git a/core/database/upgrade/3.0.1.php b/core/database/upgrade/3.0.1.php index 9edfdfacc..f9dba2a47 100644 --- a/core/database/upgrade/3.0.1.php +++ b/core/database/upgrade/3.0.1.php @@ -62,4 +62,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.0.10.php b/core/database/upgrade/3.0.10.php index cff1c662d..8f60b76d3 100644 --- a/core/database/upgrade/3.0.10.php +++ b/core/database/upgrade/3.0.10.php @@ -43,6 +43,3 @@ public function postUpgrade() } } -?> - - diff --git a/core/database/upgrade/3.0.11.php b/core/database/upgrade/3.0.11.php index e23506b60..920490499 100644 --- a/core/database/upgrade/3.0.11.php +++ b/core/database/upgrade/3.0.11.php @@ -56,6 +56,3 @@ public function postUpgrade() } } -?> - - diff --git a/core/database/upgrade/3.0.12.php b/core/database/upgrade/3.0.12.php index 6bf50f59a..8aa843035 100644 --- a/core/database/upgrade/3.0.12.php +++ b/core/database/upgrade/3.0.12.php @@ -48,6 +48,3 @@ public function postUpgrade() } } -?> - - diff --git a/core/database/upgrade/3.0.13.php b/core/database/upgrade/3.0.13.php index 0ccf5af4c..726132a08 100644 --- a/core/database/upgrade/3.0.13.php +++ b/core/database/upgrade/3.0.13.php @@ -45,6 +45,3 @@ public function postUpgrade() { } } -?> - - diff --git a/core/database/upgrade/3.0.14.php b/core/database/upgrade/3.0.14.php index 703b9a3e6..ef38fa604 100644 --- a/core/database/upgrade/3.0.14.php +++ b/core/database/upgrade/3.0.14.php @@ -52,6 +52,3 @@ public function postUpgrade() { } } -?> - - diff --git a/core/database/upgrade/3.0.15.php b/core/database/upgrade/3.0.15.php index c0989ddbd..6c872c27f 100644 --- a/core/database/upgrade/3.0.15.php +++ b/core/database/upgrade/3.0.15.php @@ -41,6 +41,3 @@ public function postUpgrade() $this->addTableField('user', 'biography', 'varchar(255)', ' character varying(255)', null); } } -?> - - diff --git a/core/database/upgrade/3.0.16.php b/core/database/upgrade/3.0.16.php index b5d2ca4a5..dcc3bdb27 100644 --- a/core/database/upgrade/3.0.16.php +++ b/core/database/upgrade/3.0.16.php @@ -41,6 +41,3 @@ public function postUpgrade() $this->addTableField('folder', 'date_creation', 'timestamp', 'timestamp without time zone', false); } } -?> - - diff --git a/core/database/upgrade/3.0.2.php b/core/database/upgrade/3.0.2.php index 510f1cc37..72b16d1bc 100644 --- a/core/database/upgrade/3.0.2.php +++ b/core/database/upgrade/3.0.2.php @@ -42,4 +42,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.0.3.php b/core/database/upgrade/3.0.3.php index 48cca6c9b..fcbf0c3a8 100644 --- a/core/database/upgrade/3.0.3.php +++ b/core/database/upgrade/3.0.3.php @@ -42,4 +42,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.0.4.php b/core/database/upgrade/3.0.4.php index 311dd1c41..08ad72ce4 100644 --- a/core/database/upgrade/3.0.4.php +++ b/core/database/upgrade/3.0.4.php @@ -42,4 +42,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.0.5.php b/core/database/upgrade/3.0.5.php index 27c502088..e97b54386 100644 --- a/core/database/upgrade/3.0.5.php +++ b/core/database/upgrade/3.0.5.php @@ -50,4 +50,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.0.6.php b/core/database/upgrade/3.0.6.php index 021df4eb9..b018d764f 100644 --- a/core/database/upgrade/3.0.6.php +++ b/core/database/upgrade/3.0.6.php @@ -47,5 +47,3 @@ public function postUpgrade() } } -?> - diff --git a/core/database/upgrade/3.0.7.php b/core/database/upgrade/3.0.7.php index b4a59c523..9d41d77fd 100644 --- a/core/database/upgrade/3.0.7.php +++ b/core/database/upgrade/3.0.7.php @@ -42,6 +42,3 @@ public function postUpgrade() } } -?> - - diff --git a/core/database/upgrade/3.0.8.php b/core/database/upgrade/3.0.8.php index 5c591340a..462616246 100644 --- a/core/database/upgrade/3.0.8.php +++ b/core/database/upgrade/3.0.8.php @@ -46,6 +46,3 @@ public function postUpgrade() } } -?> - - diff --git a/core/database/upgrade/3.0.9.php b/core/database/upgrade/3.0.9.php index 6077f2fa4..56f9dbfd4 100644 --- a/core/database/upgrade/3.0.9.php +++ b/core/database/upgrade/3.0.9.php @@ -56,6 +56,3 @@ public function postUpgrade() } } -?> - - diff --git a/core/database/upgrade/3.1.0.php b/core/database/upgrade/3.1.0.php index 018334c6d..6b9340a75 100644 --- a/core/database/upgrade/3.1.0.php +++ b/core/database/upgrade/3.1.0.php @@ -38,6 +38,3 @@ public function postUpgrade() { } } -?> - - diff --git a/core/database/upgrade/3.1.1.php b/core/database/upgrade/3.1.1.php index c953901b3..5200991e2 100644 --- a/core/database/upgrade/3.1.1.php +++ b/core/database/upgrade/3.1.1.php @@ -41,6 +41,3 @@ public function postUpgrade() { } } -?> - - diff --git a/core/database/upgrade/3.1.2.php b/core/database/upgrade/3.1.2.php index c72e4d7f6..b615dc34a 100644 --- a/core/database/upgrade/3.1.2.php +++ b/core/database/upgrade/3.1.2.php @@ -37,6 +37,3 @@ public function postUpgrade() $this->addTableField('user', 'dynamichelp', 'tinyint(4)', ' integer', 1); } } -?> - - diff --git a/core/database/upgrade/3.1.3.php b/core/database/upgrade/3.1.3.php index 3b6fc4abd..da466fb64 100644 --- a/core/database/upgrade/3.1.3.php +++ b/core/database/upgrade/3.1.3.php @@ -41,4 +41,3 @@ public function postUpgrade() { } } -?> \ No newline at end of file diff --git a/core/database/upgrade/3.1.4.php b/core/database/upgrade/3.1.4.php index 8a1eac12a..800468b2b 100644 --- a/core/database/upgrade/3.1.4.php +++ b/core/database/upgrade/3.1.4.php @@ -34,4 +34,3 @@ public function postUpgrade() { } } -?> \ No newline at end of file diff --git a/core/database/upgrade/3.2.0.php b/core/database/upgrade/3.2.0.php index bf78d443d..befb3d42e 100644 --- a/core/database/upgrade/3.2.0.php +++ b/core/database/upgrade/3.2.0.php @@ -18,4 +18,3 @@ public function postUpgrade() { } } -?> diff --git a/core/database/upgrade/3.2.1.php b/core/database/upgrade/3.2.1.php index 7d3f96a0c..231d79341 100644 --- a/core/database/upgrade/3.2.1.php +++ b/core/database/upgrade/3.2.1.php @@ -23,4 +23,3 @@ public function postUpgrade() $settingModel->setConfig('adminuser', $id); } } -?> diff --git a/core/database/upgrade/3.2.10.php b/core/database/upgrade/3.2.10.php index 01c082d0d..8c5128357 100644 --- a/core/database/upgrade/3.2.10.php +++ b/core/database/upgrade/3.2.10.php @@ -63,4 +63,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.2.11.php b/core/database/upgrade/3.2.11.php index a60439744..6ae0a7342 100644 --- a/core/database/upgrade/3.2.11.php +++ b/core/database/upgrade/3.2.11.php @@ -32,4 +32,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.2.12.php b/core/database/upgrade/3.2.12.php index 2a0426f1f..51b32a3bd 100644 --- a/core/database/upgrade/3.2.12.php +++ b/core/database/upgrade/3.2.12.php @@ -77,4 +77,3 @@ private function _movePasswords() } } -?> diff --git a/core/database/upgrade/3.2.13.php b/core/database/upgrade/3.2.13.php index 170cd63c1..686dfbf89 100644 --- a/core/database/upgrade/3.2.13.php +++ b/core/database/upgrade/3.2.13.php @@ -82,4 +82,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.2.14.php b/core/database/upgrade/3.2.14.php index 6f928e077..c6e537d84 100644 --- a/core/database/upgrade/3.2.14.php +++ b/core/database/upgrade/3.2.14.php @@ -34,4 +34,3 @@ public function postUpgrade() { } } -?> diff --git a/core/database/upgrade/3.2.2.php b/core/database/upgrade/3.2.2.php index dc91f9f50..3080729f6 100644 --- a/core/database/upgrade/3.2.2.php +++ b/core/database/upgrade/3.2.2.php @@ -189,4 +189,3 @@ public function postUpgrade() { } } -?> diff --git a/core/database/upgrade/3.2.3.php b/core/database/upgrade/3.2.3.php index c9daec6a6..3309d3308 100644 --- a/core/database/upgrade/3.2.3.php +++ b/core/database/upgrade/3.2.3.php @@ -24,4 +24,3 @@ public function postUpgrade() { } } -?> diff --git a/core/database/upgrade/3.2.4.php b/core/database/upgrade/3.2.4.php index 7f5a8a15e..399a42469 100644 --- a/core/database/upgrade/3.2.4.php +++ b/core/database/upgrade/3.2.4.php @@ -37,4 +37,3 @@ public function postUpgrade() { } } -?> diff --git a/core/database/upgrade/3.2.5.php b/core/database/upgrade/3.2.5.php index 6819a7cee..1dabe9ae0 100644 --- a/core/database/upgrade/3.2.5.php +++ b/core/database/upgrade/3.2.5.php @@ -28,4 +28,3 @@ public function postUpgrade() { } } -?> diff --git a/core/database/upgrade/3.2.6.php b/core/database/upgrade/3.2.6.php index b6293706f..b7b61a0d7 100644 --- a/core/database/upgrade/3.2.6.php +++ b/core/database/upgrade/3.2.6.php @@ -78,4 +78,3 @@ private function _moveThumbnailToAssetstore($thumbnail) } -?> diff --git a/core/database/upgrade/3.2.7.php b/core/database/upgrade/3.2.7.php index 3d97fc839..d305156bf 100644 --- a/core/database/upgrade/3.2.7.php +++ b/core/database/upgrade/3.2.7.php @@ -40,4 +40,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.2.8.php b/core/database/upgrade/3.2.8.php index 7948c250e..ad878a231 100644 --- a/core/database/upgrade/3.2.8.php +++ b/core/database/upgrade/3.2.8.php @@ -23,4 +23,3 @@ public function postUpgrade() } } -?> diff --git a/core/database/upgrade/3.2.9.php b/core/database/upgrade/3.2.9.php index e0611b14e..e69edc111 100644 --- a/core/database/upgrade/3.2.9.php +++ b/core/database/upgrade/3.2.9.php @@ -27,4 +27,3 @@ public function postUpgrade() } } -?> diff --git a/core/include.php b/core/include.php index ab35f4ede..7fb962668 100644 --- a/core/include.php +++ b/core/include.php @@ -58,6 +58,3 @@ include_once BASE_PATH.'/core/constant/resourcetype.php'; include_once BASE_PATH.'/core/constant/task.php'; include_once BASE_PATH.'/core/constant/api.php'; - - -?> diff --git a/core/models/AppDao.php b/core/models/AppDao.php index deb37a83e..f90a822a2 100644 --- a/core/models/AppDao.php +++ b/core/models/AppDao.php @@ -26,5 +26,3 @@ class AppDao extends MIDAS_GlobalDao { } //end class - -?> diff --git a/core/models/AppModel.php b/core/models/AppModel.php index 878a13649..3b566547f 100644 --- a/core/models/AppModel.php +++ b/core/models/AppModel.php @@ -25,4 +25,3 @@ class AppModel extends MIDASModel { } -?> diff --git a/core/models/GlobalDao.php b/core/models/GlobalDao.php index 277311816..36507de34 100644 --- a/core/models/GlobalDao.php +++ b/core/models/GlobalDao.php @@ -279,4 +279,3 @@ private function _getRealName($var) } }// end class -?> diff --git a/core/models/MIDASDatabaseMongo.php b/core/models/MIDASDatabaseMongo.php index d8e61d856..4092f75c3 100644 --- a/core/models/MIDASDatabaseMongo.php +++ b/core/models/MIDASDatabaseMongo.php @@ -339,4 +339,3 @@ function multigetMongo($columnfamily, $keys, $columns = null, $column_start = "" } // end getMongo() } // end class MIDASDatabaseMongo -?> diff --git a/core/models/MIDASDatabasePdo.php b/core/models/MIDASDatabasePdo.php index f152ed02c..b9de0d58a 100644 --- a/core/models/MIDASDatabasePdo.php +++ b/core/models/MIDASDatabasePdo.php @@ -404,4 +404,3 @@ public function getCountAll() }//end getCountAll } //end class MIDASDatabasePdo -?> diff --git a/core/models/MIDASModuleInstallScript.php b/core/models/MIDASModuleInstallScript.php index 0ad4207d9..e5ebf1c38 100644 --- a/core/models/MIDASModuleInstallScript.php +++ b/core/models/MIDASModuleInstallScript.php @@ -52,4 +52,3 @@ public function postInstall() } } //end class MIDASModuleInstallScript -?> diff --git a/core/models/MIDASUpgrade.php b/core/models/MIDASUpgrade.php index 5709caae0..bdb20184b 100644 --- a/core/models/MIDASUpgrade.php +++ b/core/models/MIDASUpgrade.php @@ -377,4 +377,3 @@ function removeTablePrimaryKey($table) } } //end class MIDASUpgrade -?> diff --git a/core/models/base/TokenModelBase.php b/core/models/base/TokenModelBase.php index cea2a2343..a6d64fe57 100644 --- a/core/models/base/TokenModelBase.php +++ b/core/models/base/TokenModelBase.php @@ -39,4 +39,3 @@ public function __construct() abstract function cleanExpired(); } // end class AssetstoreModelBase -?> diff --git a/core/models/base/UserapiModelBase.php b/core/models/base/UserapiModelBase.php index 70edb79a6..2b44850ed 100644 --- a/core/models/base/UserapiModelBase.php +++ b/core/models/base/UserapiModelBase.php @@ -109,4 +109,3 @@ function createKey($userDao, $applicationname, $tokenexperiationtime) } } -?> diff --git a/core/models/dao/ActivedownloadDao.php b/core/models/dao/ActivedownloadDao.php index ab34d5722..b04095bbd 100644 --- a/core/models/dao/ActivedownloadDao.php +++ b/core/models/dao/ActivedownloadDao.php @@ -25,4 +25,3 @@ class ActivedownloadDao extends AppDao { public $_model = 'Activedownload'; } // end class -?> diff --git a/core/models/dao/AssetstoreDao.php b/core/models/dao/AssetstoreDao.php index aa99f1c79..07642f62b 100644 --- a/core/models/dao/AssetstoreDao.php +++ b/core/models/dao/AssetstoreDao.php @@ -26,4 +26,3 @@ class AssetstoreDao extends AppDao { public $_model = 'Assetstore'; } // end class -?> diff --git a/core/models/dao/BitstreamDao.php b/core/models/dao/BitstreamDao.php index d9fb3062d..97e097ff2 100644 --- a/core/models/dao/BitstreamDao.php +++ b/core/models/dao/BitstreamDao.php @@ -59,4 +59,3 @@ function getFullPath() } // end class -?> diff --git a/core/models/dao/CommunityDao.php b/core/models/dao/CommunityDao.php index 9cc47fe70..05c580233 100644 --- a/core/models/dao/CommunityDao.php +++ b/core/models/dao/CommunityDao.php @@ -27,4 +27,3 @@ class CommunityDao extends AppDao public $_model = 'Community'; } -?> diff --git a/core/models/dao/CommunityInvitationDao.php b/core/models/dao/CommunityInvitationDao.php index cac7abb0d..eb5f66224 100644 --- a/core/models/dao/CommunityInvitationDao.php +++ b/core/models/dao/CommunityInvitationDao.php @@ -28,4 +28,3 @@ class CommunityInvitationDao extends AppDao } // end class -?> diff --git a/core/models/dao/ErrorlogDao.php b/core/models/dao/ErrorlogDao.php index 385396367..d4edca1b6 100644 --- a/core/models/dao/ErrorlogDao.php +++ b/core/models/dao/ErrorlogDao.php @@ -25,4 +25,3 @@ class ErrorlogDao extends AppDao { public $_model = 'Errorlog'; } // end class -?> diff --git a/core/models/dao/FeedDao.php b/core/models/dao/FeedDao.php index 319fdea4f..49f766d57 100644 --- a/core/models/dao/FeedDao.php +++ b/core/models/dao/FeedDao.php @@ -63,4 +63,3 @@ public function getRessource() } } } // end class -?> diff --git a/core/models/dao/FeedpolicygroupDao.php b/core/models/dao/FeedpolicygroupDao.php index a3b915737..1495c602b 100644 --- a/core/models/dao/FeedpolicygroupDao.php +++ b/core/models/dao/FeedpolicygroupDao.php @@ -26,4 +26,3 @@ class FeedpolicygroupDao extends AppDao { public $_model = 'Feedpolicygroup'; } -?> diff --git a/core/models/dao/FeedpolicyuserDao.php b/core/models/dao/FeedpolicyuserDao.php index 377eb02f5..389bf5569 100644 --- a/core/models/dao/FeedpolicyuserDao.php +++ b/core/models/dao/FeedpolicyuserDao.php @@ -26,4 +26,3 @@ class FeedpolicyuserDao extends AppDao { public $_model = 'Feedpolicyuser'; } -?> diff --git a/core/models/dao/FolderDao.php b/core/models/dao/FolderDao.php index 1f28d5f71..a2cb67252 100644 --- a/core/models/dao/FolderDao.php +++ b/core/models/dao/FolderDao.php @@ -27,4 +27,3 @@ class FolderDao extends AppDao public $_model = 'Folder'; } // end class -?> diff --git a/core/models/dao/FolderpolicygroupDao.php b/core/models/dao/FolderpolicygroupDao.php index 921513878..727b47300 100644 --- a/core/models/dao/FolderpolicygroupDao.php +++ b/core/models/dao/FolderpolicygroupDao.php @@ -26,4 +26,3 @@ class FolderpolicygroupDao extends AppDao { public $_model = 'Folderpolicygroup'; } -?> diff --git a/core/models/dao/FolderpolicyuserDao.php b/core/models/dao/FolderpolicyuserDao.php index 7f99272ca..172821a2b 100644 --- a/core/models/dao/FolderpolicyuserDao.php +++ b/core/models/dao/FolderpolicyuserDao.php @@ -26,4 +26,3 @@ class FolderpolicyuserDao extends AppDao { public $_model = 'Folderpolicyuser'; } -?> diff --git a/core/models/dao/GroupDao.php b/core/models/dao/GroupDao.php index b246b74b5..2ed595dd7 100644 --- a/core/models/dao/GroupDao.php +++ b/core/models/dao/GroupDao.php @@ -26,4 +26,3 @@ class GroupDao extends AppDao { public $_model = 'Group'; } // end class -?> diff --git a/core/models/dao/ItemDao.php b/core/models/dao/ItemDao.php index d34f6fbbe..1744fdc8a 100644 --- a/core/models/dao/ItemDao.php +++ b/core/models/dao/ItemDao.php @@ -26,4 +26,3 @@ class ItemDao extends AppDao { public $_model = 'Item'; } -?> diff --git a/core/models/dao/ItemRevisionDao.php b/core/models/dao/ItemRevisionDao.php index d6195e44d..85bb909da 100644 --- a/core/models/dao/ItemRevisionDao.php +++ b/core/models/dao/ItemRevisionDao.php @@ -26,4 +26,3 @@ class ItemRevisionDao extends AppDao { public $_model = 'ItemRevision'; } -?> diff --git a/core/models/dao/ItempolicyuserDao.php b/core/models/dao/ItempolicyuserDao.php index 26a256b40..05b453cb7 100644 --- a/core/models/dao/ItempolicyuserDao.php +++ b/core/models/dao/ItempolicyuserDao.php @@ -26,4 +26,3 @@ class ItempolicyuserDao extends AppDao { public $_model = 'Itempolicyuser'; } -?> diff --git a/core/models/dao/LicenseDao.php b/core/models/dao/LicenseDao.php index 97cb18df6..e18e00452 100644 --- a/core/models/dao/LicenseDao.php +++ b/core/models/dao/LicenseDao.php @@ -25,4 +25,3 @@ class LicenseDao extends AppDao { public $_model = 'License'; } -?> diff --git a/core/models/dao/MetadataDao.php b/core/models/dao/MetadataDao.php index b8dea478a..9cde0d88b 100644 --- a/core/models/dao/MetadataDao.php +++ b/core/models/dao/MetadataDao.php @@ -27,4 +27,3 @@ class MetadataDao extends AppDao public $_model = 'Metadata'; } // end class -?> diff --git a/core/models/dao/NewUserInvitationDao.php b/core/models/dao/NewUserInvitationDao.php index 79512044d..c5b3a65b9 100644 --- a/core/models/dao/NewUserInvitationDao.php +++ b/core/models/dao/NewUserInvitationDao.php @@ -25,4 +25,3 @@ class NewUserInvitationDao extends AppDao { public $_model = 'NewUserInvitation'; } -?> diff --git a/core/models/dao/PendingUserDao.php b/core/models/dao/PendingUserDao.php index 41413119e..aca999f4b 100644 --- a/core/models/dao/PendingUserDao.php +++ b/core/models/dao/PendingUserDao.php @@ -25,4 +25,3 @@ class PendingUserDao extends AppDao { public $_model = 'PendingUser'; } -?> diff --git a/core/models/dao/ProgressDao.php b/core/models/dao/ProgressDao.php index 2e223e194..07fe80570 100644 --- a/core/models/dao/ProgressDao.php +++ b/core/models/dao/ProgressDao.php @@ -26,4 +26,3 @@ class ProgressDao extends AppDao { public $_model = 'Progress'; } -?> diff --git a/core/models/dao/SettingDao.php b/core/models/dao/SettingDao.php index b421e0d9f..b5d608c4c 100644 --- a/core/models/dao/SettingDao.php +++ b/core/models/dao/SettingDao.php @@ -18,4 +18,3 @@ class SettingDao extends AppDao { public $_model = 'Setting'; } -?> diff --git a/core/models/dao/TokenDao.php b/core/models/dao/TokenDao.php index 0d85a0f07..3d5ed2a83 100644 --- a/core/models/dao/TokenDao.php +++ b/core/models/dao/TokenDao.php @@ -22,4 +22,3 @@ class TokenDao extends AppDao { public $_model = 'Token'; } -?> diff --git a/core/models/dao/UserDao.php b/core/models/dao/UserDao.php index 5374475bd..d2113f900 100644 --- a/core/models/dao/UserDao.php +++ b/core/models/dao/UserDao.php @@ -52,4 +52,3 @@ public function toArray() return $return; } } -?> diff --git a/core/models/dao/UserapiDao.php b/core/models/dao/UserapiDao.php index a181003ef..6fbd6a902 100644 --- a/core/models/dao/UserapiDao.php +++ b/core/models/dao/UserapiDao.php @@ -22,4 +22,3 @@ class UserapiDao extends AppDao { public $_model = 'Userapi'; } -?> diff --git a/core/models/pdo/BitstreamModel.php b/core/models/pdo/BitstreamModel.php index 51d24f203..b87a1b41e 100644 --- a/core/models/pdo/BitstreamModel.php +++ b/core/models/pdo/BitstreamModel.php @@ -130,4 +130,3 @@ function removeOrphans($progressDao = null) } } } -?> diff --git a/core/models/pdo/CommunityInvitationModel.php b/core/models/pdo/CommunityInvitationModel.php index c11db4967..c0f7f7082 100644 --- a/core/models/pdo/CommunityInvitationModel.php +++ b/core/models/pdo/CommunityInvitationModel.php @@ -28,4 +28,3 @@ class CommunityInvitationModel extends CommunityInvitationModelBase { } // end class -?> diff --git a/core/models/pdo/ErrorlogModel.php b/core/models/pdo/ErrorlogModel.php index ef32015e3..bd009da84 100644 --- a/core/models/pdo/ErrorlogModel.php +++ b/core/models/pdo/ErrorlogModel.php @@ -100,4 +100,3 @@ function countSince($startDate, $priorities = null) return 0; } } // end class -?> diff --git a/core/models/pdo/FeedModel.php b/core/models/pdo/FeedModel.php index ef43b0dc0..a26e415a2 100644 --- a/core/models/pdo/FeedModel.php +++ b/core/models/pdo/FeedModel.php @@ -276,4 +276,3 @@ function delete($feedDao) } // end delete } // end class -?> diff --git a/core/models/pdo/FeedpolicygroupModel.php b/core/models/pdo/FeedpolicygroupModel.php index cf4a2cfc0..78f06ca67 100644 --- a/core/models/pdo/FeedpolicygroupModel.php +++ b/core/models/pdo/FeedpolicygroupModel.php @@ -58,4 +58,3 @@ public function deleteGroupPolicies($group) } } // end class -?> diff --git a/core/models/pdo/FeedpolicyuserModel.php b/core/models/pdo/FeedpolicyuserModel.php index 6f5ddc62e..e77c3e170 100644 --- a/core/models/pdo/FeedpolicyuserModel.php +++ b/core/models/pdo/FeedpolicyuserModel.php @@ -43,4 +43,3 @@ public function getPolicy($user, $feed) } // end getPolicy } // end class -?> diff --git a/core/models/pdo/FolderpolicygroupModel.php b/core/models/pdo/FolderpolicygroupModel.php index 8c3bac853..b03a99ebf 100644 --- a/core/models/pdo/FolderpolicygroupModel.php +++ b/core/models/pdo/FolderpolicygroupModel.php @@ -77,4 +77,3 @@ public function deleteGroupPolicies($group) Zend_Registry::get('dbAdapter')->delete($this->_name, $clause); } } -?> diff --git a/core/models/pdo/FolderpolicyuserModel.php b/core/models/pdo/FolderpolicyuserModel.php index b3358919d..f3afc3736 100644 --- a/core/models/pdo/FolderpolicyuserModel.php +++ b/core/models/pdo/FolderpolicyuserModel.php @@ -45,4 +45,3 @@ public function getPolicy($user, $folder) )); } } // end class FolderpolicyuserModel -?> diff --git a/core/models/pdo/GroupModel.php b/core/models/pdo/GroupModel.php index efeb828e5..9d0ab3db7 100644 --- a/core/models/pdo/GroupModel.php +++ b/core/models/pdo/GroupModel.php @@ -120,4 +120,3 @@ function getGroupFromSearch($search, $limit = 14) return $return; } // end getCommunitiesFromSearch() }// end class -?> diff --git a/core/models/pdo/ItempolicygroupModel.php b/core/models/pdo/ItempolicygroupModel.php index 3cacef7ec..34ec96426 100644 --- a/core/models/pdo/ItempolicygroupModel.php +++ b/core/models/pdo/ItempolicygroupModel.php @@ -79,4 +79,3 @@ public function deleteGroupPolicies($group) } } // end class -?> diff --git a/core/models/pdo/ItempolicyuserModel.php b/core/models/pdo/ItempolicyuserModel.php index 2ac68432d..f28c70ec5 100644 --- a/core/models/pdo/ItempolicyuserModel.php +++ b/core/models/pdo/ItempolicyuserModel.php @@ -43,4 +43,3 @@ public function getPolicy($user, $item) return $this->initDao('Itempolicyuser', $this->database->fetchRow($this->database->select()->where('item_id = ?', $item->getKey())->where('user_id = ?', $user->getKey()))); } } -?> diff --git a/core/models/pdo/NewUserInvitationModel.php b/core/models/pdo/NewUserInvitationModel.php index dc2aca9fc..ea2bb2a44 100644 --- a/core/models/pdo/NewUserInvitationModel.php +++ b/core/models/pdo/NewUserInvitationModel.php @@ -88,4 +88,4 @@ public function deleteByCommunity($community) Zend_Registry::get('dbAdapter')->delete($this->_name, 'community_id = '.$community->getKey()); } } -?> + diff --git a/core/models/pdo/PendingUserModel.php b/core/models/pdo/PendingUserModel.php index 12162b9a6..2a2b5b0e5 100644 --- a/core/models/pdo/PendingUserModel.php +++ b/core/models/pdo/PendingUserModel.php @@ -62,4 +62,3 @@ public function getAllByParams($params) return $daos; } } -?> diff --git a/core/models/pdo/TokenModel.php b/core/models/pdo/TokenModel.php index b1bbba912..d6835c9ca 100644 --- a/core/models/pdo/TokenModel.php +++ b/core/models/pdo/TokenModel.php @@ -35,4 +35,3 @@ function cleanExpired() } } } -?> diff --git a/core/models/pdo/UserapiModel.php b/core/models/pdo/UserapiModel.php index 9248c8f06..a9dd99f46 100644 --- a/core/models/pdo/UserapiModel.php +++ b/core/models/pdo/UserapiModel.php @@ -191,4 +191,3 @@ function getByUser($userDao) return $return; } } -?> diff --git a/core/models/profiler/ProductionDbProfiler.php b/core/models/profiler/ProductionDbProfiler.php index 41df289eb..5f0875df3 100644 --- a/core/models/profiler/ProductionDbProfiler.php +++ b/core/models/profiler/ProductionDbProfiler.php @@ -55,4 +55,3 @@ public function getLastQueryProfile() return parent::getLastQueryProfile(); } } -?> diff --git a/core/views/index/index.phtml b/core/views/index/index.phtml index 8b6d2c31d..1cdbc8ca3 100644 --- a/core/views/index/index.phtml +++ b/core/views/index/index.phtml @@ -9,4 +9,3 @@ This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -?> \ No newline at end of file diff --git a/modules/api/AppController.php b/modules/api/AppController.php index dff323667..2f20e7743 100644 --- a/modules/api/AppController.php +++ b/modules/api/AppController.php @@ -23,4 +23,3 @@ class Api_AppController extends MIDAS_GlobalModule { public $moduleName = 'api'; } //end class -?> \ No newline at end of file diff --git a/modules/api/Notification.php b/modules/api/Notification.php index 45db9d8ac..42d4e6ee9 100644 --- a/modules/api/Notification.php +++ b/modules/api/Notification.php @@ -33,4 +33,3 @@ public function init() }//end init } //end class -?> diff --git a/modules/api/constant/module.php b/modules/api/constant/module.php index 367384cde..99269964c 100644 --- a/modules/api/constant/module.php +++ b/modules/api/constant/module.php @@ -19,4 +19,3 @@ =========================================================================*/ // refer to core/constant/api.php -?> diff --git a/modules/api/controllers/IndexController.php b/modules/api/controllers/IndexController.php index 83ac3d4ad..160681be7 100644 --- a/modules/api/controllers/IndexController.php +++ b/modules/api/controllers/IndexController.php @@ -190,4 +190,3 @@ function redirect($url) $this->_redirect($url); } } // end class -?> diff --git a/modules/api/controllers/JsonController.php b/modules/api/controllers/JsonController.php index 0817fb417..ecaa58f00 100644 --- a/modules/api/controllers/JsonController.php +++ b/modules/api/controllers/JsonController.php @@ -29,4 +29,3 @@ function preDispatch() parent::preDispatch(); } } // end class -?> diff --git a/modules/api/controllers/RestController.php b/modules/api/controllers/RestController.php index 46afd72cd..53499c521 100644 --- a/modules/api/controllers/RestController.php +++ b/modules/api/controllers/RestController.php @@ -29,4 +29,3 @@ function preDispatch() parent::preDispatch(); } } // end class -?> diff --git a/modules/api/controllers/forms/ConfigForm.php b/modules/api/controllers/forms/ConfigForm.php index 6d5870040..eb4ab151c 100644 --- a/modules/api/controllers/forms/ConfigForm.php +++ b/modules/api/controllers/forms/ConfigForm.php @@ -39,4 +39,3 @@ public function createConfigForm() } } // end class -?> diff --git a/modules/archive/constant/module.php b/modules/archive/constant/module.php index bc23ea22a..a33e0b450 100644 --- a/modules/archive/constant/module.php +++ b/modules/archive/constant/module.php @@ -17,5 +17,5 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + //define("MIDAS_EXAMPLE", 0); -?> diff --git a/modules/batchmake/AppController.php b/modules/batchmake/AppController.php index 115598178..b36a512f1 100644 --- a/modules/batchmake/AppController.php +++ b/modules/batchmake/AppController.php @@ -23,4 +23,3 @@ class Batchmake_AppController extends MIDAS_GlobalModule public $moduleName='batchmake'; } //end class -?> \ No newline at end of file diff --git a/modules/batchmake/Notification.php b/modules/batchmake/Notification.php index 421e60caf..fc3011b8d 100644 --- a/modules/batchmake/Notification.php +++ b/modules/batchmake/Notification.php @@ -63,6 +63,3 @@ public function getLeftLink() } } //end class - - -?> diff --git a/modules/batchmake/constant/module.php b/modules/batchmake/constant/module.php index c101fd2cd..7a1708817 100644 --- a/modules/batchmake/constant/module.php +++ b/modules/batchmake/constant/module.php @@ -115,6 +115,3 @@ // properties for the batchmake execution view define("MIDAS_BATCHMAKE_AVAILABLE_SCRIPTS",'Batchmake Scripts'); define("MIDAS_BATCHMAKE_EDIT_CONFIG",'edit Batchmake configuration'); - - -?> diff --git a/modules/batchmake/controllers/forms/ConfigForm.php b/modules/batchmake/controllers/forms/ConfigForm.php index cd8fe5fa3..7613a1ab2 100644 --- a/modules/batchmake/controllers/forms/ConfigForm.php +++ b/modules/batchmake/controllers/forms/ConfigForm.php @@ -53,4 +53,3 @@ public function createConfigForm($configPropertiesRequirements) return $form; } } // end class -?> diff --git a/modules/batchmake/database/upgrade/0.2.0.php b/modules/batchmake/database/upgrade/0.2.0.php index 42fe69b22..5c085ed65 100644 --- a/modules/batchmake/database/upgrade/0.2.0.php +++ b/modules/batchmake/database/upgrade/0.2.0.php @@ -47,4 +47,3 @@ public function postUpgrade() } } -?> diff --git a/modules/batchmake/models/dao/CondorDagDao.php b/modules/batchmake/models/dao/CondorDagDao.php index 5be8bb616..ea02995c1 100644 --- a/modules/batchmake/models/dao/CondorDagDao.php +++ b/modules/batchmake/models/dao/CondorDagDao.php @@ -16,5 +16,3 @@ class Batchmake_CondorDagDao extends AppDao { public $_module = 'batchmake'; } - -?> diff --git a/modules/batchmake/models/dao/CondorJobDao.php b/modules/batchmake/models/dao/CondorJobDao.php index c2a3cb258..b82b6ae7b 100644 --- a/modules/batchmake/models/dao/CondorJobDao.php +++ b/modules/batchmake/models/dao/CondorJobDao.php @@ -16,5 +16,3 @@ class Batchmake_CondorJobDao extends AppDao { public $_module = 'batchmake'; } - -?> diff --git a/modules/batchmake/models/dao/ItemmetricDao.php b/modules/batchmake/models/dao/ItemmetricDao.php index 7a4da4833..e3649182b 100644 --- a/modules/batchmake/models/dao/ItemmetricDao.php +++ b/modules/batchmake/models/dao/ItemmetricDao.php @@ -24,5 +24,3 @@ class Batchmake_ItemmetricDao extends AppDao { public $_module = 'batchmake'; } - -?> diff --git a/modules/batchmake/models/pdo/ItemmetricModel.php b/modules/batchmake/models/pdo/ItemmetricModel.php index fd43cce29..ec7ba4a1d 100644 --- a/modules/batchmake/models/pdo/ItemmetricModel.php +++ b/modules/batchmake/models/pdo/ItemmetricModel.php @@ -33,5 +33,3 @@ public function getAll() } - -?> diff --git a/modules/cleanup/AppController.php b/modules/cleanup/AppController.php index 6eb9b6f35..4bd68b477 100644 --- a/modules/cleanup/AppController.php +++ b/modules/cleanup/AppController.php @@ -15,4 +15,3 @@ class Cleanup_AppController extends MIDAS_GlobalModule { public $moduleName = 'cleanup'; } //end class -?> diff --git a/modules/cleanup/Notification.php b/modules/cleanup/Notification.php index 1dfb301c0..550e5e765 100644 --- a/modules/cleanup/Notification.php +++ b/modules/cleanup/Notification.php @@ -80,5 +80,3 @@ private function _cleanupRecursive($dir, $cutoff, &$log) } } } //end class -?> - diff --git a/modules/cleanup/constant/module.php b/modules/cleanup/constant/module.php index 4f4b757b6..1cdbc8ca3 100644 --- a/modules/cleanup/constant/module.php +++ b/modules/cleanup/constant/module.php @@ -9,5 +9,3 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ - -?> diff --git a/modules/cleanup/controllers/forms/ConfigForm.php b/modules/cleanup/controllers/forms/ConfigForm.php index f35ec122e..f5fd3fce7 100644 --- a/modules/cleanup/controllers/forms/ConfigForm.php +++ b/modules/cleanup/controllers/forms/ConfigForm.php @@ -21,4 +21,3 @@ public function createConfigForm() } } // end class -?> diff --git a/modules/cleanup/models/AppDao.php b/modules/cleanup/models/AppDao.php index d453bf70e..419f4f588 100644 --- a/modules/cleanup/models/AppDao.php +++ b/modules/cleanup/models/AppDao.php @@ -5,5 +5,3 @@ class Cleanup_AppDao extends MIDAS_GlobalDao { public $_module = 'cleanup'; } //end class - -?> diff --git a/modules/cleanup/models/AppModel.php b/modules/cleanup/models/AppModel.php index 6bc77a59f..5072286ed 100644 --- a/modules/cleanup/models/AppModel.php +++ b/modules/cleanup/models/AppModel.php @@ -15,4 +15,3 @@ class Cleanup_AppModel extends MIDASModel { public $moduleName = 'cleanup'; } -?> diff --git a/modules/cleanup/views/index/index.phtml b/modules/cleanup/views/index/index.phtml index 89f70bc97..116f8412f 100644 --- a/modules/cleanup/views/index/index.phtml +++ b/modules/cleanup/views/index/index.phtml @@ -12,4 +12,3 @@ PURPOSE. See the above copyright notices for more information. $this->headScript()->appendFile($this->coreWebroot.'/public/js/jquery/jquery.form.js'); $this->headScript()->appendFile($this->moduleWebroot.'/public/js/config/config.index.js'); -?> diff --git a/modules/comments/AppController.php b/modules/comments/AppController.php index 73a0e7c24..beabb5190 100644 --- a/modules/comments/AppController.php +++ b/modules/comments/AppController.php @@ -15,4 +15,3 @@ class Comments_AppController extends MIDAS_GlobalModule { public $moduleName = 'comments'; } //end class -?> diff --git a/modules/comments/Notification.php b/modules/comments/Notification.php index a07f341c7..d120260d3 100644 --- a/modules/comments/Notification.php +++ b/modules/comments/Notification.php @@ -73,4 +73,3 @@ public function handleItemDeleted($params) $itemCommentModel->deleteByItem($params['item']); } } -?> diff --git a/modules/comments/constant/module.php b/modules/comments/constant/module.php index 4f4b757b6..1cdbc8ca3 100644 --- a/modules/comments/constant/module.php +++ b/modules/comments/constant/module.php @@ -9,5 +9,3 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ - -?> diff --git a/modules/comments/models/AppDao.php b/modules/comments/models/AppDao.php index d88544cc9..ddaa67dbc 100644 --- a/modules/comments/models/AppDao.php +++ b/modules/comments/models/AppDao.php @@ -5,5 +5,3 @@ class Comments_AppDao extends MIDAS_GlobalDao { public $_module = 'comments'; } //end class - -?> diff --git a/modules/comments/models/AppModel.php b/modules/comments/models/AppModel.php index b8a3218c9..aaad49ff4 100644 --- a/modules/comments/models/AppModel.php +++ b/modules/comments/models/AppModel.php @@ -15,4 +15,3 @@ class Comments_AppModel extends MIDASModel { public $moduleName = 'comments'; } -?> diff --git a/modules/comments/models/base/ItemcommentModelBase.php b/modules/comments/models/base/ItemcommentModelBase.php index 8c21c88a4..184031c69 100644 --- a/modules/comments/models/base/ItemcommentModelBase.php +++ b/modules/comments/models/base/ItemcommentModelBase.php @@ -60,4 +60,3 @@ public function addComment($user, $item, $comment) Zend_Registry::get('notifier')->callback('CALLBACK_COMMENTS_ADDED_COMMENT', array('comment' => $commentDao)); } } -?> diff --git a/modules/comments/models/dao/ItemcommentDao.php b/modules/comments/models/dao/ItemcommentDao.php index 2c0791630..14c4bebb2 100644 --- a/modules/comments/models/dao/ItemcommentDao.php +++ b/modules/comments/models/dao/ItemcommentDao.php @@ -23,4 +23,3 @@ class Comments_ItemcommentDao extends Comments_AppDao public $_model = 'Itemcomment'; public $_module = 'comments'; } -?> diff --git a/modules/comments/models/pdo/ItemcommentModel.php b/modules/comments/models/pdo/ItemcommentModel.php index 897a19506..ad5d5c25f 100644 --- a/modules/comments/models/pdo/ItemcommentModel.php +++ b/modules/comments/models/pdo/ItemcommentModel.php @@ -70,4 +70,3 @@ public function getTotal($item) return $row['count']; } } -?> diff --git a/modules/communityagreement/AppController.php b/modules/communityagreement/AppController.php index f68b61f35..09f9d4921 100644 --- a/modules/communityagreement/AppController.php +++ b/modules/communityagreement/AppController.php @@ -34,4 +34,3 @@ class Communityagreement_AppController extends MIDAS_GlobalModule */ var $Communityagreement_Agreement; } //end class -?> \ No newline at end of file diff --git a/modules/communityagreement/Notification.php b/modules/communityagreement/Notification.php index ad74144a3..e49237e2d 100644 --- a/modules/communityagreement/Notification.php +++ b/modules/communityagreement/Notification.php @@ -79,4 +79,3 @@ public function getCommunityViewExtraHtml($params) } } //end class -?> diff --git a/modules/communityagreement/constant/module.php b/modules/communityagreement/constant/module.php index a659f7e5d..19e3be084 100644 --- a/modules/communityagreement/constant/module.php +++ b/modules/communityagreement/constant/module.php @@ -20,4 +20,3 @@ define("MIDAS_COMMUNITYAGREEMENT_AGREEMENT_IS_EMPTY", 0); define("MIDAS_COMMUNITYAGREEMENT_AGREEMENT_NOT_EMPTY", 1); -?> \ No newline at end of file diff --git a/modules/communityagreement/controllers/forms/ConfigForm.php b/modules/communityagreement/controllers/forms/ConfigForm.php index 93e324a4b..dbccb9298 100644 --- a/modules/communityagreement/controllers/forms/ConfigForm.php +++ b/modules/communityagreement/controllers/forms/ConfigForm.php @@ -49,4 +49,3 @@ public function createCreateAgreementForm($community_id) } } // end class -?> diff --git a/modules/communityagreement/models/AppDao.php b/modules/communityagreement/models/AppDao.php index 6aae1f61c..50210f243 100644 --- a/modules/communityagreement/models/AppDao.php +++ b/modules/communityagreement/models/AppDao.php @@ -27,5 +27,3 @@ class Communityagreement_AppDao extends MIDAS_GlobalDao { public $moduleName='communityagreement'; } //end class - -?> \ No newline at end of file diff --git a/modules/communityagreement/models/AppModel.php b/modules/communityagreement/models/AppModel.php index a14c7f2a4..f0f20e64c 100644 --- a/modules/communityagreement/models/AppModel.php +++ b/modules/communityagreement/models/AppModel.php @@ -28,4 +28,3 @@ class Communityagreement_AppModel extends MIDASModel { public $moduleName='communityagreement'; } -?> \ No newline at end of file diff --git a/modules/dicomanonymize/AppController.php b/modules/dicomanonymize/AppController.php index 0ec63c11a..f9c1fa0e8 100644 --- a/modules/dicomanonymize/AppController.php +++ b/modules/dicomanonymize/AppController.php @@ -15,4 +15,3 @@ class Dicomanonymize_AppController extends MIDAS_GlobalModule { public $moduleName = 'dicomanonymize'; } //end class -?> diff --git a/modules/dicomanonymize/constant/module.php b/modules/dicomanonymize/constant/module.php index 4f4b757b6..1cdbc8ca3 100644 --- a/modules/dicomanonymize/constant/module.php +++ b/modules/dicomanonymize/constant/module.php @@ -9,5 +9,3 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ - -?> diff --git a/modules/dicomextractor/AppController.php b/modules/dicomextractor/AppController.php index fdddd3868..f26852887 100644 --- a/modules/dicomextractor/AppController.php +++ b/modules/dicomextractor/AppController.php @@ -14,4 +14,3 @@ class Dicomextractor_AppController extends MIDAS_GlobalModule { public $moduleName='dicomextractor'; } //end class -?> diff --git a/modules/dicomextractor/constant/module.php b/modules/dicomextractor/constant/module.php index bede21c5e..1cdbc8ca3 100644 --- a/modules/dicomextractor/constant/module.php +++ b/modules/dicomextractor/constant/module.php @@ -9,4 +9,3 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -?> diff --git a/modules/dicomextractor/controllers/components/ApiComponent.php b/modules/dicomextractor/controllers/components/ApiComponent.php index 0669c1a5d..04551286a 100644 --- a/modules/dicomextractor/controllers/components/ApiComponent.php +++ b/modules/dicomextractor/controllers/components/ApiComponent.php @@ -38,5 +38,3 @@ function extract($args) } } - -?> diff --git a/modules/dicomextractor/controllers/components/ApiitemComponent.php b/modules/dicomextractor/controllers/components/ApiitemComponent.php index 2831423bf..6f2d6480a 100644 --- a/modules/dicomextractor/controllers/components/ApiitemComponent.php +++ b/modules/dicomextractor/controllers/components/ApiitemComponent.php @@ -47,5 +47,3 @@ function extract($args) } } - -?> diff --git a/modules/dicomserver/AppController.php b/modules/dicomserver/AppController.php index 6072d99c7..fdeb92873 100644 --- a/modules/dicomserver/AppController.php +++ b/modules/dicomserver/AppController.php @@ -14,4 +14,3 @@ class Dicomserver_AppController extends MIDAS_GlobalModule { public $moduleName='dicomserver'; } //end class -?> diff --git a/modules/dicomserver/constant/module.php b/modules/dicomserver/constant/module.php index 1f233811b..dc7466eb5 100644 --- a/modules/dicomserver/constant/module.php +++ b/modules/dicomserver/constant/module.php @@ -15,10 +15,9 @@ define("MIDAS_DICOM_DCMQRSCP_IS_RUNNING", 2); define("MIDAS_DICOM_SERVER_NOT_RUNNING", 0); define("MIDAS_DICOM_SERVER_NOT_SUPPORTED", -1); + // default subdirectories and files define("LOG_DIR", "/logs"); define("PROCESSING_DIR", "/processing"); define("PACS_DIR", "/pacs"); define("DCMQRSCP_CFG_FILE", "/dcmqrscp_midas.cfg"); - -?> diff --git a/modules/dicomserver/controllers/components/ApiComponent.php b/modules/dicomserver/controllers/components/ApiComponent.php index 96cccb5d4..431188702 100644 --- a/modules/dicomserver/controllers/components/ApiComponent.php +++ b/modules/dicomserver/controllers/components/ApiComponent.php @@ -88,5 +88,3 @@ function registrationStatus($args) return $this->_callModuleApiMethod($args, 'registrationStatus', 'server'); } } - -?> diff --git a/modules/dicomserver/controllers/components/ApiserverComponent.php b/modules/dicomserver/controllers/components/ApiserverComponent.php index 493991bb6..d5b54e801 100644 --- a/modules/dicomserver/controllers/components/ApiserverComponent.php +++ b/modules/dicomserver/controllers/components/ApiserverComponent.php @@ -410,5 +410,3 @@ function registrationStatus($args) } } } - -?> diff --git a/modules/dicomserver/controllers/forms/ConfigForm.php b/modules/dicomserver/controllers/forms/ConfigForm.php index def0301aa..2c63ba6a2 100644 --- a/modules/dicomserver/controllers/forms/ConfigForm.php +++ b/modules/dicomserver/controllers/forms/ConfigForm.php @@ -46,4 +46,3 @@ public function createConfigForm() } } // end class -?> \ No newline at end of file diff --git a/modules/dicomserver/models/AppDao.php b/modules/dicomserver/models/AppDao.php index ea30d8101..daab62972 100644 --- a/modules/dicomserver/models/AppDao.php +++ b/modules/dicomserver/models/AppDao.php @@ -22,5 +22,3 @@ class Dicomserver_AppDao extends MIDAS_GlobalDao { public $moduleName='dicomserver'; } //end class - -?> diff --git a/modules/dicomserver/models/AppModel.php b/modules/dicomserver/models/AppModel.php index beb100e0f..9a7611d7a 100644 --- a/modules/dicomserver/models/AppModel.php +++ b/modules/dicomserver/models/AppModel.php @@ -23,4 +23,3 @@ class Dicomserver_AppModel extends MIDASModel public $moduleName = 'dicomserver'; } -?> diff --git a/modules/example/AppController.php b/modules/example/AppController.php index a47740998..24bab6917 100644 --- a/modules/example/AppController.php +++ b/modules/example/AppController.php @@ -23,4 +23,3 @@ class Example_AppController extends MIDAS_GlobalModule { public $moduleName='example'; } //end class -?> diff --git a/modules/example/constant/module.php b/modules/example/constant/module.php index da3193d0f..a33e0b450 100644 --- a/modules/example/constant/module.php +++ b/modules/example/constant/module.php @@ -19,5 +19,3 @@ =========================================================================*/ //define("MIDAS_EXAMPLE", 0); - -?> diff --git a/modules/example/database/upgrade/1.0.1.php b/modules/example/database/upgrade/1.0.1.php index f017459a5..4abac63fe 100644 --- a/modules/example/database/upgrade/1.0.1.php +++ b/modules/example/database/upgrade/1.0.1.php @@ -40,4 +40,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/example/views/sample/delete.phtml b/modules/example/views/sample/delete.phtml index bede21c5e..9f18f12ef 100644 --- a/modules/example/views/sample/delete.phtml +++ b/modules/example/views/sample/delete.phtml @@ -9,4 +9,4 @@ This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -?> + diff --git a/modules/keyfiles/AppController.php b/modules/keyfiles/AppController.php index 3c18ad84f..a35eb07a9 100644 --- a/modules/keyfiles/AppController.php +++ b/modules/keyfiles/AppController.php @@ -15,4 +15,3 @@ class Keyfiles_AppController extends MIDAS_GlobalModule { public $moduleName = 'keyfiles'; } //end class -?> diff --git a/modules/keyfiles/Notification.php b/modules/keyfiles/Notification.php index 4cea70b66..9a74c641b 100644 --- a/modules/keyfiles/Notification.php +++ b/modules/keyfiles/Notification.php @@ -49,5 +49,3 @@ public function getFooter() return ''; } } //end class -?> - diff --git a/modules/keyfiles/constant/module.php b/modules/keyfiles/constant/module.php index 4f4b757b6..1cdbc8ca3 100644 --- a/modules/keyfiles/constant/module.php +++ b/modules/keyfiles/constant/module.php @@ -9,5 +9,3 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ - -?> diff --git a/modules/keyfiles/models/AppDao.php b/modules/keyfiles/models/AppDao.php index 8af7c9d0c..2609d9775 100644 --- a/modules/keyfiles/models/AppDao.php +++ b/modules/keyfiles/models/AppDao.php @@ -5,5 +5,3 @@ class Keyfiles_AppDao extends MIDAS_GlobalDao { public $_module = 'keyfiles'; } //end class - -?> diff --git a/modules/keyfiles/models/AppModel.php b/modules/keyfiles/models/AppModel.php index b048c13d2..73aed7ef1 100644 --- a/modules/keyfiles/models/AppModel.php +++ b/modules/keyfiles/models/AppModel.php @@ -15,4 +15,3 @@ class Keyfiles_AppModel extends MIDASModel { public $moduleName = 'keyfiles'; } -?> diff --git a/modules/landingpage/models/AppDao.php b/modules/landingpage/models/AppDao.php index e21c89612..84069cc3c 100644 --- a/modules/landingpage/models/AppDao.php +++ b/modules/landingpage/models/AppDao.php @@ -22,5 +22,3 @@ class Landingpage_AppDao extends MIDAS_GlobalDao { public $moduleName='landingpage'; } //end class - -?> diff --git a/modules/ldap/AppController.php b/modules/ldap/AppController.php index ccbe57626..fb0023b8e 100644 --- a/modules/ldap/AppController.php +++ b/modules/ldap/AppController.php @@ -23,4 +23,3 @@ class Ldap_AppController extends MIDAS_GlobalModule { public $moduleName = 'ldap'; } //end class -?> diff --git a/modules/ldap/Notification.php b/modules/ldap/Notification.php index bb140ce7e..287f1bb8c 100644 --- a/modules/ldap/Notification.php +++ b/modules/ldap/Notification.php @@ -389,4 +389,3 @@ static function eatWarnings($errno, $errstr, $errfile, $errline) return true; } } //end class -?> diff --git a/modules/ldap/constant/module.php b/modules/ldap/constant/module.php index bc23ea22a..a33e0b450 100644 --- a/modules/ldap/constant/module.php +++ b/modules/ldap/constant/module.php @@ -17,5 +17,5 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + //define("MIDAS_EXAMPLE", 0); -?> diff --git a/modules/ldap/controllers/forms/ConfigForm.php b/modules/ldap/controllers/forms/ConfigForm.php index 79ddd85d9..944099128 100644 --- a/modules/ldap/controllers/forms/ConfigForm.php +++ b/modules/ldap/controllers/forms/ConfigForm.php @@ -93,4 +93,3 @@ public function createConfigForm() return $form; } } // end class -?> diff --git a/modules/ldap/database/upgrade/1.0.1.php b/modules/ldap/database/upgrade/1.0.1.php index 0072adc84..2ba03280c 100644 --- a/modules/ldap/database/upgrade/1.0.1.php +++ b/modules/ldap/database/upgrade/1.0.1.php @@ -36,4 +36,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/ldap/models/AppDao.php b/modules/ldap/models/AppDao.php index fe730263d..207482aa2 100644 --- a/modules/ldap/models/AppDao.php +++ b/modules/ldap/models/AppDao.php @@ -23,5 +23,3 @@ class Ldap_AppDao extends MIDAS_GlobalDao { public $moduleName = 'ldap'; } //end class - -?> diff --git a/modules/ldap/models/AppModel.php b/modules/ldap/models/AppModel.php index 6a1d0c8d2..473ae8035 100644 --- a/modules/ldap/models/AppModel.php +++ b/modules/ldap/models/AppModel.php @@ -23,4 +23,3 @@ class Ldap_AppModel extends MIDASModel { public $moduleName = 'ldap'; } -?> diff --git a/modules/ldap/models/base/UserModelBase.php b/modules/ldap/models/base/UserModelBase.php index 936cbf025..a9ad82763 100644 --- a/modules/ldap/models/base/UserModelBase.php +++ b/modules/ldap/models/base/UserModelBase.php @@ -67,4 +67,4 @@ public function createLdapUser($ldapLogin, $email, $password, $firstName, $lastN return $ldapUserDao; } } -?> + diff --git a/modules/metadataextractor/AppController.php b/modules/metadataextractor/AppController.php index 833ad64ff..4337163f9 100644 --- a/modules/metadataextractor/AppController.php +++ b/modules/metadataextractor/AppController.php @@ -33,4 +33,3 @@ class Metadataextractor_AppController extends MIDAS_GlobalModule { public $moduleName='metadataextractor'; } //end class -?> \ No newline at end of file diff --git a/modules/metadataextractor/Notification.php b/modules/metadataextractor/Notification.php index d9128fcb6..192bad5a5 100644 --- a/modules/metadataextractor/Notification.php +++ b/modules/metadataextractor/Notification.php @@ -37,4 +37,3 @@ public function extractMetaData($params) return; } } //end class -?> \ No newline at end of file diff --git a/modules/metadataextractor/constant/module.php b/modules/metadataextractor/constant/module.php index 4bd4f9717..2e3d71ed9 100644 --- a/modules/metadataextractor/constant/module.php +++ b/modules/metadataextractor/constant/module.php @@ -17,5 +17,3 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ - -?> diff --git a/modules/metadataextractor/controllers/components/ExtractorComponent.php b/modules/metadataextractor/controllers/components/ExtractorComponent.php index 07f477283..36286cbf9 100644 --- a/modules/metadataextractor/controllers/components/ExtractorComponent.php +++ b/modules/metadataextractor/controllers/components/ExtractorComponent.php @@ -97,4 +97,3 @@ public function extract($revision) } } // end class -?> diff --git a/modules/metadataextractor/controllers/forms/ConfigForm.php b/modules/metadataextractor/controllers/forms/ConfigForm.php index 40b02a3e7..0f70bd300 100644 --- a/modules/metadataextractor/controllers/forms/ConfigForm.php +++ b/modules/metadataextractor/controllers/forms/ConfigForm.php @@ -38,4 +38,3 @@ public function createConfigForm() } } // end class -?> \ No newline at end of file diff --git a/modules/mfa/AppController.php b/modules/mfa/AppController.php index d082e8da9..7cd1f59da 100644 --- a/modules/mfa/AppController.php +++ b/modules/mfa/AppController.php @@ -22,4 +22,3 @@ class Mfa_AppController extends MIDAS_GlobalModule { public $moduleName = 'mfa'; } //end class -?> diff --git a/modules/mfa/constant/module.php b/modules/mfa/constant/module.php index d321cf1d0..2488e9efd 100644 --- a/modules/mfa/constant/module.php +++ b/modules/mfa/constant/module.php @@ -22,4 +22,3 @@ define('MIDAS_MFA_OATH_HOTP', 'oath_hotp'); define('MIDAS_MFA_RSA_SECURID', 'rsa_securid'); define('MIDAS_MFA_RADIUS', 'radiusauth'); -?> diff --git a/modules/mfa/models/AppDao.php b/modules/mfa/models/AppDao.php index bc4767bf5..c8383f707 100644 --- a/modules/mfa/models/AppDao.php +++ b/modules/mfa/models/AppDao.php @@ -23,4 +23,3 @@ class Mfa_AppDao extends MIDAS_GlobalDao { public $moduleName = 'mfa'; } -?> diff --git a/modules/mfa/models/AppModel.php b/modules/mfa/models/AppModel.php index 585ebbdf6..e9d8379f3 100644 --- a/modules/mfa/models/AppModel.php +++ b/modules/mfa/models/AppModel.php @@ -23,4 +23,3 @@ class Mfa_AppModel extends MIDASModel { public $moduleName = 'mfa'; } -?> diff --git a/modules/oai/AppController.php b/modules/oai/AppController.php index ce800cd9d..c8b893360 100644 --- a/modules/oai/AppController.php +++ b/modules/oai/AppController.php @@ -22,4 +22,3 @@ class Oai_AppController extends MIDAS_GlobalModule { public $moduleName='oai'; } //end class -?> \ No newline at end of file diff --git a/modules/oai/Notification.php b/modules/oai/Notification.php index e66767bd3..054e0f00c 100644 --- a/modules/oai/Notification.php +++ b/modules/oai/Notification.php @@ -28,4 +28,3 @@ public function init() }//end init } //end class -?> \ No newline at end of file diff --git a/modules/oai/constant/module.php b/modules/oai/constant/module.php index bc23ea22a..a33e0b450 100644 --- a/modules/oai/constant/module.php +++ b/modules/oai/constant/module.php @@ -17,5 +17,5 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + //define("MIDAS_EXAMPLE", 0); -?> diff --git a/modules/oai/controllers/IndexController.php b/modules/oai/controllers/IndexController.php index e3ef32c14..0d9a35768 100644 --- a/modules/oai/controllers/IndexController.php +++ b/modules/oai/controllers/IndexController.php @@ -251,4 +251,3 @@ function indexAction() } } // end class -?> diff --git a/modules/oauth/AppController.php b/modules/oauth/AppController.php index 729047e19..35c526b93 100644 --- a/modules/oauth/AppController.php +++ b/modules/oauth/AppController.php @@ -23,4 +23,3 @@ class Oauth_AppController extends MIDAS_GlobalModule { public $moduleName = 'oauth'; } //end class -?> diff --git a/modules/oauth/Notification.php b/modules/oauth/Notification.php index 832ae1853..015d99b55 100644 --- a/modules/oauth/Notification.php +++ b/modules/oauth/Notification.php @@ -104,4 +104,3 @@ public function getUserTabs($params) return array('OAuth' => $moduleWebroot.'/client?userId='.$user->getKey()); } } //end class -?> diff --git a/modules/oauth/constant/module.php b/modules/oauth/constant/module.php index ec25a0342..eacf05c86 100644 --- a/modules/oauth/constant/module.php +++ b/modules/oauth/constant/module.php @@ -21,4 +21,3 @@ // List of token types to be stored in the oauth_token table define('MIDAS_OAUTH_TOKEN_TYPE_ACCESS', 0); define('MIDAS_OAUTH_TOKEN_TYPE_REFRESH', 1); -?> diff --git a/modules/oauth/controllers/AuthorizeController.php b/modules/oauth/controllers/AuthorizeController.php index 47d598ee8..d5c705c5e 100644 --- a/modules/oauth/controllers/AuthorizeController.php +++ b/modules/oauth/controllers/AuthorizeController.php @@ -181,4 +181,3 @@ function submitAction() } } } // end class -?> diff --git a/modules/oauth/controllers/ClientController.php b/modules/oauth/controllers/ClientController.php index 08592569a..953b6f512 100644 --- a/modules/oauth/controllers/ClientController.php +++ b/modules/oauth/controllers/ClientController.php @@ -129,4 +129,3 @@ function deleteAction() echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Client deleted')); } } // end class -?> diff --git a/modules/oauth/controllers/TokenController.php b/modules/oauth/controllers/TokenController.php index 71b665ca1..ea189a915 100644 --- a/modules/oauth/controllers/TokenController.php +++ b/modules/oauth/controllers/TokenController.php @@ -235,4 +235,3 @@ private function _doOutput($array) echo JsonComponent::encode($array); } } // end class -?> diff --git a/modules/oauth/models/AppDao.php b/modules/oauth/models/AppDao.php index 9f6a05c2f..da3a0add7 100644 --- a/modules/oauth/models/AppDao.php +++ b/modules/oauth/models/AppDao.php @@ -22,5 +22,3 @@ class Oauth_AppDao extends MIDAS_GlobalDao { } //end class - -?> diff --git a/modules/oauth/models/AppModel.php b/modules/oauth/models/AppModel.php index d9c276cd5..0c19993b9 100644 --- a/modules/oauth/models/AppModel.php +++ b/modules/oauth/models/AppModel.php @@ -23,4 +23,3 @@ class Oauth_AppModel extends MIDASModel { public $moduleName = 'oauth'; } -?> diff --git a/modules/oauth/models/base/ClientModelBase.php b/modules/oauth/models/base/ClientModelBase.php index aa5581004..cba9ac763 100644 --- a/modules/oauth/models/base/ClientModelBase.php +++ b/modules/oauth/models/base/ClientModelBase.php @@ -92,4 +92,3 @@ public function delete($clientDao) parent::delete($clientDao); } } -?> diff --git a/modules/oauth/models/base/CodeModelBase.php b/modules/oauth/models/base/CodeModelBase.php index a583e476a..007566244 100644 --- a/modules/oauth/models/base/CodeModelBase.php +++ b/modules/oauth/models/base/CodeModelBase.php @@ -79,4 +79,3 @@ public function create($userDao, $clientDao, $scopes) return $codeDao; } } -?> diff --git a/modules/oauth/models/base/TokenModelBase.php b/modules/oauth/models/base/TokenModelBase.php index 9eb294cbd..f9a3cf1ef 100644 --- a/modules/oauth/models/base/TokenModelBase.php +++ b/modules/oauth/models/base/TokenModelBase.php @@ -93,4 +93,3 @@ private function _createToken($fromDao, $type, $expire = null) return $tokenDao; } } -?> diff --git a/modules/oauth/models/dao/ClientDao.php b/modules/oauth/models/dao/ClientDao.php index 9651390ff..f0ddd5771 100644 --- a/modules/oauth/models/dao/ClientDao.php +++ b/modules/oauth/models/dao/ClientDao.php @@ -23,4 +23,3 @@ class Oauth_ClientDao extends AppDao public $_model = 'Client'; public $_module = 'oauth'; } -?> diff --git a/modules/oauth/models/dao/CodeDao.php b/modules/oauth/models/dao/CodeDao.php index c3159f694..57be55875 100644 --- a/modules/oauth/models/dao/CodeDao.php +++ b/modules/oauth/models/dao/CodeDao.php @@ -31,4 +31,3 @@ public function isExpired() return time() > strtotime($this->getExpirationDate()); } } -?> diff --git a/modules/oauth/models/dao/TokenDao.php b/modules/oauth/models/dao/TokenDao.php index e8e31ef47..47ce94a52 100644 --- a/modules/oauth/models/dao/TokenDao.php +++ b/modules/oauth/models/dao/TokenDao.php @@ -31,4 +31,3 @@ public function isExpired() return time() > strtotime($this->getExpirationDate()); } } -?> diff --git a/modules/oauth/models/pdo/ClientModel.php b/modules/oauth/models/pdo/ClientModel.php index 368506a52..8c3c6541a 100644 --- a/modules/oauth/models/pdo/ClientModel.php +++ b/modules/oauth/models/pdo/ClientModel.php @@ -39,4 +39,3 @@ public function getByUser($userDao) return $daos; } } -?> diff --git a/modules/oauth/models/pdo/CodeModel.php b/modules/oauth/models/pdo/CodeModel.php index 9e9fdd23d..c7ea2a5a2 100644 --- a/modules/oauth/models/pdo/CodeModel.php +++ b/modules/oauth/models/pdo/CodeModel.php @@ -66,4 +66,3 @@ public function cleanExpired() } } } -?> diff --git a/modules/oauth/models/pdo/TokenModel.php b/modules/oauth/models/pdo/TokenModel.php index 8683b2a55..9eb066777 100644 --- a/modules/oauth/models/pdo/TokenModel.php +++ b/modules/oauth/models/pdo/TokenModel.php @@ -81,4 +81,3 @@ public function cleanExpired() } } } -?> diff --git a/modules/packages/AppController.php b/modules/packages/AppController.php index c4d3f54e0..a619f391f 100644 --- a/modules/packages/AppController.php +++ b/modules/packages/AppController.php @@ -15,4 +15,3 @@ class Packages_AppController extends MIDAS_GlobalModule { public $moduleName = 'packages'; } -?> diff --git a/modules/packages/Notification.php b/modules/packages/Notification.php index c7cb9abb6..78b4ce322 100644 --- a/modules/packages/Notification.php +++ b/modules/packages/Notification.php @@ -173,4 +173,3 @@ public function getItemMenuLink($params) '/public/images/package_go.png" /> '.$this->t('Manage '.$type).''; } } //end class -?> diff --git a/modules/packages/constant/module.php b/modules/packages/constant/module.php index 1e904fe16..1dce48020 100644 --- a/modules/packages/constant/module.php +++ b/modules/packages/constant/module.php @@ -11,4 +11,3 @@ =========================================================================*/ //define("MIDAS_EXAMPLE", 0); -?> diff --git a/modules/packages/models/AppDao.php b/modules/packages/models/AppDao.php index ac759fa78..fe4e77a56 100644 --- a/modules/packages/models/AppDao.php +++ b/modules/packages/models/AppDao.php @@ -17,5 +17,3 @@ class Packages_AppDao extends MIDAS_GlobalDao { public $moduleName = 'packages'; } //end class - -?> diff --git a/modules/pvw/AppController.php b/modules/pvw/AppController.php index 7d632bee1..fc3cc63aa 100644 --- a/modules/pvw/AppController.php +++ b/modules/pvw/AppController.php @@ -24,5 +24,3 @@ class Pvw_AppController extends MIDAS_GlobalModule public $moduleName='pvw'; } //end class -?> - diff --git a/modules/pvw/constant/module.php b/modules/pvw/constant/module.php index 0329c2bcc..2e8ec1771 100644 --- a/modules/pvw/constant/module.php +++ b/modules/pvw/constant/module.php @@ -17,7 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + // Max amount of time in seconds to wait between starting pvpython and it binding to the TCP port. // If this time is surpassed, we stop waiting and alert the user that something failed. define("MIDAS_PVW_STARTUP_TIMEOUT", 5); -?> diff --git a/modules/pvw/controllers/ParaviewController.php b/modules/pvw/controllers/ParaviewController.php index ee439bd17..afd4cee95 100644 --- a/modules/pvw/controllers/ParaviewController.php +++ b/modules/pvw/controllers/ParaviewController.php @@ -317,4 +317,3 @@ protected function _getHostName() } } // end class -?> diff --git a/modules/pvw/models/AppDao.php b/modules/pvw/models/AppDao.php index f3da51cb1..8f2bc3710 100644 --- a/modules/pvw/models/AppDao.php +++ b/modules/pvw/models/AppDao.php @@ -22,5 +22,3 @@ class Pvw_AppDao extends MIDAS_GlobalDao { } //end class - -?> diff --git a/modules/pvw/models/AppModel.php b/modules/pvw/models/AppModel.php index 60ea664ae..8554115e3 100644 --- a/modules/pvw/models/AppModel.php +++ b/modules/pvw/models/AppModel.php @@ -22,4 +22,3 @@ class Pvw_AppModel extends MIDASModel { public $moduleName = 'pvw'; } -?> diff --git a/modules/pvw/models/base/InstanceModelBase.php b/modules/pvw/models/base/InstanceModelBase.php index e448bb4be..61eb07342 100644 --- a/modules/pvw/models/base/InstanceModelBase.php +++ b/modules/pvw/models/base/InstanceModelBase.php @@ -44,4 +44,3 @@ public function __construct() public abstract function getAll(); } -?> diff --git a/modules/pvw/models/dao/InstanceDao.php b/modules/pvw/models/dao/InstanceDao.php index 046f03124..a3b0322c5 100644 --- a/modules/pvw/models/dao/InstanceDao.php +++ b/modules/pvw/models/dao/InstanceDao.php @@ -23,4 +23,3 @@ class Pvw_InstanceDao extends Pvw_AppDao public $_model = 'Instance'; public $_module = 'pvw'; } -?> diff --git a/modules/pvw/models/pdo/InstanceModel.php b/modules/pvw/models/pdo/InstanceModel.php index 75d467d46..5e8ead2a3 100644 --- a/modules/pvw/models/pdo/InstanceModel.php +++ b/modules/pvw/models/pdo/InstanceModel.php @@ -36,4 +36,3 @@ public function getAll() return $daos; } } -?> diff --git a/modules/ratings/AppController.php b/modules/ratings/AppController.php index 5d7587839..20b57b2f4 100644 --- a/modules/ratings/AppController.php +++ b/modules/ratings/AppController.php @@ -15,4 +15,3 @@ class Ratings_AppController extends MIDAS_GlobalModule { public $moduleName = 'ratings'; } //end class -?> diff --git a/modules/ratings/Notification.php b/modules/ratings/Notification.php index f5b71fcd1..f43cc624f 100644 --- a/modules/ratings/Notification.php +++ b/modules/ratings/Notification.php @@ -87,5 +87,3 @@ public function handleItemDeleted($params) $itemRatingModel->deleteByItem($params['item']); } } -?> - diff --git a/modules/ratings/constant/module.php b/modules/ratings/constant/module.php index 4f4b757b6..1cdbc8ca3 100644 --- a/modules/ratings/constant/module.php +++ b/modules/ratings/constant/module.php @@ -9,5 +9,3 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ - -?> diff --git a/modules/ratings/controllers/forms/ConfigForm.php b/modules/ratings/controllers/forms/ConfigForm.php index f35ec122e..f5fd3fce7 100644 --- a/modules/ratings/controllers/forms/ConfigForm.php +++ b/modules/ratings/controllers/forms/ConfigForm.php @@ -21,4 +21,3 @@ public function createConfigForm() } } // end class -?> diff --git a/modules/ratings/models/AppDao.php b/modules/ratings/models/AppDao.php index 55de1d6d3..2fa192249 100644 --- a/modules/ratings/models/AppDao.php +++ b/modules/ratings/models/AppDao.php @@ -5,5 +5,3 @@ class Ratings_AppDao extends MIDAS_GlobalDao { public $_module = 'ratings'; } //end class - -?> diff --git a/modules/ratings/models/AppModel.php b/modules/ratings/models/AppModel.php index b81518c8c..ce394f442 100644 --- a/modules/ratings/models/AppModel.php +++ b/modules/ratings/models/AppModel.php @@ -15,4 +15,3 @@ class Ratings_AppModel extends MIDASModel { public $moduleName = 'ratings'; } -?> diff --git a/modules/ratings/models/base/ItemratingModelBase.php b/modules/ratings/models/base/ItemratingModelBase.php index cc3affe92..b38e34142 100644 --- a/modules/ratings/models/base/ItemratingModelBase.php +++ b/modules/ratings/models/base/ItemratingModelBase.php @@ -49,4 +49,3 @@ abstract public function deleteByUser($user); /** Delete all comments on a given item. Called when item is about to be deleted. */ abstract public function deleteByItem($item); } -?> diff --git a/modules/ratings/models/dao/ItemratingDao.php b/modules/ratings/models/dao/ItemratingDao.php index 4f66229b2..681af73dc 100644 --- a/modules/ratings/models/dao/ItemratingDao.php +++ b/modules/ratings/models/dao/ItemratingDao.php @@ -23,4 +23,3 @@ class Ratings_ItemratingDao extends Ratings_AppDao public $_model = 'Itemrating'; public $_module = 'ratings'; } -?> diff --git a/modules/ratings/models/pdo/ItemratingModel.php b/modules/ratings/models/pdo/ItemratingModel.php index 0ffc98112..717ea709a 100644 --- a/modules/ratings/models/pdo/ItemratingModel.php +++ b/modules/ratings/models/pdo/ItemratingModel.php @@ -115,4 +115,4 @@ public function deleteByItem($item) Zend_Registry::get('dbAdapter')->delete($this->_name, 'item_id = '.$item->getKey()); } } -?> + diff --git a/modules/remoteprocessing/AppController.php b/modules/remoteprocessing/AppController.php index 39df9e54d..c640cacfa 100644 --- a/modules/remoteprocessing/AppController.php +++ b/modules/remoteprocessing/AppController.php @@ -33,4 +33,3 @@ class Remoteprocessing_AppController extends MIDAS_GlobalModule { public $moduleName='remoteprocessing'; } //end class -?> \ No newline at end of file diff --git a/modules/remoteprocessing/Notification.php b/modules/remoteprocessing/Notification.php index 6b339fa0e..7cf47b180 100644 --- a/modules/remoteprocessing/Notification.php +++ b/modules/remoteprocessing/Notification.php @@ -335,4 +335,3 @@ public function addJob($params) } } //end class -?> diff --git a/modules/remoteprocessing/constant/module.php b/modules/remoteprocessing/constant/module.php index 4792d4dd1..bc6d3a7c2 100644 --- a/modules/remoteprocessing/constant/module.php +++ b/modules/remoteprocessing/constant/module.php @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + define("MIDAS_REMOTEPROCESSING_OS_WINDOWS", 'windows'); define("MIDAS_REMOTEPROCESSING_OS_LINUX", 'linux'); @@ -28,4 +29,3 @@ define("MIDAS_REMOTEPROCESSING_RELATION_TYPE_INPUT", 1); define("MIDAS_REMOTEPROCESSING_RELATION_TYPE_OUPUT", 2); define("MIDAS_REMOTEPROCESSING_RELATION_TYPE_RESULTS", 3); -?> diff --git a/modules/remoteprocessing/database/upgrade/1.0.1.php b/modules/remoteprocessing/database/upgrade/1.0.1.php index 0346ca107..699575c3a 100644 --- a/modules/remoteprocessing/database/upgrade/1.0.1.php +++ b/modules/remoteprocessing/database/upgrade/1.0.1.php @@ -40,4 +40,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/remoteprocessing/database/upgrade/1.0.2.php b/modules/remoteprocessing/database/upgrade/1.0.2.php index c49479b95..dc1190fd1 100644 --- a/modules/remoteprocessing/database/upgrade/1.0.2.php +++ b/modules/remoteprocessing/database/upgrade/1.0.2.php @@ -40,4 +40,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/remoteprocessing/models/AppDao.php b/modules/remoteprocessing/models/AppDao.php index d044fb74f..520d9bb8a 100644 --- a/modules/remoteprocessing/models/AppDao.php +++ b/modules/remoteprocessing/models/AppDao.php @@ -23,5 +23,3 @@ class Remoteprocessing_AppDao extends MIDAS_GlobalDao public $_module='remoteprocessing'; } //end class - -?> diff --git a/modules/remoteprocessing/models/AppModel.php b/modules/remoteprocessing/models/AppModel.php index 12cf78e89..fbba96512 100644 --- a/modules/remoteprocessing/models/AppModel.php +++ b/modules/remoteprocessing/models/AppModel.php @@ -23,4 +23,3 @@ class Remoteprocessing_AppModel extends MIDASModel public $moduleName='remoteprocessing'; } -?> diff --git a/modules/remoteprocessing/views/job/getinitexecutable.phtml b/modules/remoteprocessing/views/job/getinitexecutable.phtml index ed5762ab0..7bda41fff 100644 --- a/modules/remoteprocessing/views/job/getinitexecutable.phtml +++ b/modules/remoteprocessing/views/job/getinitexecutable.phtml @@ -68,9 +68,3 @@ function elementInputParam($i, $option) { echo "Value (".ucfirst($option->field->type)."): "; } -?> - - - - - diff --git a/modules/scheduler/AppController.php b/modules/scheduler/AppController.php index 00ee1e97a..e79415126 100644 --- a/modules/scheduler/AppController.php +++ b/modules/scheduler/AppController.php @@ -33,4 +33,3 @@ class Scheduler_AppController extends MIDAS_GlobalModule { public $moduleName='scheduler'; } //end class -?> \ No newline at end of file diff --git a/modules/scheduler/Notification.php b/modules/scheduler/Notification.php index 98473951d..f14cc249f 100644 --- a/modules/scheduler/Notification.php +++ b/modules/scheduler/Notification.php @@ -104,4 +104,3 @@ public function handleUserDeleted($params) $jobModel->removeUserReferences($user->getKey()); } } //end class -?> diff --git a/modules/scheduler/constant/module.php b/modules/scheduler/constant/module.php index 7d350aaee..1fd9277a4 100644 --- a/modules/scheduler/constant/module.php +++ b/modules/scheduler/constant/module.php @@ -22,4 +22,3 @@ define("SCHEDULER_JOB_STATUS_STARTED", 1); define("SCHEDULER_JOB_STATUS_DONE", 2); define("SCHEDULER_JOB_STATUS_FAILED", 3); -?> diff --git a/modules/scheduler/controllers/components/EzcComponent.php b/modules/scheduler/controllers/components/EzcComponent.php index 6e920025b..fc7b350ce 100644 --- a/modules/scheduler/controllers/components/EzcComponent.php +++ b/modules/scheduler/controllers/components/EzcComponent.php @@ -44,4 +44,3 @@ public function initWorkflowDefinitionStorage() } } // end class -?> \ No newline at end of file diff --git a/modules/scheduler/controllers/forms/ConfigForm.php b/modules/scheduler/controllers/forms/ConfigForm.php index c7b852d5c..576619ddd 100644 --- a/modules/scheduler/controllers/forms/ConfigForm.php +++ b/modules/scheduler/controllers/forms/ConfigForm.php @@ -38,4 +38,3 @@ public function createConfigForm() } } // end class -?> \ No newline at end of file diff --git a/modules/scheduler/database/upgrade/1.0.1.php b/modules/scheduler/database/upgrade/1.0.1.php index 9a74bac42..f0fef72a7 100644 --- a/modules/scheduler/database/upgrade/1.0.1.php +++ b/modules/scheduler/database/upgrade/1.0.1.php @@ -44,4 +44,3 @@ public function postUpgrade() } } -?> diff --git a/modules/scheduler/database/upgrade/1.0.2.php b/modules/scheduler/database/upgrade/1.0.2.php index b4fd99f66..96f7f0b7e 100644 --- a/modules/scheduler/database/upgrade/1.0.2.php +++ b/modules/scheduler/database/upgrade/1.0.2.php @@ -40,4 +40,3 @@ public function postUpgrade() } } -?> diff --git a/modules/scheduler/database/upgrade/1.0.3.php b/modules/scheduler/database/upgrade/1.0.3.php index 742d52d02..1b301c96d 100644 --- a/modules/scheduler/database/upgrade/1.0.3.php +++ b/modules/scheduler/database/upgrade/1.0.3.php @@ -36,4 +36,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/scheduler/models/AppDao.php b/modules/scheduler/models/AppDao.php index e03497b22..c4e1ef9d6 100644 --- a/modules/scheduler/models/AppDao.php +++ b/modules/scheduler/models/AppDao.php @@ -22,5 +22,3 @@ class Scheduler_AppDao extends MIDAS_GlobalDao { public $moduleName = 'scheduler'; } //end class - -?> diff --git a/modules/scheduler/models/AppModel.php b/modules/scheduler/models/AppModel.php index ddc01df1e..eafad84d8 100644 --- a/modules/scheduler/models/AppModel.php +++ b/modules/scheduler/models/AppModel.php @@ -23,4 +23,3 @@ class Scheduler_AppModel extends MIDASModel public $moduleName = 'scheduler'; } -?> diff --git a/modules/scheduler/models/base/JobLogModelBase.php b/modules/scheduler/models/base/JobLogModelBase.php index 4c375fa3c..7098e38ac 100644 --- a/modules/scheduler/models/base/JobLogModelBase.php +++ b/modules/scheduler/models/base/JobLogModelBase.php @@ -50,4 +50,3 @@ public function saveLog($jobDao, $text) $this->save($joblog); } } // end class JobLogModelBase -?> diff --git a/modules/scheduler/models/base/JobModelBase.php b/modules/scheduler/models/base/JobModelBase.php index 623804658..dc157209f 100644 --- a/modules/scheduler/models/base/JobModelBase.php +++ b/modules/scheduler/models/base/JobModelBase.php @@ -81,4 +81,3 @@ protected function getServerLoad() return array(); } } // end class AssetstoreModelBase -?> diff --git a/modules/scheduler/models/dao/JobDao.php b/modules/scheduler/models/dao/JobDao.php index b69c6f0a1..d53f5ccf8 100644 --- a/modules/scheduler/models/dao/JobDao.php +++ b/modules/scheduler/models/dao/JobDao.php @@ -25,4 +25,3 @@ class Scheduler_JobDao extends Scheduler_AppDao } -?> diff --git a/modules/scheduler/models/dao/JobLogDao.php b/modules/scheduler/models/dao/JobLogDao.php index e2b08911e..777dc4e36 100644 --- a/modules/scheduler/models/dao/JobLogDao.php +++ b/modules/scheduler/models/dao/JobLogDao.php @@ -25,4 +25,3 @@ class Scheduler_JobLogDao extends Scheduler_AppDao } -?> diff --git a/modules/scheduler/models/pdo/JobLogModel.php b/modules/scheduler/models/pdo/JobLogModel.php index 88c8fbecb..82423b097 100644 --- a/modules/scheduler/models/pdo/JobLogModel.php +++ b/modules/scheduler/models/pdo/JobLogModel.php @@ -25,4 +25,3 @@ class Scheduler_JobLogModel extends Scheduler_JobLogModelBase { } // end class -?> diff --git a/modules/scheduler/models/pdo/JobModel.php b/modules/scheduler/models/pdo/JobModel.php index 049a69ac6..4631738ab 100644 --- a/modules/scheduler/models/pdo/JobModel.php +++ b/modules/scheduler/models/pdo/JobModel.php @@ -161,4 +161,3 @@ public function removeUserReferences($userId) } } // end class -?> diff --git a/modules/sizequota/AppController.php b/modules/sizequota/AppController.php index fd4bff27b..d679ceebe 100644 --- a/modules/sizequota/AppController.php +++ b/modules/sizequota/AppController.php @@ -26,4 +26,3 @@ class Sizequota_AppController extends MIDAS_GlobalModule /** folder quota model */ var $Sizequota_Folderquota; } //end class -?> \ No newline at end of file diff --git a/modules/sizequota/Notification.php b/modules/sizequota/Notification.php index 8982bfcf9..99abe0140 100644 --- a/modules/sizequota/Notification.php +++ b/modules/sizequota/Notification.php @@ -231,4 +231,3 @@ public function validateUploadRevision($args) } } //end class -?> diff --git a/modules/sizequota/constant/module.php b/modules/sizequota/constant/module.php index 797e41af3..9b2487128 100644 --- a/modules/sizequota/constant/module.php +++ b/modules/sizequota/constant/module.php @@ -17,6 +17,6 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + define("MIDAS_USE_DEFAULT_QUOTA", 0); define("MIDAS_USE_SPECIFIC_QUOTA", 1); -?> diff --git a/modules/sizequota/controllers/forms/ConfigForm.php b/modules/sizequota/controllers/forms/ConfigForm.php index 53f2a0211..4da143cf6 100644 --- a/modules/sizequota/controllers/forms/ConfigForm.php +++ b/modules/sizequota/controllers/forms/ConfigForm.php @@ -69,4 +69,3 @@ public function createFolderForm($defaultQuota) } } // end class -?> diff --git a/modules/sizequota/models/AppDao.php b/modules/sizequota/models/AppDao.php index e9cff54c3..a4174c31a 100644 --- a/modules/sizequota/models/AppDao.php +++ b/modules/sizequota/models/AppDao.php @@ -23,5 +23,3 @@ class Sizequota_AppDao extends MIDAS_GlobalDao { } //end class - -?> diff --git a/modules/sizequota/models/AppModel.php b/modules/sizequota/models/AppModel.php index 5ebb41868..5bd22f150 100644 --- a/modules/sizequota/models/AppModel.php +++ b/modules/sizequota/models/AppModel.php @@ -23,4 +23,3 @@ class Sizequota_AppModel extends MIDASModel { public $moduleName = 'sizequota'; } -?> diff --git a/modules/sizequota/models/base/FolderQuotaModelBase.php b/modules/sizequota/models/base/FolderQuotaModelBase.php index 3e49845f7..b50cb7869 100644 --- a/modules/sizequota/models/base/FolderQuotaModelBase.php +++ b/modules/sizequota/models/base/FolderQuotaModelBase.php @@ -116,4 +116,3 @@ public function setQuota($folder, $quota) } } } -?> diff --git a/modules/solr/AppController.php b/modules/solr/AppController.php index 2faf51cd7..ca3301ea2 100644 --- a/modules/solr/AppController.php +++ b/modules/solr/AppController.php @@ -23,4 +23,3 @@ class Solr_AppController extends MIDAS_GlobalModule { public $moduleName = 'solr'; } //end class -?> diff --git a/modules/solr/Notification.php b/modules/solr/Notification.php index ec03067ea..1f043e589 100644 --- a/modules/solr/Notification.php +++ b/modules/solr/Notification.php @@ -347,4 +347,3 @@ public function getLeftLinks() $this->webroot.'/core/public/images/icons/magnifier.png')); } } //end class -?> diff --git a/modules/solr/constant/module.php b/modules/solr/constant/module.php index 4bd4f9717..2e3d71ed9 100644 --- a/modules/solr/constant/module.php +++ b/modules/solr/constant/module.php @@ -17,5 +17,3 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ - -?> diff --git a/modules/solr/controllers/forms/ConfigForm.php b/modules/solr/controllers/forms/ConfigForm.php index 84d2a62c0..c0282a6fa 100644 --- a/modules/solr/controllers/forms/ConfigForm.php +++ b/modules/solr/controllers/forms/ConfigForm.php @@ -40,4 +40,3 @@ public function createConfigForm() } } // end class -?> diff --git a/modules/solr/models/AppDao.php b/modules/solr/models/AppDao.php index 8337941cf..402e48983 100644 --- a/modules/solr/models/AppDao.php +++ b/modules/solr/models/AppDao.php @@ -23,5 +23,3 @@ class Solr_AppDao extends MIDAS_GlobalDao { } //end class - -?> diff --git a/modules/solr/models/AppModel.php b/modules/solr/models/AppModel.php index e03289de2..59a05488a 100644 --- a/modules/solr/models/AppModel.php +++ b/modules/solr/models/AppModel.php @@ -23,4 +23,3 @@ class Solr_AppModel extends MIDASModel { public $moduleName = 'solr'; } -?> diff --git a/modules/statistics/AppController.php b/modules/statistics/AppController.php index 7591382d2..6cc5b29be 100644 --- a/modules/statistics/AppController.php +++ b/modules/statistics/AppController.php @@ -33,4 +33,3 @@ class Statistics_AppController extends MIDAS_GlobalModule { public $moduleName='statistics'; } //end class -?> \ No newline at end of file diff --git a/modules/statistics/Notification.php b/modules/statistics/Notification.php index 830fc7654..18f37ee5f 100644 --- a/modules/statistics/Notification.php +++ b/modules/statistics/Notification.php @@ -125,5 +125,3 @@ public function handleUserDeleted($params) $downloadModel->removeUserReferences($user->getKey()); } } //end class -?> - diff --git a/modules/statistics/constant/module.php b/modules/statistics/constant/module.php index 4bd4f9717..2e3d71ed9 100644 --- a/modules/statistics/constant/module.php +++ b/modules/statistics/constant/module.php @@ -17,5 +17,3 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ - -?> diff --git a/modules/statistics/controllers/components/ReportComponent.php b/modules/statistics/controllers/components/ReportComponent.php index b56d4b961..0bdb40f7f 100644 --- a/modules/statistics/controllers/components/ReportComponent.php +++ b/modules/statistics/controllers/components/ReportComponent.php @@ -99,4 +99,3 @@ public function send() }//end send } // end class -?> diff --git a/modules/statistics/controllers/forms/ConfigForm.php b/modules/statistics/controllers/forms/ConfigForm.php index 8af4f81e2..24e81377f 100644 --- a/modules/statistics/controllers/forms/ConfigForm.php +++ b/modules/statistics/controllers/forms/ConfigForm.php @@ -42,4 +42,3 @@ public function createConfigForm() } } // end class -?> diff --git a/modules/statistics/database/upgrade/1.0.1.php b/modules/statistics/database/upgrade/1.0.1.php index f7c32dd55..7a4b95a32 100644 --- a/modules/statistics/database/upgrade/1.0.1.php +++ b/modules/statistics/database/upgrade/1.0.1.php @@ -64,4 +64,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/statistics/database/upgrade/1.0.2.php b/modules/statistics/database/upgrade/1.0.2.php index cc132f946..a594cd2c8 100644 --- a/modules/statistics/database/upgrade/1.0.2.php +++ b/modules/statistics/database/upgrade/1.0.2.php @@ -20,4 +20,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/statistics/models/AppDao.php b/modules/statistics/models/AppDao.php index 7b7121d7f..6c7c145b2 100644 --- a/modules/statistics/models/AppDao.php +++ b/modules/statistics/models/AppDao.php @@ -23,5 +23,3 @@ class Statistics_AppDao extends MIDAS_GlobalDao { public $_module = 'statistics'; } //end class - -?> diff --git a/modules/statistics/models/AppModel.php b/modules/statistics/models/AppModel.php index c29a5267c..92f5744a9 100644 --- a/modules/statistics/models/AppModel.php +++ b/modules/statistics/models/AppModel.php @@ -23,4 +23,3 @@ class Statistics_AppModel extends MIDASModel { public $moduleName = 'statistics'; } -?> diff --git a/modules/statistics/models/base/DownloadBase.php b/modules/statistics/models/base/DownloadBase.php index fe7686c3e..0ca088118 100644 --- a/modules/statistics/models/base/DownloadBase.php +++ b/modules/statistics/models/base/DownloadBase.php @@ -86,4 +86,3 @@ public function addDownload($item, $user) } } // end class -?> diff --git a/modules/statistics/models/base/IpLocationModelBase.php b/modules/statistics/models/base/IpLocationModelBase.php index 172acfac6..e2a229241 100644 --- a/modules/statistics/models/base/IpLocationModelBase.php +++ b/modules/statistics/models/base/IpLocationModelBase.php @@ -95,4 +95,3 @@ public function performGeolocation($apiKey) } } // end class -?> diff --git a/modules/statistics/models/dao/DownloadDao.php b/modules/statistics/models/dao/DownloadDao.php index f7248c7d4..cd8068d3e 100644 --- a/modules/statistics/models/dao/DownloadDao.php +++ b/modules/statistics/models/dao/DownloadDao.php @@ -24,4 +24,3 @@ class Statistics_DownloadDao extends Statistics_AppDao public $_model = 'Download'; public $_module = 'statistics'; } -?> diff --git a/modules/statistics/models/dao/IpLocationDao.php b/modules/statistics/models/dao/IpLocationDao.php index 5a55b9a4d..dc4e4b4e7 100644 --- a/modules/statistics/models/dao/IpLocationDao.php +++ b/modules/statistics/models/dao/IpLocationDao.php @@ -16,4 +16,3 @@ class Statistics_IpLocationDao extends Statistics_AppDao public $_model = 'IpLocation'; public $_module = 'statistics'; } -?> diff --git a/modules/statistics/models/pdo/DownloadModel.php b/modules/statistics/models/pdo/DownloadModel.php index 7d4369fae..bf2d8fae2 100644 --- a/modules/statistics/models/pdo/DownloadModel.php +++ b/modules/statistics/models/pdo/DownloadModel.php @@ -160,4 +160,3 @@ function getDailyCounts($items, $startDate = null, $endDate = null) return $results; } } // end class -?> diff --git a/modules/statistics/models/pdo/IpLocationModel.php b/modules/statistics/models/pdo/IpLocationModel.php index bcf9f1408..44eeb613f 100644 --- a/modules/statistics/models/pdo/IpLocationModel.php +++ b/modules/statistics/models/pdo/IpLocationModel.php @@ -50,4 +50,3 @@ function getAllUnlocated() return $result; } } // end class -?> diff --git a/modules/thumbnailcreator/AppController.php b/modules/thumbnailcreator/AppController.php index e20c8a52b..cdbece5ae 100644 --- a/modules/thumbnailcreator/AppController.php +++ b/modules/thumbnailcreator/AppController.php @@ -23,4 +23,3 @@ class Thumbnailcreator_AppController extends MIDAS_GlobalModule { public $moduleName='thumbnailcreator'; } //end class -?> \ No newline at end of file diff --git a/modules/thumbnailcreator/Notification.php b/modules/thumbnailcreator/Notification.php index b27d48f6e..632800cf6 100644 --- a/modules/thumbnailcreator/Notification.php +++ b/modules/thumbnailcreator/Notification.php @@ -112,4 +112,3 @@ public function getDashboard() return $return; }//end _getDasboard } //end class -?> diff --git a/modules/thumbnailcreator/constant/module.php b/modules/thumbnailcreator/constant/module.php index 0f0fea63a..3f9bf3759 100644 --- a/modules/thumbnailcreator/constant/module.php +++ b/modules/thumbnailcreator/constant/module.php @@ -22,5 +22,3 @@ define ("MIDAS_THUMBNAILCREATOR_USE_THUMBNAILER", 1); define ("MIDAS_THUMBNAILCREATOR_NOT_USE_THUMBNAILER", 0); - -?> diff --git a/modules/thumbnailcreator/controllers/forms/ConfigForm.php b/modules/thumbnailcreator/controllers/forms/ConfigForm.php index c92c2f5ee..a7f802a88 100644 --- a/modules/thumbnailcreator/controllers/forms/ConfigForm.php +++ b/modules/thumbnailcreator/controllers/forms/ConfigForm.php @@ -65,4 +65,3 @@ public function createThumbnailerForm() } } // end class -?> diff --git a/modules/thumbnailcreator/database/upgrade/1.0.1.php b/modules/thumbnailcreator/database/upgrade/1.0.1.php index e0d5374c5..1422fc2d7 100644 --- a/modules/thumbnailcreator/database/upgrade/1.0.1.php +++ b/modules/thumbnailcreator/database/upgrade/1.0.1.php @@ -36,4 +36,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/thumbnailcreator/database/upgrade/1.0.2.php b/modules/thumbnailcreator/database/upgrade/1.0.2.php index 9ca4332f3..9f21869b5 100644 --- a/modules/thumbnailcreator/database/upgrade/1.0.2.php +++ b/modules/thumbnailcreator/database/upgrade/1.0.2.php @@ -71,4 +71,4 @@ private function _moveThumbnailToAssetstore($thumbnail) } } -?> + diff --git a/modules/thumbnailcreator/models/AppDao.php b/modules/thumbnailcreator/models/AppDao.php index cc65a01e7..69f03cb67 100644 --- a/modules/thumbnailcreator/models/AppDao.php +++ b/modules/thumbnailcreator/models/AppDao.php @@ -22,5 +22,3 @@ class Thumbnailcreator_AppDao extends MIDAS_GlobalDao { public $moduleName='thumbnailcreator'; } //end class - -?> diff --git a/modules/thumbnailcreator/models/AppModel.php b/modules/thumbnailcreator/models/AppModel.php index 5a1f509f1..c81f5c2cf 100644 --- a/modules/thumbnailcreator/models/AppModel.php +++ b/modules/thumbnailcreator/models/AppModel.php @@ -23,4 +23,3 @@ class Thumbnailcreator_AppModel extends MIDASModel } -?> diff --git a/modules/tracker/AppController.php b/modules/tracker/AppController.php index 15b28bda5..68a0e404b 100644 --- a/modules/tracker/AppController.php +++ b/modules/tracker/AppController.php @@ -15,4 +15,3 @@ class Tracker_AppController extends MIDAS_GlobalModule { public $moduleName = 'tracker'; } -?> diff --git a/modules/tracker/Notification.php b/modules/tracker/Notification.php index 27c16b59d..4b1e78a96 100644 --- a/modules/tracker/Notification.php +++ b/modules/tracker/Notification.php @@ -111,4 +111,3 @@ public function sendEmail($params) UtilityComponent::sendEmail($user->getEmail(), 'Tracker Threshold Notification', $text); } } //end class -?> diff --git a/modules/tracker/constant/module.php b/modules/tracker/constant/module.php index 9cf877032..02e668206 100644 --- a/modules/tracker/constant/module.php +++ b/modules/tracker/constant/module.php @@ -13,4 +13,3 @@ //define("MIDAS_EXAMPLE", 0); define('MIDAS_TRACKER_EMAIL_USER', 'emailuser'); define('MIDAS_TRACKER_EMAIL_GROUP', 'emailgroup'); -?> diff --git a/modules/tracker/database/upgrade/1.0.1.php b/modules/tracker/database/upgrade/1.0.1.php index 6de4f8f50..5428a55b0 100644 --- a/modules/tracker/database/upgrade/1.0.1.php +++ b/modules/tracker/database/upgrade/1.0.1.php @@ -31,4 +31,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/tracker/database/upgrade/1.0.2.php b/modules/tracker/database/upgrade/1.0.2.php index 90921d2b8..fa87dd1c7 100644 --- a/modules/tracker/database/upgrade/1.0.2.php +++ b/modules/tracker/database/upgrade/1.0.2.php @@ -23,4 +23,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/tracker/database/upgrade/1.0.3.php b/modules/tracker/database/upgrade/1.0.3.php index 685394f02..328373317 100644 --- a/modules/tracker/database/upgrade/1.0.3.php +++ b/modules/tracker/database/upgrade/1.0.3.php @@ -23,4 +23,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/tracker/database/upgrade/1.0.4.php b/modules/tracker/database/upgrade/1.0.4.php index 31e88a455..e0efbfe44 100644 --- a/modules/tracker/database/upgrade/1.0.4.php +++ b/modules/tracker/database/upgrade/1.0.4.php @@ -27,4 +27,3 @@ public function postUpgrade() { } } -?> diff --git a/modules/tracker/models/AppDao.php b/modules/tracker/models/AppDao.php index 6004cb96b..bd0d5b0cb 100644 --- a/modules/tracker/models/AppDao.php +++ b/modules/tracker/models/AppDao.php @@ -17,5 +17,3 @@ class Tracker_AppDao extends MIDAS_GlobalDao { public $moduleName = 'tracker'; } //end class - -?> diff --git a/modules/validation/AppController.php b/modules/validation/AppController.php index 939cd58fc..58b2d59c0 100644 --- a/modules/validation/AppController.php +++ b/modules/validation/AppController.php @@ -15,4 +15,3 @@ class Validation_AppController extends MIDAS_GlobalModule { public $moduleName='validation'; } //end class -?> \ No newline at end of file diff --git a/modules/validation/Notification.php b/modules/validation/Notification.php index 73981a89e..97bb9d531 100644 --- a/modules/validation/Notification.php +++ b/modules/validation/Notification.php @@ -25,5 +25,3 @@ public function init() }//end init } //end class - -?> \ No newline at end of file diff --git a/modules/validation/constant/module.php b/modules/validation/constant/module.php index 1e904fe16..1dce48020 100644 --- a/modules/validation/constant/module.php +++ b/modules/validation/constant/module.php @@ -11,4 +11,3 @@ =========================================================================*/ //define("MIDAS_EXAMPLE", 0); -?> diff --git a/modules/validation/models/AppDao.php b/modules/validation/models/AppDao.php index d0a192c19..e4064aa39 100644 --- a/modules/validation/models/AppDao.php +++ b/modules/validation/models/AppDao.php @@ -17,5 +17,3 @@ class Validation_AppDao extends MIDAS_GlobalDao { public $moduleName = 'validation'; } //end class - -?> diff --git a/modules/visualize/AppController.php b/modules/visualize/AppController.php index a75a27c28..f0f2a1cff 100644 --- a/modules/visualize/AppController.php +++ b/modules/visualize/AppController.php @@ -23,4 +23,3 @@ class Visualize_AppController extends MIDAS_GlobalModule public $moduleName='visualize'; } //end class -?> \ No newline at end of file diff --git a/modules/visualize/constant/module.php b/modules/visualize/constant/module.php index bc23ea22a..a33e0b450 100644 --- a/modules/visualize/constant/module.php +++ b/modules/visualize/constant/module.php @@ -17,5 +17,5 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + //define("MIDAS_EXAMPLE", 0); -?> diff --git a/modules/visualize/controllers/ImageController.php b/modules/visualize/controllers/ImageController.php index f51c1468f..599105c88 100644 --- a/modules/visualize/controllers/ImageController.php +++ b/modules/visualize/controllers/ImageController.php @@ -45,4 +45,3 @@ public function indexAction() $this->view->imageUrl = $this->view->webroot."/download?items=".$item->getKey(); } } // end class -?> diff --git a/modules/visualize/controllers/IndexController.php b/modules/visualize/controllers/IndexController.php index 58032cb19..998d41212 100644 --- a/modules/visualize/controllers/IndexController.php +++ b/modules/visualize/controllers/IndexController.php @@ -83,4 +83,4 @@ function indexAction() } } } // end class -?> + diff --git a/modules/visualize/controllers/MediaController.php b/modules/visualize/controllers/MediaController.php index 73e4a2814..ded922b11 100644 --- a/modules/visualize/controllers/MediaController.php +++ b/modules/visualize/controllers/MediaController.php @@ -58,4 +58,3 @@ public function indexAction() $this->view->json['itemId'] = $item->getKey(); } } // end class -?> diff --git a/modules/visualize/controllers/ParaviewController.php b/modules/visualize/controllers/ParaviewController.php index 90f38f22a..b0074be42 100644 --- a/modules/visualize/controllers/ParaviewController.php +++ b/modules/visualize/controllers/ParaviewController.php @@ -571,5 +571,3 @@ protected function _getTomcatPort($pwapp) } } } // end class -?> - diff --git a/modules/visualize/controllers/PdfController.php b/modules/visualize/controllers/PdfController.php index 919c9136f..92179f7a9 100644 --- a/modules/visualize/controllers/PdfController.php +++ b/modules/visualize/controllers/PdfController.php @@ -48,4 +48,3 @@ public function indexAction() echo ""; } } // end class -?> diff --git a/modules/visualize/controllers/TxtController.php b/modules/visualize/controllers/TxtController.php index fbde2ad27..45293305d 100644 --- a/modules/visualize/controllers/TxtController.php +++ b/modules/visualize/controllers/TxtController.php @@ -50,4 +50,3 @@ public function indexAction() echo ""; } } // end class -?> diff --git a/modules/visualize/controllers/WrapperController.php b/modules/visualize/controllers/WrapperController.php index f4d88f863..866f8dcff 100644 --- a/modules/visualize/controllers/WrapperController.php +++ b/modules/visualize/controllers/WrapperController.php @@ -117,4 +117,3 @@ function indexAction() $this->view->json['viewMode'] = $viewMode; }//end index } // end class -?> diff --git a/modules/visualize/models/AppDao.php b/modules/visualize/models/AppDao.php index a61323f2b..3d0294172 100644 --- a/modules/visualize/models/AppDao.php +++ b/modules/visualize/models/AppDao.php @@ -22,5 +22,3 @@ class Visualize_AppDao extends MIDAS_GlobalDao { } //end class - -?> diff --git a/modules/visualize/models/AppModel.php b/modules/visualize/models/AppModel.php index 6b7b219cf..e590d368a 100644 --- a/modules/visualize/models/AppModel.php +++ b/modules/visualize/models/AppModel.php @@ -23,4 +23,3 @@ class Visualize_AppModel extends MIDASModel public $moduleName='visualize'; } -?> From fee0cb995bc4b61059fd866f699b43de80043d7e Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 13:56:59 -0400 Subject: [PATCH 07/25] Consistently use lowercase true, false, null --- core/controllers/ImportController.php | 2 +- core/controllers/components/ApidocsComponent.php | 2 +- core/controllers/components/MIDAS2MigrationComponent.php | 2 +- core/controllers/components/UtilityComponent.php | 2 +- core/models/base/CommunityModelBase.php | 4 ++-- .../dicomserver/controllers/components/ServerComponent.php | 2 +- modules/oai/controllers/IndexController.php | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/controllers/ImportController.php b/core/controllers/ImportController.php index 5be65a5c9..72c293cb2 100644 --- a/core/controllers/ImportController.php +++ b/core/controllers/ImportController.php @@ -251,7 +251,7 @@ private function _recursiveParseDirectory($path, $currentdir) // Upload the bitstream $assetstoreDao = $this->Assetstore->load($this->assetstoreid); $this->Component->Upload->uploadBitstream($bitstreamDao, - $assetstoreDao, TRUE); + $assetstoreDao, true); $this->ItemRevision->addBitstream($itemRevisionDao, $bitstreamDao); } // end new revision diff --git a/core/controllers/components/ApidocsComponent.php b/core/controllers/components/ApidocsComponent.php index 3cd16f858..ae4cdeb06 100644 --- a/core/controllers/components/ApidocsComponent.php +++ b/core/controllers/components/ApidocsComponent.php @@ -115,7 +115,7 @@ public function getWebApiDocs($resource, $module = '') } if(!empty($path)) { - $tokens = preg_split('@/@', $path, NULL, PREG_SPLIT_NO_EMPTY); + $tokens = preg_split('@/@', $path, null, PREG_SPLIT_NO_EMPTY); $count = count($tokens); if(empty($module) & !empty($tokens)) // core { diff --git a/core/controllers/components/MIDAS2MigrationComponent.php b/core/controllers/components/MIDAS2MigrationComponent.php index 31f738412..b52cc085a 100644 --- a/core/controllers/components/MIDAS2MigrationComponent.php +++ b/core/controllers/components/MIDAS2MigrationComponent.php @@ -536,7 +536,7 @@ function migrate($userid) { $privacy = MIDAS_COMMUNITY_PUBLIC; } - $communityDao = $Community->createCommunity($name, $short_description, $privacy, NULL); // no user + $communityDao = $Community->createCommunity($name, $short_description, $privacy, null); // no user // Add the users to the community // MIDAS2 was not using the group heavily so we ignore them. This would have to be a manual step diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php index f798d4f77..eadfc4bc5 100644 --- a/core/controllers/components/UtilityComponent.php +++ b/core/controllers/components/UtilityComponent.php @@ -101,7 +101,7 @@ public function getAllModules() public static function extractPathParams() { $request = Zend_Controller_Front::getInstance()->getRequest(); - $allTokens = preg_split('@/@', $request->getPathInfo(), NULL, PREG_SPLIT_NO_EMPTY); + $allTokens = preg_split('@/@', $request->getPathInfo(), null, PREG_SPLIT_NO_EMPTY); $tokens = array(); $i = 0; diff --git a/core/models/base/CommunityModelBase.php b/core/models/base/CommunityModelBase.php index b1acb9cd1..74c8d05be 100644 --- a/core/models/base/CommunityModelBase.php +++ b/core/models/base/CommunityModelBase.php @@ -163,7 +163,7 @@ function createCommunity($name, $description, $privacy, $user, $canJoin = null, $communityDao->setMembergroupId($memberGroup->getKey()); $this->save($communityDao); - if($user != NULL) + if($user != null) { $groupModel->addUser($adminGroup, $user); $groupModel->addUser($memberGroup, $user); @@ -190,7 +190,7 @@ function createCommunity($name, $description, $privacy, $user, $canJoin = null, $folderpolicygroupModel->createPolicy($moderatorsGroup, $folderPublic, MIDAS_POLICY_WRITE); $folderpolicygroupModel->createPolicy($memberGroup, $folderPublic, MIDAS_POLICY_READ); $folderpolicygroupModel->createPolicy($anonymousGroup, $folderPublic, MIDAS_POLICY_READ); - if($user != NULL) + if($user != null) { $feedpolicygroupModel->createPolicy($anonymousGroup, $feed, MIDAS_POLICY_READ); } diff --git a/modules/dicomserver/controllers/components/ServerComponent.php b/modules/dicomserver/controllers/components/ServerComponent.php index 652ca780c..a9099b583 100644 --- a/modules/dicomserver/controllers/components/ServerComponent.php +++ b/modules/dicomserver/controllers/components/ServerComponent.php @@ -40,7 +40,7 @@ public function isDICOMServerWorking() } $ret['Reception Directory Writable'] = array(is_writable($receptionDir)); $peer_aes = $modulesConfig['dicomserver']->peer_aes; - if (!empty($peer_aes) && strpos($peer_aes, '(') !== FALSE && strpos($peer_aes, ')') !== FALSE) + if (!empty($peer_aes) && strpos($peer_aes, '(') !== false && strpos($peer_aes, ')') !== false) { $ret['Peer AE List Not Empty'] = array(true, "At least one peer AE is given"); } diff --git a/modules/oai/controllers/IndexController.php b/modules/oai/controllers/IndexController.php index 0d9a35768..0b2b397c6 100644 --- a/modules/oai/controllers/IndexController.php +++ b/modules/oai/controllers/IndexController.php @@ -161,12 +161,12 @@ function indexAction() { if(in_array('gzip', $compression) && ini_get('output_buffering')) { - //$compress = TRUE; - $compress = FALSE; + //$compress = true; + $compress = false; } else { - $compress = FALSE; + $compress = false; } } From 277f6acbdc8fb438fb6648987a7c3b544501a0f3 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 14:06:47 -0400 Subject: [PATCH 08/25] Replace tabs with spaces --- core/database/upgrade/3.1.0.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/database/upgrade/3.1.0.php b/core/database/upgrade/3.1.0.php index 6b9340a75..b5f002295 100644 --- a/core/database/upgrade/3.1.0.php +++ b/core/database/upgrade/3.1.0.php @@ -31,7 +31,7 @@ public function mysql() public function pgsql() { - $this->db->query('ALTER TABLE community ALTER COLUMN moderatorgroup_id DROP NOT NULL'); + $this->db->query('ALTER TABLE community ALTER COLUMN moderatorgroup_id DROP NOT NULL'); } public function postUpgrade() From b28667cc8a3f5ca31f888f3c2e9d37511be36bbd Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 15:50:50 -0400 Subject: [PATCH 09/25] Consistently indent class and function braces --- core/ApiController.php | 2 +- core/AppController.php | 2 +- core/AppForm.php | 2 +- core/GlobalComponent.php | 4 ++-- core/GlobalController.php | 4 ++-- core/MidasLoader.php | 4 ++-- core/Notification.php | 2 +- core/controllers/AdminController.php | 5 ++--- core/controllers/ApidocsController.php | 5 ++--- core/controllers/ApikeyController.php | 5 ++--- core/controllers/AssetstoreController.php | 4 +--- core/controllers/BrowseController.php | 4 ++-- core/controllers/CommunityController.php | 2 +- core/controllers/DownloadController.php | 4 ++-- core/controllers/ErrorController.php | 4 ++-- core/controllers/FeedController.php | 8 +++----- core/controllers/FolderController.php | 2 +- core/controllers/ImportController.php | 2 +- core/controllers/IndexController.php | 2 +- core/controllers/InstallController.php | 6 ++---- core/controllers/ItemController.php | 2 +- core/controllers/LicenseController.php | 3 +-- core/controllers/ProgressController.php | 3 +-- core/controllers/SearchController.php | 5 ++--- core/controllers/ShareController.php | 2 +- core/controllers/UploadController.php | 2 +- core/controllers/UserController.php | 2 +- core/controllers/api/BitstreamController.php | 4 ++-- core/controllers/api/CommunityController.php | 6 ++---- core/controllers/api/FolderController.php | 5 ++--- core/controllers/api/GroupController.php | 5 ++--- core/controllers/api/IndexController.php | 4 ++-- core/controllers/api/ItemController.php | 5 ++--- core/controllers/api/ItemrevisionController.php | 6 ++---- core/controllers/api/SystemController.php | 5 ++--- core/controllers/api/UserController.php | 5 ++--- .../components/AuthenticationComponent.php | 5 ++--- .../components/BreadcrumbComponent.php | 4 ++-- .../components/DownloadBitstreamComponent.php | 2 +- core/controllers/components/ExportComponent.php | 6 ++---- core/controllers/components/FilterComponent.php | 4 ++-- .../InternationalizationComponent.php | 2 +- core/controllers/components/JsonComponent.php | 2 +- .../components/MIDAS2MigrationComponent.php | 5 ++--- core/controllers/components/SearchComponent.php | 6 +++--- .../controllers/components/UpgradeComponent.php | 3 +-- core/controllers/components/UploadComponent.php | 5 ++--- .../controllers/components/UtilityComponent.php | 6 ++---- core/controllers/components/UuidComponent.php | 5 ++--- core/controllers/forms/AdminForm.php | 5 ++--- core/controllers/forms/ApikeyForm.php | 4 ++-- core/controllers/forms/AssetstoreForm.php | 4 ++-- core/controllers/forms/CommunityForm.php | 5 ++--- core/controllers/forms/FolderForm.php | 5 ++--- core/controllers/forms/ImportForm.php | 4 ++-- core/controllers/forms/InstallForm.php | 4 ++-- core/controllers/forms/ItemForm.php | 5 ++--- core/controllers/forms/MigrateForm.php | 4 ++-- core/controllers/forms/UploadForm.php | 5 ++--- core/controllers/forms/UserForm.php | 4 ++-- core/database/upgrade/3.0.1.php | 6 ++---- core/database/upgrade/3.0.10.php | 6 ++---- core/database/upgrade/3.0.11.php | 8 +++----- core/database/upgrade/3.0.12.php | 11 ++++------- core/database/upgrade/3.0.13.php | 4 ++-- core/database/upgrade/3.0.14.php | 4 ++-- core/database/upgrade/3.0.15.php | 5 ++--- core/database/upgrade/3.0.16.php | 4 ++-- core/database/upgrade/3.0.2.php | 8 +++----- core/database/upgrade/3.0.3.php | 6 ++---- core/database/upgrade/3.0.4.php | 10 ++++------ core/database/upgrade/3.0.5.php | 6 ++---- core/database/upgrade/3.0.6.php | 6 ++---- core/database/upgrade/3.0.7.php | 7 +++---- core/database/upgrade/3.0.8.php | 6 ++---- core/database/upgrade/3.0.9.php | 8 +++----- core/database/upgrade/3.1.0.php | 4 ++-- core/database/upgrade/3.1.1.php | 4 ++-- core/database/upgrade/3.1.2.php | 4 ++-- core/database/upgrade/3.1.3.php | 4 ++-- core/database/upgrade/3.1.4.php | 4 ++-- core/database/upgrade/3.2.0.php | 4 ++-- core/database/upgrade/3.2.1.php | 4 ++-- core/database/upgrade/3.2.10.php | 6 ++---- core/database/upgrade/3.2.11.php | 6 ++---- core/database/upgrade/3.2.12.php | 6 ++---- core/database/upgrade/3.2.13.php | 6 ++---- core/database/upgrade/3.2.14.php | 5 ++--- core/database/upgrade/3.2.2.php | 4 ++-- core/database/upgrade/3.2.3.php | 4 ++-- core/database/upgrade/3.2.4.php | 4 ++-- core/database/upgrade/3.2.5.php | 4 ++-- core/database/upgrade/3.2.6.php | 6 ++---- core/database/upgrade/3.2.7.php | 6 ++---- core/database/upgrade/3.2.8.php | 6 ++---- core/database/upgrade/3.2.9.php | 6 ++---- core/models/AppDao.php | 2 +- core/models/AppModel.php | 5 ++--- core/models/GlobalDao.php | 4 ++-- core/models/MIDASDatabaseInterface.php | 4 ++-- core/models/MIDASDatabaseMongo.php | 4 ++-- core/models/MIDASDatabasePdo.php | 4 ++-- core/models/MIDASModel.php | 4 ++-- core/models/MIDASModuleInstallScript.php | 4 ++-- core/models/MIDASUpgrade.php | 4 ++-- core/models/base/ActivedownloadModelBase.php | 5 ++--- core/models/base/AssetstoreModelBase.php | 5 ++--- core/models/base/BitstreamModelBase.php | 4 ++-- .../base/CommunityInvitationModelBase.php | 4 ++-- core/models/base/CommunityModelBase.php | 5 ++--- core/models/base/ErrorlogModelBase.php | 4 ++-- core/models/base/FeedModelBase.php | 4 ++-- core/models/base/FeedpolicygroupModelBase.php | 4 ++-- core/models/base/FeedpolicyuserModelBase.php | 5 ++--- core/models/base/FolderModelBase.php | 4 ++-- core/models/base/FolderpolicygroupModelBase.php | 6 ++---- core/models/base/FolderpolicyuserModelBase.php | 5 ++--- core/models/base/GroupModelBase.php | 5 ++--- core/models/base/ItemModelBase.php | 4 ++-- core/models/base/ItemRevisionModelBase.php | 6 ++---- core/models/base/ItempolicygroupModelBase.php | 6 ++---- core/models/base/ItempolicyuserModelBase.php | 4 ++-- core/models/base/LicenseModelBase.php | 5 ++--- core/models/base/MetadataModelBase.php | 4 ++-- core/models/base/NewUserInvitationModelBase.php | 4 ++-- core/models/base/PendingUserModelBase.php | 4 ++-- core/models/base/ProgressModelBase.php | 4 ++-- core/models/base/SettingModelBase.php | 5 ++--- core/models/base/TokenModelBase.php | 6 +++--- core/models/base/UserModelBase.php | 4 ++-- core/models/base/UserapiModelBase.php | 5 ++--- core/models/dao/ActivedownloadDao.php | 4 ++-- core/models/dao/AssetstoreDao.php | 4 ++-- core/models/dao/BitstreamDao.php | 6 ++---- core/models/dao/CommunityInvitationDao.php | 6 ++---- core/models/dao/ErrorlogDao.php | 4 ++-- core/models/dao/FeedDao.php | 4 ++-- core/models/dao/MetadataDao.php | 5 ++--- core/models/dao/NewUserInvitationDao.php | 4 ++-- core/models/dao/PendingUserDao.php | 4 ++-- core/models/dao/ProgressDao.php | 4 ++-- core/models/dao/UserDao.php | 2 +- core/models/pdo/ActivedownloadModel.php | 5 ++--- core/models/pdo/AssetstoreModel.php | 4 ++-- core/models/pdo/CommunityInvitationModel.php | 4 ++-- core/models/pdo/CommunityModel.php | 4 ++-- core/models/pdo/ErrorlogModel.php | 4 ++-- core/models/pdo/FeedModel.php | 4 ++-- core/models/pdo/FeedpolicygroupModel.php | 4 ++-- core/models/pdo/FeedpolicyuserModel.php | 4 ++-- core/models/pdo/FolderModel.php | 4 ++-- core/models/pdo/FolderpolicygroupModel.php | 4 ++-- core/models/pdo/FolderpolicyuserModel.php | 4 ++-- core/models/pdo/GroupModel.php | 4 ++-- core/models/pdo/ItemModel.php | 5 ++--- core/models/pdo/ItemRevisionModel.php | 4 ++-- core/models/pdo/ItempolicygroupModel.php | 4 ++-- core/models/pdo/ItempolicyuserModel.php | 5 ++--- core/models/pdo/LicenseModel.php | 4 ++-- core/models/pdo/MetadataModel.php | 4 ++-- core/models/pdo/NewUserInvitationModel.php | 5 ++--- core/models/pdo/PendingUserModel.php | 4 ++-- core/models/pdo/ProgressModel.php | 4 ++-- core/models/pdo/SettingModel.php | 4 ++-- core/models/pdo/TokenModel.php | 4 ++-- core/models/pdo/UserModel.php | 4 ++-- core/models/pdo/UserapiModel.php | 4 ++-- core/models/profiler/ProductionDbProfiler.php | 2 +- modules/GlobalModule.php | 2 +- modules/api/AppController.php | 2 +- modules/api/Notification.php | 2 +- modules/api/controllers/ConfigController.php | 4 ++-- modules/api/controllers/IndexController.php | 2 +- modules/api/controllers/JsonController.php | 2 +- modules/api/controllers/RestController.php | 2 +- modules/api/controllers/forms/ConfigForm.php | 4 ++-- modules/archive/Notification.php | 2 +- .../archive/controllers/ConfigController.php | 4 ++-- .../archive/controllers/ExtractController.php | 2 +- modules/batchmake/AppController.php | 2 +- modules/batchmake/Notification.php | 2 +- .../batchmake/controllers/ConfigController.php | 4 ++-- .../batchmake/controllers/IndexController.php | 4 ++-- .../controllers/components/ApiComponent.php | 4 ++-- .../controllers/components/ExecuteComponent.php | 2 +- .../components/KWBatchmakeComponent.php | 4 ++-- .../batchmake/controllers/forms/ConfigForm.php | 4 ++-- modules/batchmake/database/upgrade/0.2.0.php | 6 ++---- modules/batchmake/models/AppDao.php | 2 +- modules/batchmake/models/AppModel.php | 8 ++++---- .../models/base/CondorDagModelBase.php | 17 +++++------------ .../models/base/CondorJobModelBase.php | 15 +++++---------- .../models/base/ItemmetricModelBase.php | 10 +++------- modules/batchmake/models/base/TaskModelBase.php | 11 +++-------- modules/batchmake/models/dao/CondorDagDao.php | 8 ++++---- modules/batchmake/models/dao/CondorJobDao.php | 8 ++++---- modules/batchmake/models/dao/ItemmetricDao.php | 8 ++++---- modules/batchmake/models/dao/TaskDao.php | 8 ++++---- modules/batchmake/models/pdo/CondorDagModel.php | 8 ++++---- modules/batchmake/models/pdo/CondorJobModel.php | 8 ++++---- .../batchmake/models/pdo/ItemmetricModel.php | 9 ++++----- modules/batchmake/models/pdo/TaskModel.php | 8 ++++---- .../batchmake/tests/library/BatchmakeMock.php | 4 ++-- .../tests/library/CondorSubmitDagMock.php | 4 ++-- .../batchmake/tests/library/ExecutorMock.php | 2 +- modules/cleanup/AppController.php | 2 +- modules/cleanup/Notification.php | 2 +- .../cleanup/controllers/ConfigController.php | 4 ++-- modules/cleanup/controllers/IndexController.php | 4 ++-- .../cleanup/controllers/forms/ConfigForm.php | 4 ++-- modules/cleanup/models/AppDao.php | 2 +- modules/cleanup/models/AppModel.php | 4 ++-- .../tests/controllers/CleanupPerformTest.php | 4 ++-- modules/comments/AppController.php | 2 +- .../comments/controllers/CommentController.php | 4 ++-- .../comments/controllers/ConfigController.php | 4 ++-- .../comments/controllers/IndexController.php | 4 ++-- .../controllers/components/CommentComponent.php | 4 ++-- modules/comments/models/AppDao.php | 2 +- modules/comments/models/AppModel.php | 4 ++-- .../models/base/ItemcommentModelBase.php | 5 +++-- .../comments/models/pdo/ItemcommentModel.php | 5 +++-- modules/communityagreement/AppController.php | 2 +- modules/communityagreement/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/forms/ConfigForm.php | 4 ++-- modules/communityagreement/models/AppDao.php | 2 +- modules/communityagreement/models/AppModel.php | 4 ++-- .../models/base/AgreementModelBase.php | 4 ++-- .../models/pdo/AgreementModel.php | 5 +++-- modules/dicomanonymize/AppController.php | 2 +- modules/dicomanonymize/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/UploadController.php | 4 ++-- modules/dicomextractor/AppController.php | 2 +- modules/dicomextractor/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/api/ItemController.php | 6 ++---- .../controllers/components/ApiComponent.php | 8 +++----- .../controllers/components/ApiitemComponent.php | 7 +++---- .../components/ExtractorComponent.php | 4 ++-- .../controllers/forms/ConfigForm.php | 4 ++-- modules/dicomserver/AppController.php | 2 +- modules/dicomserver/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/api/ServerController.php | 6 ++---- .../controllers/components/ApiComponent.php | 5 +++-- .../components/ApiserverComponent.php | 6 +++--- .../controllers/components/ServerComponent.php | 4 ++-- .../controllers/forms/ConfigForm.php | 4 ++-- modules/dicomserver/models/AppDao.php | 2 +- modules/dicomserver/models/AppModel.php | 5 ++--- .../models/base/RegistrationModelBase.php | 10 +++++----- .../dicomserver/models/dao/RegistrationDao.php | 8 ++++---- .../models/pdo/RegistrationModel.php | 10 ++++------ modules/example/AppController.php | 2 +- modules/example/controllers/IndexController.php | 4 ++-- .../example/controllers/SampleController.php | 2 +- modules/example/database/upgrade/1.0.1.php | 4 ++-- modules/example/models/AppDao.php | 2 +- modules/example/models/base/WalletModelBase.php | 2 +- modules/keyfiles/AppController.php | 2 +- modules/keyfiles/Notification.php | 2 +- .../keyfiles/controllers/DownloadController.php | 4 ++-- modules/keyfiles/models/AppDao.php | 2 +- modules/keyfiles/models/AppModel.php | 4 ++-- .../KeyfilesDownloadControllerTest.php | 4 ++-- modules/landingpage/AppController.php | 2 +- modules/landingpage/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/IndexCoreController.php | 4 ++-- .../controllers/forms/ConfigForm.php | 4 ++-- modules/landingpage/models/AppDao.php | 2 +- modules/landingpage/models/AppModel.php | 4 ++-- .../landingpage/models/base/TextModelBase.php | 7 ++++--- modules/landingpage/models/pdo/TextModel.php | 7 +++---- modules/ldap/AppController.php | 2 +- modules/ldap/Notification.php | 2 +- modules/ldap/controllers/ConfigController.php | 4 ++-- modules/ldap/controllers/forms/ConfigForm.php | 4 ++-- modules/ldap/database/upgrade/1.0.1.php | 5 ++--- modules/ldap/models/AppDao.php | 2 +- modules/ldap/models/AppModel.php | 4 ++-- modules/ldap/models/base/UserModelBase.php | 5 ++--- modules/ldap/models/pdo/UserModel.php | 4 ++-- modules/metadataextractor/AppController.php | 2 +- modules/metadataextractor/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../components/ExtractorComponent.php | 4 ++-- .../controllers/forms/ConfigForm.php | 4 ++-- modules/mfa/AppController.php | 4 ++-- modules/mfa/Notification.php | 2 +- modules/mfa/controllers/ConfigController.php | 4 ++-- modules/mfa/controllers/LoginController.php | 4 ++-- .../mfa/controllers/components/ApiComponent.php | 4 ++-- .../mfa/controllers/components/OtpComponent.php | 10 +++++----- modules/mfa/models/AppModel.php | 4 ++-- modules/mfa/models/base/ApitokenModelBase.php | 4 ++-- modules/mfa/models/base/OtpdeviceModelBase.php | 4 ++-- modules/mfa/models/pdo/ApitokenModel.php | 4 ++-- modules/mfa/models/pdo/OtpdeviceModel.php | 10 ++++++---- modules/oai/AppController.php | 2 +- modules/oai/Notification.php | 2 +- modules/oai/controllers/ConfigController.php | 4 ++-- modules/oai/controllers/IndexController.php | 2 +- modules/oai/controllers/forms/ConfigForm.php | 4 ++-- modules/oauth/AppController.php | 2 +- modules/oauth/Notification.php | 2 +- .../oauth/controllers/AuthorizeController.php | 2 +- modules/oauth/controllers/ClientController.php | 2 +- modules/oauth/controllers/TokenController.php | 2 +- modules/oauth/models/AppDao.php | 2 +- modules/oauth/models/AppModel.php | 4 ++-- modules/oauth/models/base/ClientModelBase.php | 5 +++-- modules/oauth/models/base/CodeModelBase.php | 5 +++-- modules/oauth/models/base/TokenModelBase.php | 5 +++-- modules/oauth/models/pdo/ClientModel.php | 4 ++-- modules/oauth/models/pdo/CodeModel.php | 4 ++-- modules/oauth/models/pdo/TokenModel.php | 4 ++-- .../controllers/AuthorizeControllerTest.php | 4 ++-- .../tests/controllers/ClientControllerTest.php | 4 ++-- .../tests/controllers/TokenControllerTest.php | 4 ++-- modules/packages/Notification.php | 2 +- .../controllers/ApplicationController.php | 4 ++-- .../packages/controllers/PackageController.php | 4 ++-- modules/packages/controllers/ViewController.php | 4 ++-- .../controllers/components/ApiComponent.php | 4 ++-- modules/packages/models/AppDao.php | 4 ++-- modules/packages/models/AppModel.php | 4 ++-- .../models/base/ApplicationModelBase.php | 4 ++-- .../packages/models/base/ExtensionModelBase.php | 5 ++--- .../packages/models/base/PackageModelBase.php | 4 ++-- .../packages/models/base/ProjectModelBase.php | 4 ++-- .../packages/models/pdo/ApplicationModel.php | 5 +++-- modules/packages/models/pdo/ExtensionModel.php | 5 +++-- modules/packages/models/pdo/PackageModel.php | 6 +++--- modules/packages/models/pdo/ProjectModel.php | 6 +++--- .../tests/controllers/NotificationTest.php | 4 ++-- .../tests/models/base/PackageModelTest.php | 4 ++-- modules/pvw/AppController.php | 2 +- modules/pvw/Notification.php | 2 +- modules/pvw/controllers/ConfigController.php | 4 ++-- modules/pvw/controllers/ParaviewController.php | 4 ++-- .../components/ParaviewComponent.php | 4 ++-- .../components/ValidationComponent.php | 4 ++-- modules/pvw/controllers/forms/ConfigForm.php | 4 ++-- modules/pvw/models/AppDao.php | 2 +- modules/pvw/models/AppModel.php | 5 +++-- modules/pvw/models/base/InstanceModelBase.php | 4 ++-- modules/pvw/models/pdo/InstanceModel.php | 5 +++-- modules/ratings/AppController.php | 2 +- .../ratings/controllers/ConfigController.php | 4 ++-- modules/ratings/controllers/IndexController.php | 4 ++-- .../ratings/controllers/RatingController.php | 4 ++-- .../ratings/controllers/forms/ConfigForm.php | 4 ++-- modules/ratings/models/AppDao.php | 2 +- modules/ratings/models/AppModel.php | 4 ++-- .../ratings/models/base/ItemratingModelBase.php | 5 +++-- modules/ratings/models/pdo/ItemratingModel.php | 6 +++--- modules/readmes/AppController.php | 2 +- modules/readmes/Notification.php | 2 +- .../readmes/controllers/ConfigController.php | 7 +++---- .../controllers/api/CommunityController.php | 6 ++---- .../controllers/api/FolderController.php | 6 ++---- .../components/ApicommunityComponent.php | 5 ++--- .../components/ApifolderComponent.php | 5 ++--- .../components/GetReadmeComponent.php | 4 ++-- modules/readmes/models/AppDao.php | 2 +- modules/readmes/models/AppModel.php | 4 ++-- .../tests/controllers/ReadmesApiTest.php | 5 +++-- modules/remoteprocessing/AppController.php | 2 +- modules/remoteprocessing/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/ExecutableController.php | 4 ++-- .../controllers/IndexController.php | 4 ++-- .../controllers/JobController.php | 4 ++-- .../controllers/components/ApiComponent.php | 4 ++-- .../components/ExecutableComponent.php | 6 ++---- .../controllers/components/JobComponent.php | 6 ++---- .../controllers/forms/ConfigForm.php | 4 ++-- .../remoteprocessing/database/upgrade/1.0.1.php | 6 ++---- .../remoteprocessing/database/upgrade/1.0.2.php | 6 ++---- modules/remoteprocessing/models/AppDao.php | 2 +- modules/remoteprocessing/models/AppModel.php | 5 ++--- .../models/base/JobModelBase.php | 4 ++-- .../remoteprocessing/models/pdo/JobModel.php | 4 ++-- modules/scheduler/AppController.php | 2 +- modules/scheduler/Notification.php | 2 +- .../scheduler/controllers/ConfigController.php | 4 ++-- modules/scheduler/controllers/RunController.php | 4 ++-- .../controllers/WorkflowController.php | 4 ++-- .../controllers/components/EzcComponent.php | 4 ++-- .../scheduler/controllers/forms/ConfigForm.php | 4 ++-- modules/scheduler/database/upgrade/1.0.1.php | 6 ++---- modules/scheduler/database/upgrade/1.0.2.php | 8 ++------ modules/scheduler/database/upgrade/1.0.3.php | 6 ++---- modules/scheduler/models/AppDao.php | 2 +- modules/scheduler/models/AppModel.php | 5 ++--- .../scheduler/models/base/JobLogModelBase.php | 4 ++-- modules/scheduler/models/base/JobModelBase.php | 6 +++--- modules/scheduler/models/pdo/JobLogModel.php | 5 ++--- modules/scheduler/models/pdo/JobModel.php | 5 ++--- modules/sizequota/AppController.php | 2 +- modules/sizequota/Notification.php | 2 +- .../sizequota/controllers/ConfigController.php | 4 ++-- .../controllers/api/QuotaController.php | 7 ++----- .../controllers/components/ApiComponent.php | 6 ++---- .../components/ApiquotaComponent.php | 6 ++---- .../sizequota/controllers/forms/ConfigForm.php | 4 ++-- modules/sizequota/models/AppDao.php | 2 +- modules/sizequota/models/AppModel.php | 4 ++-- .../models/base/FolderQuotaModelBase.php | 4 ++-- .../sizequota/models/pdo/FolderQuotaModel.php | 5 ++--- .../tests/controllers/ConfigControllerTest.php | 4 ++-- modules/solr/AppController.php | 2 +- modules/solr/Notification.php | 2 +- modules/solr/controllers/AdvancedController.php | 4 ++-- modules/solr/controllers/ConfigController.php | 4 ++-- .../solr/controllers/api/SearchController.php | 7 ++----- .../controllers/components/ApiComponent.php | 4 ++-- .../components/ApisearchComponent.php | 4 ++-- .../controllers/components/SolrComponent.php | 4 ++-- modules/solr/controllers/forms/ConfigForm.php | 4 ++-- modules/solr/models/AppDao.php | 2 +- modules/solr/models/AppModel.php | 4 ++-- modules/statistics/AppController.php | 2 +- modules/statistics/Notification.php | 2 +- .../statistics/controllers/ConfigController.php | 4 ++-- .../statistics/controllers/IndexController.php | 4 ++-- .../statistics/controllers/ItemController.php | 4 ++-- .../controllers/components/ReportComponent.php | 4 ++-- .../statistics/controllers/forms/ConfigForm.php | 4 ++-- modules/statistics/database/upgrade/1.0.1.php | 4 ++-- modules/statistics/database/upgrade/1.0.2.php | 4 ++-- modules/statistics/models/AppDao.php | 4 ++-- modules/statistics/models/AppModel.php | 4 ++-- modules/statistics/models/base/DownloadBase.php | 5 ++--- .../models/base/IpLocationModelBase.php | 5 ++--- modules/statistics/models/dao/DownloadDao.php | 4 ++-- modules/statistics/models/dao/IpLocationDao.php | 4 ++-- modules/statistics/models/pdo/DownloadModel.php | 4 ++-- .../statistics/models/pdo/IpLocationModel.php | 4 ++-- .../StatisticsGeolocationLookupTest.php | 4 ++-- .../models/StatisticsDownloadModelTest.php | 4 ++-- modules/thumbnailcreator/AppController.php | 2 +- modules/thumbnailcreator/Notification.php | 2 +- .../controllers/ConfigController.php | 4 ++-- .../controllers/ThumbnailController.php | 4 ++-- .../controllers/api/ItemController.php | 6 ++---- .../controllers/components/ApiComponent.php | 4 ++-- .../controllers/components/ApiitemComponent.php | 4 ++-- .../components/ImagemagickComponent.php | 4 ++-- .../controllers/forms/ConfigForm.php | 4 ++-- .../thumbnailcreator/database/upgrade/1.0.1.php | 5 ++--- .../thumbnailcreator/database/upgrade/1.0.2.php | 6 ++---- modules/thumbnailcreator/models/AppDao.php | 2 +- modules/thumbnailcreator/models/AppModel.php | 6 ++---- .../models/base/ItemthumbnailModelBase.php | 4 ++-- .../models/pdo/ItemthumbnailModel.php | 3 ++- modules/tracker/Notification.php | 2 +- .../tracker/controllers/ConfigController.php | 4 ++-- .../tracker/controllers/ProducerController.php | 4 ++-- .../tracker/controllers/ScalarController.php | 4 ++-- modules/tracker/controllers/TrendController.php | 4 ++-- .../controllers/components/ApiComponent.php | 4 ++-- .../ThresholdNotificationComponent.php | 4 ++-- modules/tracker/database/upgrade/1.0.1.php | 5 ++--- modules/tracker/database/upgrade/1.0.2.php | 5 ++--- modules/tracker/database/upgrade/1.0.3.php | 5 ++--- modules/tracker/database/upgrade/1.0.4.php | 5 ++--- modules/tracker/models/AppDao.php | 4 ++-- modules/tracker/models/AppModel.php | 4 ++-- .../tracker/models/base/ProducerModelBase.php | 4 ++-- modules/tracker/models/base/ScalarModelBase.php | 4 ++-- .../base/ThresholdNotificationModelBase.php | 4 ++-- modules/tracker/models/base/TrendModelBase.php | 4 ++-- modules/tracker/models/pdo/ProducerModel.php | 5 +++-- modules/tracker/models/pdo/ScalarModel.php | 5 +++-- .../models/pdo/ThresholdNotificationModel.php | 5 +++-- modules/tracker/models/pdo/TrendModel.php | 5 +++-- modules/validation/AppController.php | 2 +- modules/validation/Notification.php | 2 +- .../validation/controllers/IndexController.php | 4 ++-- .../controllers/components/ApiComponent.php | 4 ++-- modules/validation/models/AppDao.php | 4 ++-- modules/validation/models/AppModel.php | 4 ++-- .../models/base/DashboardModelBase.php | 5 ++--- .../models/base/ScalarResultModelBase.php | 4 ++-- .../validation/models/pdo/DashboardModel.php | 6 +++--- .../validation/models/pdo/ScalarResultModel.php | 5 +++-- .../controllers/ApiComponentControllerTest.php | 4 +--- .../tests/models/base/DashboardModelTest.php | 5 +++-- .../tests/models/base/ScalarResultModelTest.php | 4 ++-- modules/visualize/AppController.php | 2 +- modules/visualize/Notification.php | 2 +- .../visualize/controllers/ConfigController.php | 4 ++-- .../visualize/controllers/ImageController.php | 4 ++-- .../visualize/controllers/IndexController.php | 2 +- .../visualize/controllers/MediaController.php | 4 ++-- .../controllers/ParaviewController.php | 4 ++-- modules/visualize/controllers/PdfController.php | 4 ++-- modules/visualize/controllers/TxtController.php | 4 ++-- .../visualize/controllers/WebglController.php | 4 ++-- .../visualize/controllers/WrapperController.php | 2 +- .../controllers/components/MainComponent.php | 4 ++-- .../visualize/controllers/forms/ConfigForm.php | 4 ++-- modules/visualize/models/AppDao.php | 2 +- modules/visualize/models/AppModel.php | 4 ++-- 508 files changed, 988 insertions(+), 1159 deletions(-) diff --git a/core/ApiController.php b/core/ApiController.php index fface8330..b8e1f5740 100644 --- a/core/ApiController.php +++ b/core/ApiController.php @@ -216,4 +216,4 @@ public function optionsAction() $this->_response->setHeader('Allow', 'OPTIONS'); } - } //end class + } // end class diff --git a/core/AppController.php b/core/AppController.php index d9d71ecf2..4c05cebce 100644 --- a/core/AppController.php +++ b/core/AppController.php @@ -668,4 +668,4 @@ protected function t($text) var $Setting; /**end completion eclipse */ - }//end class + } // end class diff --git a/core/AppForm.php b/core/AppForm.php index 869314e63..2c02ad462 100644 --- a/core/AppForm.php +++ b/core/AppForm.php @@ -35,4 +35,4 @@ protected function t($text) Zend_Loader::loadClass("InternationalizationComponent", BASE_PATH.'/core/controllers/components'); return InternationalizationComponent::translate($text); }//en method t - }//end class + } // end class diff --git a/core/GlobalComponent.php b/core/GlobalComponent.php index 2b1443597..9f29cb459 100644 --- a/core/GlobalComponent.php +++ b/core/GlobalComponent.php @@ -23,7 +23,7 @@ * Provides global function to the components */ class MIDAS_GlobalComponent extends Zend_Controller_Action_Helper_Abstract -{ + { /** * Get Logger * @return Zend_Log @@ -32,4 +32,4 @@ public function getLogger() { return Zend_Registry::get('logger'); } -} // end class \ No newline at end of file + } // end class diff --git a/core/GlobalController.php b/core/GlobalController.php index d53ddf27d..72efb5538 100644 --- a/core/GlobalController.php +++ b/core/GlobalController.php @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH.'/core/controllers/components/UtilityComponent.php'; /** @@ -25,7 +26,6 @@ */ class MIDAS_GlobalController extends Zend_Controller_Action { - protected $Models = array(); /** contructor*/ @@ -345,4 +345,4 @@ public function getFormAsArray(Zend_Form $form) } return $array; } -} // end class + } // end class diff --git a/core/MidasLoader.php b/core/MidasLoader.php index 1cf35efa9..241ce01eb 100644 --- a/core/MidasLoader.php +++ b/core/MidasLoader.php @@ -23,7 +23,7 @@ * It handles importing the required file and instantiating the object of the desired type. */ class MidasLoader -{ + { /** * Load a component * @param component The name of the component to load @@ -187,4 +187,4 @@ public static function newDao($name, $module = 'core') return new $classname; } } -} // end class + } // end class diff --git a/core/Notification.php b/core/Notification.php index afd815438..862b3b3e9 100644 --- a/core/Notification.php +++ b/core/Notification.php @@ -96,4 +96,4 @@ public function tokenAuth($params) $token = $params['authToken']; return $this->Component->Authentication->getUser(array('token' => $token), null); } - } //end class + } // end class diff --git a/core/controllers/AdminController.php b/core/controllers/AdminController.php index d38430ef7..847339dfa 100644 --- a/core/controllers/AdminController.php +++ b/core/controllers/AdminController.php @@ -22,7 +22,7 @@ * Admin Controller */ class AdminController extends AppController -{ + { public $_models = array('Assetstore', 'Bitstream', 'Errorlog', 'Item', 'ItemRevision', 'Folder', 'License'); public $_daos = array(); public $_components = array('Upgrade', 'Utility', 'MIDAS2Migration', 'Demo'); @@ -715,5 +715,4 @@ function migratemidas2Action() // Display the form } - -} // end class + } // end class diff --git a/core/controllers/ApidocsController.php b/core/controllers/ApidocsController.php index 2576b6cb7..09af568b7 100644 --- a/core/controllers/ApidocsController.php +++ b/core/controllers/ApidocsController.php @@ -22,7 +22,7 @@ * Apidocs Controller for WebApi **/ class ApidocsController extends AppController -{ + { public $_components = array('Apidocs'); /** init api actions*/ @@ -79,5 +79,4 @@ public function __call($name, $args) $results = $this->Component->Apidocs->getResourceApiDocs($resource, $module); echo JsonComponent::encode($results); } - -} + } diff --git a/core/controllers/ApikeyController.php b/core/controllers/ApikeyController.php index ef59d9534..588da3836 100644 --- a/core/controllers/ApikeyController.php +++ b/core/controllers/ApikeyController.php @@ -20,7 +20,7 @@ /** Apikey controller for Web Api */ class ApikeyController extends AppController -{ + { public $_models = array('User', 'Userapi'); public $_forms = array('Apikey'); public $_components = array('Date'); @@ -92,5 +92,4 @@ function usertabAction() $this->view->userapiDaos = $userapiDaos; $this->view->user = $user; } - -}//end class + } // end class diff --git a/core/controllers/AssetstoreController.php b/core/controllers/AssetstoreController.php index 8c5fb3640..c331b9252 100644 --- a/core/controllers/AssetstoreController.php +++ b/core/controllers/AssetstoreController.php @@ -24,7 +24,6 @@ */ class AssetstoreController extends AppController { - public $_models = array('Assetstore', 'Bitstream', 'Progress', 'Setting'); public $_daos = array('Assetstore'); public $_components = array('Utility'); @@ -262,5 +261,4 @@ function movecontentsAction() echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Bitstreams moved')); } -} // end class - + } // end class diff --git a/core/controllers/BrowseController.php b/core/controllers/BrowseController.php index ae1c93887..bd4dbfe50 100644 --- a/core/controllers/BrowseController.php +++ b/core/controllers/BrowseController.php @@ -22,7 +22,7 @@ * AJAX request for the admin Controller */ class BrowseController extends AppController -{ + { public $_models = array('User', 'Community', 'Folder', 'Item', 'ItemRevision'); public $_daos = array('User', 'Community', 'Folder', 'Item'); public $_components = array('Date', 'Utility', 'Sortdao'); @@ -645,4 +645,4 @@ public function deleteAction() } echo JsonComponent::encode($resp); } -} // end class + } // end class diff --git a/core/controllers/CommunityController.php b/core/controllers/CommunityController.php index 6d465a38b..4c16e40f5 100644 --- a/core/controllers/CommunityController.php +++ b/core/controllers/CommunityController.php @@ -814,4 +814,4 @@ public function selectgroupAction() } } } - }//end class + } // end class diff --git a/core/controllers/DownloadController.php b/core/controllers/DownloadController.php index 790615e53..7bfd068ca 100644 --- a/core/controllers/DownloadController.php +++ b/core/controllers/DownloadController.php @@ -22,7 +22,7 @@ * Controller for downloading elements. */ class DownloadController extends AppController -{ + { public $_models = array('Folder', 'Item', 'Community', 'User', 'Bitstream'); public $_daos = array(); public $_components = array('DownloadBitstream'); @@ -546,4 +546,4 @@ private function _downloadEmptyItem($item) $zip->finish(); exit(); } -} // end class + } // end class diff --git a/core/controllers/ErrorController.php b/core/controllers/ErrorController.php index d0ef5423c..10dcd42dd 100644 --- a/core/controllers/ErrorController.php +++ b/core/controllers/ErrorController.php @@ -20,7 +20,7 @@ /** Error Controller*/ class ErrorController extends AppController -{ + { public $_models = array(); public $_daos = array(); public $_components = array('NotifyError', 'Utility'); @@ -154,4 +154,4 @@ private function _applicationError() $this->view->message = nl2br($fullMessage); } } -} \ No newline at end of file + } diff --git a/core/controllers/FeedController.php b/core/controllers/FeedController.php index d446be721..086090d6a 100644 --- a/core/controllers/FeedController.php +++ b/core/controllers/FeedController.php @@ -22,7 +22,7 @@ * AJAX request for the admin Controller */ class FeedController extends AppController -{ + { public $_models = array('Feed', 'Item', 'User', 'Community'); public $_daos = array(); public $_components = array(); @@ -87,7 +87,5 @@ public function deleteajaxAction() return; } $this->Feed->delete($feed); - }//end deleteajaxAction - -} // end class - + } //end deleteajaxAction + } // end class diff --git a/core/controllers/FolderController.php b/core/controllers/FolderController.php index 3cfdf7ddc..1745ccb3a 100644 --- a/core/controllers/FolderController.php +++ b/core/controllers/FolderController.php @@ -420,4 +420,4 @@ public function createfolderAction() } }// end createfolderAction - }//end class + } // end class diff --git a/core/controllers/ImportController.php b/core/controllers/ImportController.php index 72c293cb2..0ec80390e 100644 --- a/core/controllers/ImportController.php +++ b/core/controllers/ImportController.php @@ -419,4 +419,4 @@ function stopAction() return false; } // end stopAction -} // end class + } // end class diff --git a/core/controllers/IndexController.php b/core/controllers/IndexController.php index 6cc7f86e0..403b2c641 100644 --- a/core/controllers/IndexController.php +++ b/core/controllers/IndexController.php @@ -58,4 +58,4 @@ function nobrowserAction() $this->disableLayout(); } // end method indexAction -}//end class \ No newline at end of file + } // end class diff --git a/core/controllers/InstallController.php b/core/controllers/InstallController.php index 6cf5e6d32..355f07efa 100644 --- a/core/controllers/InstallController.php +++ b/core/controllers/InstallController.php @@ -22,7 +22,7 @@ * InstallController */ class InstallController extends AppController -{ + { public $_models = array('User', 'Assetstore'); public $_daos = array('Assetstore'); public $_components = array('Utility'); @@ -353,6 +353,4 @@ public function testconnexionAction() } echo JsonComponent::encode($return); }//end getElementInfo - -} // end class - + } // end class diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php index 593f3f037..de9237f2e 100644 --- a/core/controllers/ItemController.php +++ b/core/controllers/ItemController.php @@ -722,4 +722,4 @@ public function thumbnailAction() $downloadBitstreamComponent->download($bitstream); } } - }//end class + } // end class diff --git a/core/controllers/LicenseController.php b/core/controllers/LicenseController.php index a04f3cc6d..89d694a54 100644 --- a/core/controllers/LicenseController.php +++ b/core/controllers/LicenseController.php @@ -23,7 +23,6 @@ */ class LicenseController extends AppController { - public $_models = array('License'); public $_daos = array('License'); public $_components = array(); @@ -123,4 +122,4 @@ function createAction() $this->License->save($license); echo JsonComponent::encode(array(true, 'Created new license')); } -} + } diff --git a/core/controllers/ProgressController.php b/core/controllers/ProgressController.php index 301b46fcf..40026d586 100644 --- a/core/controllers/ProgressController.php +++ b/core/controllers/ProgressController.php @@ -23,7 +23,6 @@ */ class ProgressController extends AppController { - public $_models = array('Progress'); public $_daos = array(); public $_components = array(); @@ -76,4 +75,4 @@ public function getAction() echo JsonComponent::encode($progress->toArray()); } } -} + } diff --git a/core/controllers/SearchController.php b/core/controllers/SearchController.php index c8d6dfe58..c3c54e0a4 100644 --- a/core/controllers/SearchController.php +++ b/core/controllers/SearchController.php @@ -22,7 +22,7 @@ * Search controller */ class SearchController extends AppController -{ + { public $_models = array('Item', 'Folder', 'User', 'Community', 'Group'); public $_daos = array('Item', 'Folder', 'User', 'Community'); public $_components = array('Sortdao', 'Date', 'Utility', 'Search'); @@ -336,6 +336,5 @@ public function liveAction() echo JsonComponent::encode($results); } - -} // end class + } // end class diff --git a/core/controllers/ShareController.php b/core/controllers/ShareController.php index d84798aa2..bec158137 100644 --- a/core/controllers/ShareController.php +++ b/core/controllers/ShareController.php @@ -378,5 +378,5 @@ function linksAction() $this->view->viewUrl = $baseUrl.'/'.$type.'/'.$id; $this->view->downloadUrl = $baseUrl.'/download/'.$type.'/'.$id.'/'.urlencode($name); } - }//end class + } // end class diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php index b3d15ebcd..745b5240e 100644 --- a/core/controllers/UploadController.php +++ b/core/controllers/UploadController.php @@ -788,4 +788,4 @@ public function reviewAction() $this->_redirect('/community/'); } } -}//end class + } // end class diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php index 5604080c6..3295c3e28 100644 --- a/core/controllers/UserController.php +++ b/core/controllers/UserController.php @@ -1284,4 +1284,4 @@ public function deleteAction() $this->getLogger()->info('User '.$name.' successfully deleted'); echo JsonComponent::encode(array(true, 'User '.$name.' successfully deleted')); } - }//end class + } // end class diff --git a/core/controllers/api/BitstreamController.php b/core/controllers/api/BitstreamController.php index 1535cce03..7d95f99e9 100644 --- a/core/controllers/api/BitstreamController.php +++ b/core/controllers/api/BitstreamController.php @@ -22,7 +22,7 @@ * WebApi Controller for Bitstream Resource */ class Rest_BitstreamController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -91,4 +91,4 @@ public function deleteAction() $apiFunctions['default'] = 'bitstreamDelete'; $this->_genericAction($this->_request->getParams(), $this->_request->getControllerName(), 'delete', $apiFunctions); } -} + } diff --git a/core/controllers/api/CommunityController.php b/core/controllers/api/CommunityController.php index 02defb778..fa313ff16 100644 --- a/core/controllers/api/CommunityController.php +++ b/core/controllers/api/CommunityController.php @@ -22,8 +22,7 @@ * WebApi Controller for Community Resource */ class Rest_CommunityController extends ApiController -{ - + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -89,5 +88,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST, DELETE'); } - -} + } diff --git a/core/controllers/api/FolderController.php b/core/controllers/api/FolderController.php index ca40abf99..5b51be4d9 100644 --- a/core/controllers/api/FolderController.php +++ b/core/controllers/api/FolderController.php @@ -22,7 +22,7 @@ * WebApi Controller for Folder Resource */ class Rest_FolderController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -107,5 +107,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST, PUT, DELETE'); } - -} + } diff --git a/core/controllers/api/GroupController.php b/core/controllers/api/GroupController.php index 5e373c464..5c28154cf 100644 --- a/core/controllers/api/GroupController.php +++ b/core/controllers/api/GroupController.php @@ -22,7 +22,7 @@ * WebApi Controller for Group Resource */ class Rest_GroupController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -98,5 +98,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, PUT, POST, DELETE'); } - -} + } diff --git a/core/controllers/api/IndexController.php b/core/controllers/api/IndexController.php index 500c5fa8c..202e140fa 100644 --- a/core/controllers/api/IndexController.php +++ b/core/controllers/api/IndexController.php @@ -22,7 +22,7 @@ * Index Controller for WebApi **/ class Rest_IndexController extends AppController -{ + { public function preDispatch() { parent::preDispatch(); @@ -38,4 +38,4 @@ function indexAction() $this->view->header = $header; $this->view->serverURL = $this->getServerURL(); } -} + } diff --git a/core/controllers/api/ItemController.php b/core/controllers/api/ItemController.php index cc898c510..af9208bc7 100644 --- a/core/controllers/api/ItemController.php +++ b/core/controllers/api/ItemController.php @@ -22,7 +22,7 @@ * WebApi Controller for Item Resource */ class Rest_ItemController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -116,5 +116,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST, PUT, DELETE'); } - -} + } diff --git a/core/controllers/api/ItemrevisionController.php b/core/controllers/api/ItemrevisionController.php index b053a8522..881ab0f7f 100644 --- a/core/controllers/api/ItemrevisionController.php +++ b/core/controllers/api/ItemrevisionController.php @@ -22,8 +22,7 @@ * WebApi Controller for ItemRevision Resource */ class Rest_ItemrevisionController extends ApiController -{ - + { /** * The head action handles HEAD requests; it should respond with an * identical response to the one that would correspond to a GET request, @@ -55,5 +54,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET'); } - - } // end of class \ No newline at end of file + } // end of class diff --git a/core/controllers/api/SystemController.php b/core/controllers/api/SystemController.php index 21cfd0527..4841c4550 100644 --- a/core/controllers/api/SystemController.php +++ b/core/controllers/api/SystemController.php @@ -22,7 +22,7 @@ * WebApi Controller for System Resource */ class Rest_SystemController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -89,5 +89,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST, PUT'); } - -} + } diff --git a/core/controllers/api/UserController.php b/core/controllers/api/UserController.php index 80d973065..50c728688 100644 --- a/core/controllers/api/UserController.php +++ b/core/controllers/api/UserController.php @@ -22,7 +22,7 @@ * WebApi Controller for User Resource */ class Rest_UserController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -66,5 +66,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET'); } - -} + } diff --git a/core/controllers/components/AuthenticationComponent.php b/core/controllers/components/AuthenticationComponent.php index fcdd708a7..da69d4b83 100644 --- a/core/controllers/components/AuthenticationComponent.php +++ b/core/controllers/components/AuthenticationComponent.php @@ -20,8 +20,7 @@ /** Web API Authentication Component */ class AuthenticationComponent extends AppComponent -{ - + { /** Constructor */ function __construct() { @@ -84,4 +83,4 @@ public function getUser($args, $sessionDao) return $userDao; } } -} + } diff --git a/core/controllers/components/BreadcrumbComponent.php b/core/controllers/components/BreadcrumbComponent.php index 4fe8aae21..0e5e51030 100644 --- a/core/controllers/components/BreadcrumbComponent.php +++ b/core/controllers/components/BreadcrumbComponent.php @@ -22,7 +22,7 @@ * Use this component to generate consistent breadcrumb bars for Midas */ class BreadcrumbComponent extends AppComponent -{ + { /** * Build a breadcrumb bar for the header and set it on the view provided * @param nodes An ordered list of nodes. Each node must have a 'type' key whose value is @@ -216,4 +216,4 @@ protected function _createCustomBreadcrumb($node, &$view) $str .= ''; return $str; } -} // end class \ No newline at end of file + } // end class diff --git a/core/controllers/components/DownloadBitstreamComponent.php b/core/controllers/components/DownloadBitstreamComponent.php index 01761df70..62f8ab866 100644 --- a/core/controllers/components/DownloadBitstreamComponent.php +++ b/core/controllers/components/DownloadBitstreamComponent.php @@ -167,7 +167,7 @@ function download($bitstream, $offset = 0, $incrementDownload = false) exit(); } } - } //end class + } // end class /** * Gets an environment variable from available sources, and provides emulation diff --git a/core/controllers/components/ExportComponent.php b/core/controllers/components/ExportComponent.php index 5eb332b1c..67c62f4c5 100644 --- a/core/controllers/components/ExportComponent.php +++ b/core/controllers/components/ExportComponent.php @@ -30,8 +30,7 @@ */ class ExportComponent extends AppComponent -{ - + { /** * Helper function to create a directory for an item * @@ -189,5 +188,4 @@ function exportBitstreams($userDao, $targetDir, $itemIds, $shouldSymLink) } // end foreach ($revisions ... } } // end function exportBitstreams - -} // end class ExportComponent + } // end class diff --git a/core/controllers/components/FilterComponent.php b/core/controllers/components/FilterComponent.php index a7ec1dc59..c8bb28914 100644 --- a/core/controllers/components/FilterComponent.php +++ b/core/controllers/components/FilterComponent.php @@ -20,7 +20,7 @@ /** Sort Daos*/ class FilterComponent extends AppComponent -{ + { /** get a filter*/ public function getFilter($filter) { @@ -31,4 +31,4 @@ public function getFilter($filter) } return new $filter(); } -} // end class \ No newline at end of file + } // end class diff --git a/core/controllers/components/InternationalizationComponent.php b/core/controllers/components/InternationalizationComponent.php index 0991bc16e..f6e457f66 100644 --- a/core/controllers/components/InternationalizationComponent.php +++ b/core/controllers/components/InternationalizationComponent.php @@ -79,4 +79,4 @@ static public function isDebug() return false; } } -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/core/controllers/components/JsonComponent.php b/core/controllers/components/JsonComponent.php index 93acfd7c0..5b62762eb 100644 --- a/core/controllers/components/JsonComponent.php +++ b/core/controllers/components/JsonComponent.php @@ -134,4 +134,4 @@ private function _utf8_decode_array(&$array, $key) $array = utf8_decode($array); } } -} + } diff --git a/core/controllers/components/MIDAS2MigrationComponent.php b/core/controllers/components/MIDAS2MigrationComponent.php index b52cc085a..a6fd4d7ab 100644 --- a/core/controllers/components/MIDAS2MigrationComponent.php +++ b/core/controllers/components/MIDAS2MigrationComponent.php @@ -38,7 +38,7 @@ /** Migration tool*/ class MIDAS2MigrationComponent extends AppComponent -{ + { /** These variables should be set by the UI */ var $midas2User = "midas"; var $midas2Password = "midas"; @@ -593,5 +593,4 @@ function migrate($userid) // Close the database connection pg_close($pgdb); } // end function migrate() - -} // end class + } // end class diff --git a/core/controllers/components/SearchComponent.php b/core/controllers/components/SearchComponent.php index f1da2b01c..ac0e9f914 100644 --- a/core/controllers/components/SearchComponent.php +++ b/core/controllers/components/SearchComponent.php @@ -20,7 +20,7 @@ /** Search component */ class SearchComponent extends AppComponent -{ + { /** search all the results */ public function searchAll($userDao, $search, $order) { @@ -143,5 +143,5 @@ private function _formatResults($order, $items, $folders, $communities, $users) $resultsArray[] = $tmp; } return $resultsArray; - }//formatResults -} + } //formatResults + } diff --git a/core/controllers/components/UpgradeComponent.php b/core/controllers/components/UpgradeComponent.php index b00bbac4a..9730f1c4d 100644 --- a/core/controllers/components/UpgradeComponent.php +++ b/core/controllers/components/UpgradeComponent.php @@ -21,7 +21,6 @@ /** Upgrade MIDAS*/ class UpgradeComponent extends AppComponent { - public $dir; protected $module; protected $db; @@ -269,4 +268,4 @@ protected function _processFile($migration) $class->$dbtypeShort(); $class->postUpgrade(); } -} // end class \ No newline at end of file + } // end class diff --git a/core/controllers/components/UploadComponent.php b/core/controllers/components/UploadComponent.php index 704ddd4db..c217c52a1 100644 --- a/core/controllers/components/UploadComponent.php +++ b/core/controllers/components/UploadComponent.php @@ -20,8 +20,7 @@ /** This class handles the upload of files into the different assetstores */ class UploadComponent extends AppComponent -{ - + { /** Helper function to create the two-level hierarchy */ private function _createAssetstoreDirectory($directorypath) { @@ -406,4 +405,4 @@ public function createNewRevision($userDao, $name, $path, $changes, $itemId, $it return $item; }//end -} // end class UploadComponent + } // end class diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php index eadfc4bc5..f13ec08ef 100644 --- a/core/controllers/components/UtilityComponent.php +++ b/core/controllers/components/UtilityComponent.php @@ -20,8 +20,7 @@ /** Utility componenet */ class UtilityComponent extends AppComponent -{ - + { /** * The main function for converting to an XML document. * Pass in a multi dimensional array and this recrusively loops through and builds up an XML document. @@ -689,5 +688,4 @@ public static function isPortListening($port, $host = 'localhost') } return false; } - -} // end class + } // end class diff --git a/core/controllers/components/UuidComponent.php b/core/controllers/components/UuidComponent.php index ebb004af2..b46cc59f4 100644 --- a/core/controllers/components/UuidComponent.php +++ b/core/controllers/components/UuidComponent.php @@ -20,8 +20,7 @@ /** UuidComponent componenet */ class UuidComponent extends AppComponent -{ - + { /** Get using id*/ public function getByUid($uuid) { @@ -66,4 +65,4 @@ public function getByUid($uuid) } return false; } -} // end class + } // end class diff --git a/core/controllers/forms/AdminForm.php b/core/controllers/forms/AdminForm.php index a418a73f7..dc96bebbf 100644 --- a/core/controllers/forms/AdminForm.php +++ b/core/controllers/forms/AdminForm.php @@ -20,7 +20,7 @@ /** Admin forms*/ class AdminForm extends AppForm -{ + { /** create form */ public function createConfigForm() { @@ -70,5 +70,4 @@ public function createConfigForm() $verifyEmail)); return $form; } - -} // end class + } // end class diff --git a/core/controllers/forms/ApikeyForm.php b/core/controllers/forms/ApikeyForm.php index 0879b8623..17e87404e 100644 --- a/core/controllers/forms/ApikeyForm.php +++ b/core/controllers/forms/ApikeyForm.php @@ -20,7 +20,7 @@ /** Apikey form */ class ApikeyForm extends AppForm -{ + { /** create form */ public function createKeyForm() { @@ -38,4 +38,4 @@ public function createKeyForm() $form->addElements(array($appplication_name, $expiration, $submit)); return $form; } -} // end class + } // end class diff --git a/core/controllers/forms/AssetstoreForm.php b/core/controllers/forms/AssetstoreForm.php index c61e0f759..61624fbae 100644 --- a/core/controllers/forms/AssetstoreForm.php +++ b/core/controllers/forms/AssetstoreForm.php @@ -20,7 +20,7 @@ /** Assetstore forms*/ class AssetstoreForm extends AppForm -{ + { /** Create assetstore form*/ public function createAssetstoreForm() { @@ -70,4 +70,4 @@ public function createAssetstoreForm() return $form; } -} // end class + } // end class diff --git a/core/controllers/forms/CommunityForm.php b/core/controllers/forms/CommunityForm.php index 5ca1efd32..637254695 100644 --- a/core/controllers/forms/CommunityForm.php +++ b/core/controllers/forms/CommunityForm.php @@ -20,7 +20,7 @@ /** Community forms*/ class CommunityForm extends AppForm -{ + { /** create create community form */ public function createCreateForm() { @@ -130,5 +130,4 @@ public function createCreateGroupForm() $form->addElements(array($name, $submit)); return $form; } - -} // end class + } // end class diff --git a/core/controllers/forms/FolderForm.php b/core/controllers/forms/FolderForm.php index b47f76fde..4b75073af 100644 --- a/core/controllers/forms/FolderForm.php +++ b/core/controllers/forms/FolderForm.php @@ -20,7 +20,7 @@ /** Folder forms*/ class FolderForm extends AppForm -{ + { /** create edit folder form */ public function createEditForm() { @@ -45,5 +45,4 @@ public function createEditForm() $form->addElements(array($name, $description, $submit, $teaser)); return $form; } - -} // end class + } // end class diff --git a/core/controllers/forms/ImportForm.php b/core/controllers/forms/ImportForm.php index 474d545b6..664066924 100644 --- a/core/controllers/forms/ImportForm.php +++ b/core/controllers/forms/ImportForm.php @@ -20,7 +20,7 @@ /** Import forms*/ class ImportForm extends AppForm -{ + { /** Main form*/ public function createImportForm($assetstores) { @@ -129,4 +129,4 @@ public function createImportForm($assetstores) return $form; } -} // end class + } // end class diff --git a/core/controllers/forms/InstallForm.php b/core/controllers/forms/InstallForm.php index f09d5d527..ef633c51e 100644 --- a/core/controllers/forms/InstallForm.php +++ b/core/controllers/forms/InstallForm.php @@ -20,7 +20,7 @@ /** Install forms*/ class InstallForm extends AppForm -{ + { /** create form */ public function createDBForm($type) { @@ -137,4 +137,4 @@ public function createConfigForm() $form->addElements(array($keywords, $description, $process, $timezone, $environment, $lang, $name, $smartoptimizer, $submit)); return $form; } -} // end class \ No newline at end of file + } // end class diff --git a/core/controllers/forms/ItemForm.php b/core/controllers/forms/ItemForm.php index 0f15fda65..39aeba7fb 100644 --- a/core/controllers/forms/ItemForm.php +++ b/core/controllers/forms/ItemForm.php @@ -20,7 +20,7 @@ /** Folder forms*/ class ItemForm extends AppForm -{ + { /** create edit folder form */ public function createEditForm() { @@ -60,5 +60,4 @@ public function createEditBitstreamForm() $form->addElements(array($name, $mimetype, $submit)); return $form; } - -} // end class + } // end class diff --git a/core/controllers/forms/MigrateForm.php b/core/controllers/forms/MigrateForm.php index d156ca8f6..cd60e5f47 100644 --- a/core/controllers/forms/MigrateForm.php +++ b/core/controllers/forms/MigrateForm.php @@ -20,7 +20,7 @@ /** Migrate form */ class MigrateForm extends AppForm -{ + { /** Main form*/ public function createMigrateForm($assetstores) { @@ -101,4 +101,4 @@ public function createMigrateForm($assetstores) return $form; } -} // end class + } // end class diff --git a/core/controllers/forms/UploadForm.php b/core/controllers/forms/UploadForm.php index 61dbea7b9..5a509e30b 100644 --- a/core/controllers/forms/UploadForm.php +++ b/core/controllers/forms/UploadForm.php @@ -20,7 +20,7 @@ /** Upload forms*/ class UploadForm extends AppForm -{ + { /** create upload link form */ public function createUploadLinkForm() { @@ -47,5 +47,4 @@ public function createUploadLinkForm() $form->addElements(array($name, $url, $submit)); return $form; } - -} // end class \ No newline at end of file + } // end class diff --git a/core/controllers/forms/UserForm.php b/core/controllers/forms/UserForm.php index d5c921c20..0fe000459 100644 --- a/core/controllers/forms/UserForm.php +++ b/core/controllers/forms/UserForm.php @@ -20,7 +20,7 @@ /** User forms*/ class UserForm extends AppForm -{ + { /** create login form */ public function createLoginForm() { @@ -206,4 +206,4 @@ public function createAccountForm($defaultValue = array()) return $form; } -} // end class + } // end class diff --git a/core/database/upgrade/3.0.1.php b/core/database/upgrade/3.0.1.php index f9dba2a47..a70c3ecb2 100644 --- a/core/database/upgrade/3.0.1.php +++ b/core/database/upgrade/3.0.1.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_1 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -59,6 +58,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.10.php b/core/database/upgrade/3.0.10.php index 8f60b76d3..d291f7268 100644 --- a/core/database/upgrade/3.0.10.php +++ b/core/database/upgrade/3.0.10.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_10 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -40,6 +39,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.11.php b/core/database/upgrade/3.0.11.php index 920490499..5e06b4084 100644 --- a/core/database/upgrade/3.0.11.php +++ b/core/database/upgrade/3.0.11.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_11 extends MIDASUpgrade -{ + { public function preUpgrade() - { - + { } public function mysql() @@ -53,6 +52,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.12.php b/core/database/upgrade/3.0.12.php index 8aa843035..5ab7cb81b 100644 --- a/core/database/upgrade/3.0.12.php +++ b/core/database/upgrade/3.0.12.php @@ -19,25 +19,23 @@ =========================================================================*/ class Upgrade_3_0_12 extends MIDASUpgrade -{ + { public function preUpgrade() { - } - + public function mysql() { $sql = "DROP TABLE uniqueidentifier ; "; $this->db->query($sql); } - public function pgsql() { $sql = "DROP TABLE uniqueidentifier; "; $this->db->query($sql); } - + public function postUpgrade() { $this->addTableField('community', 'uuid', 'varchar(255)', ' character varying(512)', null); @@ -45,6 +43,5 @@ public function postUpgrade() $this->addTableField('item', 'uuid', 'varchar(255)', ' character varying(512)', null); $this->addTableField('folder', 'uuid', 'varchar(255)', ' character varying(512)', null); $this->addTableField('itemrevision', 'uuid', 'varchar(255)', ' character varying(512)', null); - } -} + } diff --git a/core/database/upgrade/3.0.13.php b/core/database/upgrade/3.0.13.php index 726132a08..83f4d9a25 100644 --- a/core/database/upgrade/3.0.13.php +++ b/core/database/upgrade/3.0.13.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_0_13 extends MIDASUpgrade -{ + { public function preUpgrade() { $this->addTableField('metadatadocumentvalue', 'metadatavalue_id', 'bigint(20)', 'serial',false); @@ -44,4 +44,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.0.14.php b/core/database/upgrade/3.0.14.php index ef38fa604..973d30842 100644 --- a/core/database/upgrade/3.0.14.php +++ b/core/database/upgrade/3.0.14.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_0_14 extends MIDASUpgrade -{ + { public function preUpgrade() { // Insert common metadata @@ -51,4 +51,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.0.15.php b/core/database/upgrade/3.0.15.php index 6c872c27f..1312ee2f5 100644 --- a/core/database/upgrade/3.0.15.php +++ b/core/database/upgrade/3.0.15.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_0_15 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -28,7 +28,6 @@ public function mysql() { } - public function pgsql() { } @@ -40,4 +39,4 @@ public function postUpgrade() $this->addTableField('user', 'website', 'varchar(255)', ' character varying(255)', null); $this->addTableField('user', 'biography', 'varchar(255)', ' character varying(255)', null); } -} + } diff --git a/core/database/upgrade/3.0.16.php b/core/database/upgrade/3.0.16.php index dcc3bdb27..b4c237e3e 100644 --- a/core/database/upgrade/3.0.16.php +++ b/core/database/upgrade/3.0.16.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_0_16 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -40,4 +40,4 @@ public function postUpgrade() $this->renameTableField('folder', 'date', 'date_update', 'timestamp', 'timestamp without time zone', false); $this->addTableField('folder', 'date_creation', 'timestamp', 'timestamp without time zone', false); } -} + } diff --git a/core/database/upgrade/3.0.2.php b/core/database/upgrade/3.0.2.php index 72b16d1bc..46e8debfb 100644 --- a/core/database/upgrade/3.0.2.php +++ b/core/database/upgrade/3.0.2.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_2 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -38,7 +37,6 @@ public function pgsql() } public function postUpgrade() - { - + { } -} + } diff --git a/core/database/upgrade/3.0.3.php b/core/database/upgrade/3.0.3.php index fcbf0c3a8..e34dbee1e 100644 --- a/core/database/upgrade/3.0.3.php +++ b/core/database/upgrade/3.0.3.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_3 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -39,6 +38,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.4.php b/core/database/upgrade/3.0.4.php index 08ad72ce4..487200255 100644 --- a/core/database/upgrade/3.0.4.php +++ b/core/database/upgrade/3.0.4.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_4 extends MIDASUpgrade -{ + { public function preUpgrade() - { - + { } public function mysql() @@ -38,7 +37,6 @@ public function pgsql() } public function postUpgrade() - { - + { } -} + } diff --git a/core/database/upgrade/3.0.5.php b/core/database/upgrade/3.0.5.php index e97b54386..c7257885c 100644 --- a/core/database/upgrade/3.0.5.php +++ b/core/database/upgrade/3.0.5.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_5 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -47,6 +46,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.6.php b/core/database/upgrade/3.0.6.php index b018d764f..678845bdd 100644 --- a/core/database/upgrade/3.0.6.php +++ b/core/database/upgrade/3.0.6.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_6 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -44,6 +43,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.7.php b/core/database/upgrade/3.0.7.php index 9d41d77fd..ee8bd39d2 100644 --- a/core/database/upgrade/3.0.7.php +++ b/core/database/upgrade/3.0.7.php @@ -17,11 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + class Upgrade_3_0_7 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -39,6 +39,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.8.php b/core/database/upgrade/3.0.8.php index 462616246..6e36eca9f 100644 --- a/core/database/upgrade/3.0.8.php +++ b/core/database/upgrade/3.0.8.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_8 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -43,6 +42,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/core/database/upgrade/3.0.9.php b/core/database/upgrade/3.0.9.php index 56f9dbfd4..bd260b5da 100644 --- a/core/database/upgrade/3.0.9.php +++ b/core/database/upgrade/3.0.9.php @@ -19,10 +19,9 @@ =========================================================================*/ class Upgrade_3_0_9 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -52,7 +51,6 @@ public function pgsql() } public function postUpgrade() - { - + { } -} + } diff --git a/core/database/upgrade/3.1.0.php b/core/database/upgrade/3.1.0.php index b5f002295..8386b8081 100644 --- a/core/database/upgrade/3.1.0.php +++ b/core/database/upgrade/3.1.0.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_1_0 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -37,4 +37,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.1.1.php b/core/database/upgrade/3.1.1.php index 5200991e2..bfba5ec0b 100644 --- a/core/database/upgrade/3.1.1.php +++ b/core/database/upgrade/3.1.1.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_1_1 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -40,4 +40,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.1.2.php b/core/database/upgrade/3.1.2.php index b615dc34a..4c8565474 100644 --- a/core/database/upgrade/3.1.2.php +++ b/core/database/upgrade/3.1.2.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_1_2 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -36,4 +36,4 @@ public function postUpgrade() { $this->addTableField('user', 'dynamichelp', 'tinyint(4)', ' integer', 1); } -} + } diff --git a/core/database/upgrade/3.1.3.php b/core/database/upgrade/3.1.3.php index da466fb64..66cd6b8d6 100644 --- a/core/database/upgrade/3.1.3.php +++ b/core/database/upgrade/3.1.3.php @@ -19,7 +19,7 @@ =========================================================================*/ class Upgrade_3_1_3 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -40,4 +40,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.1.4.php b/core/database/upgrade/3.1.4.php index 800468b2b..7340f65c6 100644 --- a/core/database/upgrade/3.1.4.php +++ b/core/database/upgrade/3.1.4.php @@ -1,7 +1,7 @@ setConfig('adminuser', $id); } -} + } diff --git a/core/database/upgrade/3.2.10.php b/core/database/upgrade/3.2.10.php index 8c5128357..a6638edd4 100644 --- a/core/database/upgrade/3.2.10.php +++ b/core/database/upgrade/3.2.10.php @@ -4,8 +4,7 @@ * Upgrade 3.2.10 adds newuserinvite table */ class Upgrade_3_2_10 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -61,5 +60,4 @@ public function pgsql() public function postUpgrade() { } - -} + } diff --git a/core/database/upgrade/3.2.11.php b/core/database/upgrade/3.2.11.php index 6ae0a7342..c315f7736 100644 --- a/core/database/upgrade/3.2.11.php +++ b/core/database/upgrade/3.2.11.php @@ -5,8 +5,7 @@ * from community and user tables */ class Upgrade_3_2_11 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -30,5 +29,4 @@ public function pgsql() public function postUpgrade() { } - -} + } diff --git a/core/database/upgrade/3.2.12.php b/core/database/upgrade/3.2.12.php index 51b32a3bd..098e34f37 100644 --- a/core/database/upgrade/3.2.12.php +++ b/core/database/upgrade/3.2.12.php @@ -4,8 +4,7 @@ * Upgrade 3.2.12 improves the password salting and hashing system */ class Upgrade_3_2_12 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -74,6 +73,5 @@ private function _movePasswords() { $this->db->insert('password', array('hash' => $row['password'])); } - } -} + } diff --git a/core/database/upgrade/3.2.13.php b/core/database/upgrade/3.2.13.php index 686dfbf89..e05e18c5d 100644 --- a/core/database/upgrade/3.2.13.php +++ b/core/database/upgrade/3.2.13.php @@ -4,8 +4,7 @@ * Upgrade 3.2.13 move userapi and token to core */ class Upgrade_3_2_13 extends MIDASUpgrade -{ - + { public function preUpgrade() { @@ -80,5 +79,4 @@ public function postUpgrade() $userapiModel->createDefaultApiKey($user); } } - -} + } diff --git a/core/database/upgrade/3.2.14.php b/core/database/upgrade/3.2.14.php index c6e537d84..cba4a12c0 100644 --- a/core/database/upgrade/3.2.14.php +++ b/core/database/upgrade/3.2.14.php @@ -4,8 +4,7 @@ * Upgrade 3.2.14 fixes bug #1001: folder modified time changed incorrectly */ class Upgrade_3_2_14 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -33,4 +32,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.2.2.php b/core/database/upgrade/3.2.2.php index 3080729f6..ba2c855b0 100644 --- a/core/database/upgrade/3.2.2.php +++ b/core/database/upgrade/3.2.2.php @@ -13,7 +13,7 @@ define("LICENSE_CC_NONCOMMERCIAL_NODERIVS", 9); class Upgrade_3_2_2 extends MIDASUpgrade -{ + { var $existingLicenses; public function preUpgrade() @@ -188,4 +188,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.2.3.php b/core/database/upgrade/3.2.3.php index 3309d3308..ffc455100 100644 --- a/core/database/upgrade/3.2.3.php +++ b/core/database/upgrade/3.2.3.php @@ -5,7 +5,7 @@ * multiple assetstores */ class Upgrade_3_2_3 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -23,4 +23,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.2.4.php b/core/database/upgrade/3.2.4.php index 399a42469..7d4840d84 100644 --- a/core/database/upgrade/3.2.4.php +++ b/core/database/upgrade/3.2.4.php @@ -5,7 +5,7 @@ * so that a single ip cannot flood the server with downloads. */ class Upgrade_3_2_4 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -36,4 +36,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.2.5.php b/core/database/upgrade/3.2.5.php index 1dabe9ae0..21aef676f 100644 --- a/core/database/upgrade/3.2.5.php +++ b/core/database/upgrade/3.2.5.php @@ -4,7 +4,7 @@ * Adding indexes for faster lookup of the folder & item hierarchy */ class Upgrade_3_2_5 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -27,4 +27,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/core/database/upgrade/3.2.6.php b/core/database/upgrade/3.2.6.php index b7b61a0d7..f6c86f59d 100644 --- a/core/database/upgrade/3.2.6.php +++ b/core/database/upgrade/3.2.6.php @@ -5,7 +5,7 @@ * as bitstreams. */ class Upgrade_3_2_6 extends MIDASUpgrade -{ + { var $assetstore; public function preUpgrade() @@ -75,6 +75,4 @@ private function _moveThumbnailToAssetstore($thumbnail) $bitstreamDao = $bitstreamModel->createThumbnail($this->assetstore, $oldpath); return $bitstreamDao; } - - -} + } diff --git a/core/database/upgrade/3.2.7.php b/core/database/upgrade/3.2.7.php index d305156bf..8c5040541 100644 --- a/core/database/upgrade/3.2.7.php +++ b/core/database/upgrade/3.2.7.php @@ -4,8 +4,7 @@ * Upgrade 3.2.7 adds the progress table */ class Upgrade_3_2_7 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -38,5 +37,4 @@ public function pgsql() public function postUpgrade() { } - -} + } diff --git a/core/database/upgrade/3.2.8.php b/core/database/upgrade/3.2.8.php index ad878a231..8b8c8586d 100644 --- a/core/database/upgrade/3.2.8.php +++ b/core/database/upgrade/3.2.8.php @@ -4,8 +4,7 @@ * Upgrade 3.2.8 is a sentinel upgrade */ class Upgrade_3_2_8 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -21,5 +20,4 @@ public function pgsql() public function postUpgrade() { } - -} + } diff --git a/core/database/upgrade/3.2.9.php b/core/database/upgrade/3.2.9.php index e69edc111..a66ecb39a 100644 --- a/core/database/upgrade/3.2.9.php +++ b/core/database/upgrade/3.2.9.php @@ -4,8 +4,7 @@ * Upgrade 3.2.9 adds pgsql indicies on policy tables */ class Upgrade_3_2_9 extends MIDASUpgrade -{ - + { public function preUpgrade() { } @@ -25,5 +24,4 @@ public function pgsql() public function postUpgrade() { } - -} + } diff --git a/core/models/AppDao.php b/core/models/AppDao.php index f90a822a2..e07f4a871 100644 --- a/core/models/AppDao.php +++ b/core/models/AppDao.php @@ -25,4 +25,4 @@ class AppDao extends MIDAS_GlobalDao { - } //end class + } // end class diff --git a/core/models/AppModel.php b/core/models/AppModel.php index 3b566547f..5be68ac30 100644 --- a/core/models/AppModel.php +++ b/core/models/AppModel.php @@ -18,10 +18,9 @@ limitations under the License. =========================================================================*/ - /** * */ class AppModel extends MIDASModel -{ -} + { + } diff --git a/core/models/GlobalDao.php b/core/models/GlobalDao.php index 36507de34..66ea30685 100644 --- a/core/models/GlobalDao.php +++ b/core/models/GlobalDao.php @@ -23,7 +23,7 @@ * Global dao methods */ class MIDAS_GlobalDao -{ + { protected $key; /** @@ -278,4 +278,4 @@ private function _getRealName($var) return $return; } -}// end class + } // end class diff --git a/core/models/MIDASDatabaseInterface.php b/core/models/MIDASDatabaseInterface.php index 0d9c72774..c10f52c41 100644 --- a/core/models/MIDASDatabaseInterface.php +++ b/core/models/MIDASDatabaseInterface.php @@ -19,7 +19,7 @@ =========================================================================*/ interface MIDASDatabaseInterface -{ + { /** generic save*/ public function save($dataarray); /** generic delete*/ @@ -28,4 +28,4 @@ public function delete($dao); public function getValue($var, $key, $dao); /** generic get all by key*/ public function getAllByKey($keys); -} // end interface \ No newline at end of file + } // end interface diff --git a/core/models/MIDASDatabaseMongo.php b/core/models/MIDASDatabaseMongo.php index 4092f75c3..37e983f62 100644 --- a/core/models/MIDASDatabaseMongo.php +++ b/core/models/MIDASDatabaseMongo.php @@ -23,7 +23,7 @@ * Global model methods */ class MIDASDatabaseMongo implements MIDASDatabaseInterface -{ + { protected $_name; protected $_mainData; protected $_key; @@ -338,4 +338,4 @@ function multigetMongo($columnfamily, $keys, $columns = null, $column_start = "" } } // end getMongo() -} // end class MIDASDatabaseMongo + } // end class diff --git a/core/models/MIDASDatabasePdo.php b/core/models/MIDASDatabasePdo.php index b9de0d58a..309f7a405 100644 --- a/core/models/MIDASDatabasePdo.php +++ b/core/models/MIDASDatabasePdo.php @@ -23,7 +23,7 @@ * Global model methods */ class MIDASDatabasePdo extends Zend_Db_Table_Abstract implements MIDASDatabaseInterface -{ + { protected $_name; protected $_mainData; @@ -403,4 +403,4 @@ public function getCountAll() return $count['COUNT']; }//end getCountAll -} //end class MIDASDatabasePdo + } // end class diff --git a/core/models/MIDASModel.php b/core/models/MIDASModel.php index 0358ffdda..f19b682e3 100644 --- a/core/models/MIDASModel.php +++ b/core/models/MIDASModel.php @@ -21,7 +21,7 @@ /** global midas model library*/ class MIDASModel -{ + { protected $database; protected $_name = ''; // I don't like this (should be protected) protected $_key = ''; @@ -494,4 +494,4 @@ public function compareDao($dao1, $dao2, $juggleTypes = false) return true; } //end method compareDao -} // end class GlobalModel + } // end class diff --git a/core/models/MIDASModuleInstallScript.php b/core/models/MIDASModuleInstallScript.php index e5ebf1c38..d6ad45588 100644 --- a/core/models/MIDASModuleInstallScript.php +++ b/core/models/MIDASModuleInstallScript.php @@ -35,7 +35,7 @@ * Subclasses may implement two callbacks, preInstall() and postInstall() */ class MIDASModuleInstallScript -{ + { /** constructor */ public function __construct() { @@ -51,4 +51,4 @@ public function postInstall() { } -} //end class MIDASModuleInstallScript + } // end class diff --git a/core/models/MIDASUpgrade.php b/core/models/MIDASUpgrade.php index bdb20184b..48ecb5085 100644 --- a/core/models/MIDASUpgrade.php +++ b/core/models/MIDASUpgrade.php @@ -22,7 +22,7 @@ * MIDASUpgrade */ class MIDASUpgrade -{ + { protected $db; protected $dbtype; @@ -376,4 +376,4 @@ function removeTablePrimaryKey($table) } } -} //end class MIDASUpgrade + } // end class diff --git a/core/models/base/ActivedownloadModelBase.php b/core/models/base/ActivedownloadModelBase.php index cdbb9a6c3..65c2eccdf 100644 --- a/core/models/base/ActivedownloadModelBase.php +++ b/core/models/base/ActivedownloadModelBase.php @@ -20,7 +20,7 @@ /** Active Download Model Base*/ abstract class ActivedownloadModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -89,5 +89,4 @@ public function updateLock($lockDao) $lockDao->setLastUpdate(date("Y-m-d H:i:s")); $this->save($lockDao); } - -} + } diff --git a/core/models/base/AssetstoreModelBase.php b/core/models/base/AssetstoreModelBase.php index 8b17b79dc..3d0eae4ee 100644 --- a/core/models/base/AssetstoreModelBase.php +++ b/core/models/base/AssetstoreModelBase.php @@ -20,7 +20,7 @@ /** Assetstore Model Base*/ abstract class AssetstoreModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -197,5 +197,4 @@ public function getDefault() return $defaultAssetstore; } // end getDefault - -} // end class AssetstoreModelBase + } // end class diff --git a/core/models/base/BitstreamModelBase.php b/core/models/base/BitstreamModelBase.php index 32a72f4f0..2dbd1c71e 100644 --- a/core/models/base/BitstreamModelBase.php +++ b/core/models/base/BitstreamModelBase.php @@ -20,7 +20,7 @@ /** Bitstream Base Model*/ abstract class BitstreamModelBase extends AppModel -{ + { /** constructor */ public function __construct() { @@ -135,4 +135,4 @@ private function _createAssetstoreDirectory($directorypath) chmod($directorypath, 0777); } } -} // end class BitstreamModelBase + } // end class diff --git a/core/models/base/CommunityInvitationModelBase.php b/core/models/base/CommunityInvitationModelBase.php index c2e680d54..0416e4864 100644 --- a/core/models/base/CommunityInvitationModelBase.php +++ b/core/models/base/CommunityInvitationModelBase.php @@ -20,7 +20,7 @@ /** ItemRevisionModelBase*/ class CommunityInvitationModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -122,4 +122,4 @@ public function removeInvitation($communityDao, $userDao) } return; } - } // end class ItemRevisionModelBase + } // end class diff --git a/core/models/base/CommunityModelBase.php b/core/models/base/CommunityModelBase.php index 74c8d05be..ec1532e11 100644 --- a/core/models/base/CommunityModelBase.php +++ b/core/models/base/CommunityModelBase.php @@ -20,7 +20,7 @@ /** Community Model Base*/ abstract class CommunityModelBase extends AppModel -{ + { /** constructor */ public function __construct() { @@ -409,5 +409,4 @@ function setPrivacy($communityDao, $privacyCode, $userDao) $communityDao->setPrivacy($privacyCode); $this->save($communityDao); } - -} // end class CommunityModelBase + } // end class diff --git a/core/models/base/ErrorlogModelBase.php b/core/models/base/ErrorlogModelBase.php index cd696a264..ab2d5e7dd 100644 --- a/core/models/base/ErrorlogModelBase.php +++ b/core/models/base/ErrorlogModelBase.php @@ -20,7 +20,7 @@ /** Error log Model Base*/ abstract class ErrorlogModelBase extends AppModel -{ + { /** Contructor*/ public function __construct() { @@ -41,4 +41,4 @@ public function __construct() abstract function getLog($startDate, $endDate, $module = 'all', $priority = MIDAS_PRIORITY_WARNING, $limit = 99999, $offset = 0, $operator = '<='); /** Count log entries since a certain date */ abstract function countSince($startDate, $priorities = null); -} // end class FeedModelBase + } // end class diff --git a/core/models/base/FeedModelBase.php b/core/models/base/FeedModelBase.php index 0b8610152..36abf65d9 100644 --- a/core/models/base/FeedModelBase.php +++ b/core/models/base/FeedModelBase.php @@ -20,7 +20,7 @@ /** Feed Model Base */ abstract class FeedModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -151,4 +151,4 @@ function createFeed($userDao, $type, $ressource, $communityDao = null) return $feed; } // end createFeed() -} // end class FeedModelBase + } // end class diff --git a/core/models/base/FeedpolicygroupModelBase.php b/core/models/base/FeedpolicygroupModelBase.php index b10a195cf..90927a2db 100644 --- a/core/models/base/FeedpolicygroupModelBase.php +++ b/core/models/base/FeedpolicygroupModelBase.php @@ -20,7 +20,7 @@ /** Feed policy model base */ abstract class FeedpolicygroupModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -75,4 +75,4 @@ public function createPolicy($group, $feed, $policy) return $policyGroupDao; } // end createPolicy -} // end class FeedpolicygroupModelBase \ No newline at end of file + } // end class diff --git a/core/models/base/FeedpolicyuserModelBase.php b/core/models/base/FeedpolicyuserModelBase.php index 6af4294e1..241b4dbce 100644 --- a/core/models/base/FeedpolicyuserModelBase.php +++ b/core/models/base/FeedpolicyuserModelBase.php @@ -20,7 +20,7 @@ /** FeedpolicyuserModelBase*/ abstract class FeedpolicyuserModelBase extends AppModel -{ + { /** Contructor*/ public function __construct() { @@ -71,5 +71,4 @@ public function createPolicy($user, $feed, $policy) $this->save($policyUser); return $policyUser; } // end createPolicy - -} // end class FeedpolicyuserModelBase + } // end class diff --git a/core/models/base/FolderModelBase.php b/core/models/base/FolderModelBase.php index 63197ee31..eede48383 100644 --- a/core/models/base/FolderModelBase.php +++ b/core/models/base/FolderModelBase.php @@ -20,7 +20,7 @@ /** FolderModelBase */ abstract class FolderModelBase extends AppModel -{ + { /** Contrcutor*/ public function __construct() { @@ -189,4 +189,4 @@ function countBitstreams($folderDao, $userDao = null) return array('size' => $totalSize, 'count' => $totalCount); } //end countBitstreams -} // end class FolderModelBase + } // end class diff --git a/core/models/base/FolderpolicygroupModelBase.php b/core/models/base/FolderpolicygroupModelBase.php index e9c6d1c22..81c2affcc 100644 --- a/core/models/base/FolderpolicygroupModelBase.php +++ b/core/models/base/FolderpolicygroupModelBase.php @@ -20,7 +20,7 @@ /** FolderpolicygroupModelBase */ abstract class FolderpolicygroupModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -90,6 +90,4 @@ public function createPolicy($group, $folder, $policy) } return $policyGroupDao; } - - -} // end class FolderpolicygroupModelBase + } // end class diff --git a/core/models/base/FolderpolicyuserModelBase.php b/core/models/base/FolderpolicyuserModelBase.php index 241685014..0e6e29d90 100644 --- a/core/models/base/FolderpolicyuserModelBase.php +++ b/core/models/base/FolderpolicyuserModelBase.php @@ -20,7 +20,7 @@ /** FolderpolicyuserModelBase */ abstract class FolderpolicyuserModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -79,5 +79,4 @@ public function createPolicy($user, $folder, $policy) return $policyUser; } - -} // end class FolderpolicyuserModelBase + } // end class diff --git a/core/models/base/GroupModelBase.php b/core/models/base/GroupModelBase.php index 92db84c03..7b2c22173 100644 --- a/core/models/base/GroupModelBase.php +++ b/core/models/base/GroupModelBase.php @@ -20,7 +20,7 @@ /** GroupModelBase*/ abstract class GroupModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -140,5 +140,4 @@ public function userInGroup($user, $group) } return false; } - -} // end class GroupModelBase \ No newline at end of file + } // end class diff --git a/core/models/base/ItemModelBase.php b/core/models/base/ItemModelBase.php index 241bc198a..a74501260 100644 --- a/core/models/base/ItemModelBase.php +++ b/core/models/base/ItemModelBase.php @@ -20,7 +20,7 @@ /** ItemModelBase */ abstract class ItemModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -575,4 +575,4 @@ public function replaceThumbnail($item, $tempThumbnailFile) $item->setThumbnailId($thumb->getKey()); $this->save($item); } -} // end class ItemModelBase + } // end class diff --git a/core/models/base/ItemRevisionModelBase.php b/core/models/base/ItemRevisionModelBase.php index 99dd67734..052f94778 100644 --- a/core/models/base/ItemRevisionModelBase.php +++ b/core/models/base/ItemRevisionModelBase.php @@ -20,7 +20,7 @@ /** ItemRevisionModelBase*/ abstract class ItemRevisionModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -177,6 +177,4 @@ public function save($dao) } parent::save($dao); } - - -} // end class ItemRevisionModelBase + } // end class diff --git a/core/models/base/ItempolicygroupModelBase.php b/core/models/base/ItempolicygroupModelBase.php index c5efbb804..f8fba8089 100644 --- a/core/models/base/ItempolicygroupModelBase.php +++ b/core/models/base/ItempolicygroupModelBase.php @@ -20,7 +20,7 @@ /** ItempolicygroupModelBase */ abstract class ItempolicygroupModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -90,6 +90,4 @@ public function delete($dao) $this->computePolicyStatus($item); } }//end delete - - -} // end class ItempolicygroupModelBase \ No newline at end of file + } // end class diff --git a/core/models/base/ItempolicyuserModelBase.php b/core/models/base/ItempolicyuserModelBase.php index a735d52b8..d4897fda0 100644 --- a/core/models/base/ItempolicyuserModelBase.php +++ b/core/models/base/ItempolicyuserModelBase.php @@ -20,7 +20,7 @@ /** ItempolicyuserModelBase */ abstract class ItempolicyuserModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -77,4 +77,4 @@ public function delete($dao) { parent::delete($dao); }//end delete -} // end class ItempolicyuserModelBase + } // end class diff --git a/core/models/base/LicenseModelBase.php b/core/models/base/LicenseModelBase.php index f1e6d78f9..33c7254f5 100644 --- a/core/models/base/LicenseModelBase.php +++ b/core/models/base/LicenseModelBase.php @@ -20,7 +20,7 @@ /** License Model Base*/ abstract class LicenseModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -38,5 +38,4 @@ public function __construct() /** Return all available licenses */ abstract function getAll(); - -} // end class AssetstoreModelBase + } // end class diff --git a/core/models/base/MetadataModelBase.php b/core/models/base/MetadataModelBase.php index a7762592e..903b614ec 100644 --- a/core/models/base/MetadataModelBase.php +++ b/core/models/base/MetadataModelBase.php @@ -20,7 +20,7 @@ /** Metadata Model Base */ abstract class MetadataModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -160,4 +160,4 @@ function mapNameToType($typeName) throw new Zend_Exception('Invalid metadata type string passed'); } } -} // end class MetadataModelBase \ No newline at end of file + } // end class diff --git a/core/models/base/NewUserInvitationModelBase.php b/core/models/base/NewUserInvitationModelBase.php index 57b8e9622..b4c82f475 100644 --- a/core/models/base/NewUserInvitationModelBase.php +++ b/core/models/base/NewUserInvitationModelBase.php @@ -24,7 +24,7 @@ * and has been invited by an existing user into a community group */ abstract class NewUserInvitationModelBase extends AppModel -{ + { /** Contructor */ public function __construct() { @@ -88,4 +88,4 @@ public function createInvitation($email, $group, $inviter) $this->save($newUserInvitation); return $newUserInvitation; } -} + } diff --git a/core/models/base/PendingUserModelBase.php b/core/models/base/PendingUserModelBase.php index 37a844961..27f97bb68 100644 --- a/core/models/base/PendingUserModelBase.php +++ b/core/models/base/PendingUserModelBase.php @@ -24,7 +24,7 @@ * but has yet to verify their email address. */ abstract class PendingUserModelBase extends AppModel -{ + { /** Contructor */ public function __construct() { @@ -81,4 +81,4 @@ public function createPendingUser($email, $firstName, $lastName, $password) $this->save($pendingUser); return $pendingUser; } -} + } diff --git a/core/models/base/ProgressModelBase.php b/core/models/base/ProgressModelBase.php index ad9db041c..a5b6ed9fd 100644 --- a/core/models/base/ProgressModelBase.php +++ b/core/models/base/ProgressModelBase.php @@ -31,7 +31,7 @@ * progress is indeterminate. */ abstract class ProgressModelBase extends AppModel -{ + { /** constructor */ public function __construct() { @@ -93,4 +93,4 @@ public function save($dao) session_write_close(); parent::save($dao); } -} + } diff --git a/core/models/base/SettingModelBase.php b/core/models/base/SettingModelBase.php index acc3703df..17999aba7 100644 --- a/core/models/base/SettingModelBase.php +++ b/core/models/base/SettingModelBase.php @@ -13,7 +13,7 @@ /** Setting Model Base*/ abstract class SettingModelBase extends AppModel -{ + { /** Constructor*/ public function __construct() { @@ -83,5 +83,4 @@ public function setConfig($name, $value, $module = 'core') } return $dao; } - -} + } diff --git a/core/models/base/TokenModelBase.php b/core/models/base/TokenModelBase.php index a6d64fe57..8667541d3 100644 --- a/core/models/base/TokenModelBase.php +++ b/core/models/base/TokenModelBase.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + abstract class TokenModelBase extends AppModel -{ + { /** constructor */ public function __construct() { @@ -37,5 +38,4 @@ public function __construct() } // end __construct() abstract function cleanExpired(); - -} // end class AssetstoreModelBase + } // end class diff --git a/core/models/base/UserModelBase.php b/core/models/base/UserModelBase.php index ba3ff8e1e..594bed6b0 100644 --- a/core/models/base/UserModelBase.php +++ b/core/models/base/UserModelBase.php @@ -20,7 +20,7 @@ /** UserModelBase */ abstract class UserModelBase extends AppModel -{ + { /** Constructor */ public function __construct() { @@ -343,4 +343,4 @@ public function getGravatarUrl($email, $s = 32, $d = '404', $r = 'g', $img = fal } return $url; } -} // end class UserModelBase + } // end class diff --git a/core/models/base/UserapiModelBase.php b/core/models/base/UserapiModelBase.php index 2b44850ed..1d4f65e07 100644 --- a/core/models/base/UserapiModelBase.php +++ b/core/models/base/UserapiModelBase.php @@ -18,7 +18,7 @@ limitations under the License. =========================================================================*/ abstract class UserapiModelBase extends AppModel -{ + { /** constructor */ public function __construct() { @@ -107,5 +107,4 @@ function createKey($userDao, $applicationname, $tokenexperiationtime) $this->save($userApiDao); return $userApiDao; } - -} + } diff --git a/core/models/dao/ActivedownloadDao.php b/core/models/dao/ActivedownloadDao.php index b04095bbd..ead2d8aa9 100644 --- a/core/models/dao/ActivedownloadDao.php +++ b/core/models/dao/ActivedownloadDao.php @@ -22,6 +22,6 @@ * \class ActivedownloadDao */ class ActivedownloadDao extends AppDao -{ + { public $_model = 'Activedownload'; -} // end class + } // end class diff --git a/core/models/dao/AssetstoreDao.php b/core/models/dao/AssetstoreDao.php index 07642f62b..b78ade0ee 100644 --- a/core/models/dao/AssetstoreDao.php +++ b/core/models/dao/AssetstoreDao.php @@ -23,6 +23,6 @@ * \brief DAO Assetstore (table assetstore) */ class AssetstoreDao extends AppDao -{ + { public $_model = 'Assetstore'; -} // end class + } // end class diff --git a/core/models/dao/BitstreamDao.php b/core/models/dao/BitstreamDao.php index 97e097ff2..a1d732ad7 100644 --- a/core/models/dao/BitstreamDao.php +++ b/core/models/dao/BitstreamDao.php @@ -23,7 +23,7 @@ * \brief DAO Bitstream (table bitstream) */ class BitstreamDao extends AppDao -{ + { public $_model = 'Bitstream'; public $_components = array('MimeType', 'Utility'); @@ -56,6 +56,4 @@ function getFullPath() $assetstore = $this->get('assetstore'); return $assetstore->getPath().'/'.$this->getPath(); } // end function getFullPath() - - -} // end class + } // end class diff --git a/core/models/dao/CommunityInvitationDao.php b/core/models/dao/CommunityInvitationDao.php index eb5f66224..b01d0e17e 100644 --- a/core/models/dao/CommunityInvitationDao.php +++ b/core/models/dao/CommunityInvitationDao.php @@ -23,8 +23,6 @@ * \brief DAO Assetstore */ class CommunityInvitationDao extends AppDao -{ + { public $_model = 'CommunityInvitation'; - - -} // end class + } // end class diff --git a/core/models/dao/ErrorlogDao.php b/core/models/dao/ErrorlogDao.php index d4edca1b6..f504e8439 100644 --- a/core/models/dao/ErrorlogDao.php +++ b/core/models/dao/ErrorlogDao.php @@ -22,6 +22,6 @@ * \class ErrorlogDao */ class ErrorlogDao extends AppDao -{ + { public $_model = 'Errorlog'; -} // end class + } // end class diff --git a/core/models/dao/FeedDao.php b/core/models/dao/FeedDao.php index 49f766d57..bd76b5f10 100644 --- a/core/models/dao/FeedDao.php +++ b/core/models/dao/FeedDao.php @@ -23,7 +23,7 @@ * \brief DAO Item (table Feed) */ class FeedDao extends AppDao -{ + { public $_model = 'Feed'; /** overwite get Ressource method */ @@ -62,4 +62,4 @@ public function getRessource() break; } } -} // end class + } // end class diff --git a/core/models/dao/MetadataDao.php b/core/models/dao/MetadataDao.php index 9cde0d88b..e04fdaee1 100644 --- a/core/models/dao/MetadataDao.php +++ b/core/models/dao/MetadataDao.php @@ -23,7 +23,6 @@ * \brief DAO Item (table Metadata) */ class MetadataDao extends AppDao -{ + { public $_model = 'Metadata'; - -} // end class + } // end class diff --git a/core/models/dao/NewUserInvitationDao.php b/core/models/dao/NewUserInvitationDao.php index c5b3a65b9..16482d8d0 100644 --- a/core/models/dao/NewUserInvitationDao.php +++ b/core/models/dao/NewUserInvitationDao.php @@ -22,6 +22,6 @@ * \class NewUserInvitationDao */ class NewUserInvitationDao extends AppDao -{ + { public $_model = 'NewUserInvitation'; -} + } diff --git a/core/models/dao/PendingUserDao.php b/core/models/dao/PendingUserDao.php index aca999f4b..f917511fc 100644 --- a/core/models/dao/PendingUserDao.php +++ b/core/models/dao/PendingUserDao.php @@ -22,6 +22,6 @@ * \class PendingUserDao */ class PendingUserDao extends AppDao -{ + { public $_model = 'PendingUser'; -} + } diff --git a/core/models/dao/ProgressDao.php b/core/models/dao/ProgressDao.php index 07fe80570..5098bc30d 100644 --- a/core/models/dao/ProgressDao.php +++ b/core/models/dao/ProgressDao.php @@ -23,6 +23,6 @@ * \brief Dao for Progress object */ class ProgressDao extends AppDao -{ + { public $_model = 'Progress'; -} + } diff --git a/core/models/dao/UserDao.php b/core/models/dao/UserDao.php index d2113f900..d5af46d3d 100644 --- a/core/models/dao/UserDao.php +++ b/core/models/dao/UserDao.php @@ -40,7 +40,7 @@ public function isAdmin() public function getFullName() { return $this->getFirstname()." ".$this->getLastname(); - }//end class + } // end class /** toArray */ public function toArray() diff --git a/core/models/pdo/ActivedownloadModel.php b/core/models/pdo/ActivedownloadModel.php index ad6e94dc3..1e793b7eb 100644 --- a/core/models/pdo/ActivedownloadModel.php +++ b/core/models/pdo/ActivedownloadModel.php @@ -24,7 +24,7 @@ * \class ActivedownloadModel */ class ActivedownloadModel extends ActivedownloadModelBase -{ + { /** Check whether an active download exists for the given ip */ public function getByIp($ip) { @@ -39,5 +39,4 @@ public function getByIp($ip) } return false; } - -} // end class + } // end class diff --git a/core/models/pdo/AssetstoreModel.php b/core/models/pdo/AssetstoreModel.php index 755ef0078..3ffb5e21e 100644 --- a/core/models/pdo/AssetstoreModel.php +++ b/core/models/pdo/AssetstoreModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class AssetstoreModel extends AssetstoreModelBase -{ + { /** get All */ function getAll() { @@ -101,4 +101,4 @@ public function moveBitstreams($srcAssetstore, $dstAssetstore, $progressDao = nu $bitstreamModel->save($bitstream); } } -} // end class + } // end class diff --git a/core/models/pdo/CommunityInvitationModel.php b/core/models/pdo/CommunityInvitationModel.php index c0f7f7082..0a2716d9d 100644 --- a/core/models/pdo/CommunityInvitationModel.php +++ b/core/models/pdo/CommunityInvitationModel.php @@ -25,6 +25,6 @@ * \brief Pdo Model */ class CommunityInvitationModel extends CommunityInvitationModelBase -{ + { -} // end class + } // end class diff --git a/core/models/pdo/CommunityModel.php b/core/models/pdo/CommunityModel.php index 0c3d22c68..a936a6875 100644 --- a/core/models/pdo/CommunityModel.php +++ b/core/models/pdo/CommunityModel.php @@ -25,7 +25,7 @@ * Pdo Model */ class CommunityModel extends CommunityModelBase -{ + { /** get by uuid*/ function getByUuid($uuid) { @@ -179,4 +179,4 @@ function getCommunitiesFromSearch($search, $userDao, $limit = 14, $group = true, return $return; } // end getCommunitiesFromSearch() -}// end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/core/models/pdo/ErrorlogModel.php b/core/models/pdo/ErrorlogModel.php index bd009da84..2cc4ca205 100644 --- a/core/models/pdo/ErrorlogModel.php +++ b/core/models/pdo/ErrorlogModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class ErrorlogModel extends ErrorlogModelBase -{ + { /** * Return a list of log @@ -99,4 +99,4 @@ function countSince($startDate, $priorities = null) } return 0; } -} // end class + } // end class diff --git a/core/models/pdo/FeedModel.php b/core/models/pdo/FeedModel.php index a26e415a2..26e5b3dd9 100644 --- a/core/models/pdo/FeedModel.php +++ b/core/models/pdo/FeedModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class FeedModel extends FeedModelBase -{ + { /** get feed by resource*/ function getFeedByResourceAndType($typeArray, $dao) @@ -275,4 +275,4 @@ function delete($feedDao) return parent::delete($feedDao); } // end delete -} // end class + } // end class diff --git a/core/models/pdo/FeedpolicygroupModel.php b/core/models/pdo/FeedpolicygroupModel.php index 78f06ca67..bb5760852 100644 --- a/core/models/pdo/FeedpolicygroupModel.php +++ b/core/models/pdo/FeedpolicygroupModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class FeedpolicygroupModel extends FeedpolicygroupModelBase -{ + { /** getPolicy * @return FeedpolicygroupDao @@ -57,4 +57,4 @@ public function deleteGroupPolicies($group) Zend_Registry::get('dbAdapter')->delete($this->_name, $clause); } -} // end class + } // end class diff --git a/core/models/pdo/FeedpolicyuserModel.php b/core/models/pdo/FeedpolicyuserModel.php index e77c3e170..b8082f30b 100644 --- a/core/models/pdo/FeedpolicyuserModel.php +++ b/core/models/pdo/FeedpolicyuserModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class FeedpolicyuserModel extends FeedpolicyuserModelBase -{ + { /** getPolicy * @return FeedpolicyuserDao */ @@ -42,4 +42,4 @@ public function getPolicy($user, $feed) return $this->initDao('Feedpolicyuser', $this->database->fetchRow($this->database->select()->where('feed_id = ?', $feed->getKey())->where('user_id = ?', $user->getKey()))); } // end getPolicy -} // end class + } // end class diff --git a/core/models/pdo/FolderModel.php b/core/models/pdo/FolderModel.php index e68728d2c..3be6739b6 100644 --- a/core/models/pdo/FolderModel.php +++ b/core/models/pdo/FolderModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class FolderModel extends FolderModelBase -{ + { /** get All*/ function getAll() { @@ -1335,4 +1335,4 @@ protected function _recomputeSubtree($folder, &$count, $max, $progressDao = null $this->_recomputeSubtree($child, $count, $max, $progressDao); } } -} // end class + } // end class diff --git a/core/models/pdo/FolderpolicygroupModel.php b/core/models/pdo/FolderpolicygroupModel.php index b03a99ebf..9f58ea5a8 100644 --- a/core/models/pdo/FolderpolicygroupModel.php +++ b/core/models/pdo/FolderpolicygroupModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class FolderpolicygroupModel extends FolderpolicygroupModelBase -{ + { /** getPolicy * @return FolderpolicygroupDao */ @@ -76,4 +76,4 @@ public function deleteGroupPolicies($group) $clause = 'group_id = '.$group->getKey(); Zend_Registry::get('dbAdapter')->delete($this->_name, $clause); } -} + } diff --git a/core/models/pdo/FolderpolicyuserModel.php b/core/models/pdo/FolderpolicyuserModel.php index f3afc3736..ea0e9ee5e 100644 --- a/core/models/pdo/FolderpolicyuserModel.php +++ b/core/models/pdo/FolderpolicyuserModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class FolderpolicyuserModel extends FolderpolicyuserModelBase -{ + { /** getPolicy * @return FolderpolicyuserDao */ @@ -44,4 +44,4 @@ public function getPolicy($user, $folder) ->where('user_id = ?', $user->getKey()) )); } -} // end class FolderpolicyuserModel + } // end class diff --git a/core/models/pdo/GroupModel.php b/core/models/pdo/GroupModel.php index 9d0ab3db7..ed411cf39 100644 --- a/core/models/pdo/GroupModel.php +++ b/core/models/pdo/GroupModel.php @@ -25,7 +25,7 @@ * Pdo Model */ class GroupModel extends GroupModelBase -{ + { /** Get a groups by Community */ function findByCommunity($communityDao) @@ -119,4 +119,4 @@ function getGroupFromSearch($search, $limit = 14) } return $return; } // end getCommunitiesFromSearch() -}// end class + } // end class diff --git a/core/models/pdo/ItemModel.php b/core/models/pdo/ItemModel.php index f8a24bed1..cf1f26d56 100644 --- a/core/models/pdo/ItemModel.php +++ b/core/models/pdo/ItemModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class ItemModel extends ItemModelBase -{ + { /** Get the keyword from the search. * @return Array of ItemDao */ function getItemsFromSearch($searchterm, $userDao, $limit = 14, $group = true, $order = 'view') @@ -725,5 +725,4 @@ function updateItemName($name, $parent) return $curName; } - -} // end class + } // end class diff --git a/core/models/pdo/ItemRevisionModel.php b/core/models/pdo/ItemRevisionModel.php index 9257fec5e..c6481d37e 100644 --- a/core/models/pdo/ItemRevisionModel.php +++ b/core/models/pdo/ItemRevisionModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class ItemRevisionModel extends ItemRevisionModelBase -{ + { /** get by uuid*/ function getByUuid($uuid) { @@ -224,4 +224,4 @@ function removeOrphans($progressDao = null) $this->delete($revision); } } -} // end class + } // end class diff --git a/core/models/pdo/ItempolicygroupModel.php b/core/models/pdo/ItempolicygroupModel.php index 34ec96426..ef0661702 100644 --- a/core/models/pdo/ItempolicygroupModel.php +++ b/core/models/pdo/ItempolicygroupModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class ItempolicygroupModel extends ItempolicygroupModelBase -{ + { /** compute policy status*/ public function computePolicyStatus($item) @@ -78,4 +78,4 @@ public function deleteGroupPolicies($group) Zend_Registry::get('dbAdapter')->delete($this->_name, $clause); } -} // end class + } // end class diff --git a/core/models/pdo/ItempolicyuserModel.php b/core/models/pdo/ItempolicyuserModel.php index f28c70ec5..1df845dcb 100644 --- a/core/models/pdo/ItempolicyuserModel.php +++ b/core/models/pdo/ItempolicyuserModel.php @@ -25,8 +25,7 @@ * \brief Pdo Model */ class ItempolicyuserModel extends ItempolicyuserModelBase -{ - + { /** getPolicy * @return ItempolicyuserDao */ @@ -42,4 +41,4 @@ public function getPolicy($user, $item) } return $this->initDao('Itempolicyuser', $this->database->fetchRow($this->database->select()->where('item_id = ?', $item->getKey())->where('user_id = ?', $user->getKey()))); } -} + } diff --git a/core/models/pdo/LicenseModel.php b/core/models/pdo/LicenseModel.php index 414186893..9769fcc2c 100644 --- a/core/models/pdo/LicenseModel.php +++ b/core/models/pdo/LicenseModel.php @@ -24,7 +24,7 @@ * License model */ class LicenseModel extends LicenseModelBase -{ + { /** get all licenses */ function getAll() { @@ -55,4 +55,4 @@ function delete($license) $license->saved = false; return true; } -} // end class + } // end class diff --git a/core/models/pdo/MetadataModel.php b/core/models/pdo/MetadataModel.php index 250a6452d..46402e2e2 100644 --- a/core/models/pdo/MetadataModel.php +++ b/core/models/pdo/MetadataModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model */ class MetadataModel extends MetadataModelBase -{ + { /** * Get all metadata types currently stored in the database. @@ -175,4 +175,4 @@ function saveMetadataValue($metadataDao) } // end function saveMetadataValue() -} // end class + } // end class diff --git a/core/models/pdo/NewUserInvitationModel.php b/core/models/pdo/NewUserInvitationModel.php index ea2bb2a44..4b6cbb586 100644 --- a/core/models/pdo/NewUserInvitationModel.php +++ b/core/models/pdo/NewUserInvitationModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model for a new user invitation */ class NewUserInvitationModel extends NewUserInvitationModelBase -{ + { /** * Search the table for a matching record. If any exists, returns the first dao. Otherwise returns false. */ @@ -87,5 +87,4 @@ public function deleteByCommunity($community) } Zend_Registry::get('dbAdapter')->delete($this->_name, 'community_id = '.$community->getKey()); } -} - + } diff --git a/core/models/pdo/PendingUserModel.php b/core/models/pdo/PendingUserModel.php index 2a2b5b0e5..bdaf279b4 100644 --- a/core/models/pdo/PendingUserModel.php +++ b/core/models/pdo/PendingUserModel.php @@ -25,7 +25,7 @@ * \brief Pdo Model for a pending user */ class PendingUserModel extends PendingUserModelBase -{ + { /** * Search the table for a matching record. If any exists, returns the first dao. Otherwise returns false. */ @@ -61,4 +61,4 @@ public function getAllByParams($params) } return $daos; } -} + } diff --git a/core/models/pdo/ProgressModel.php b/core/models/pdo/ProgressModel.php index 5067968c9..bf8ea7b41 100644 --- a/core/models/pdo/ProgressModel.php +++ b/core/models/pdo/ProgressModel.php @@ -24,5 +24,5 @@ * \class ProgressModel */ class ProgressModel extends ProgressModelBase -{ -} + { + } diff --git a/core/models/pdo/SettingModel.php b/core/models/pdo/SettingModel.php index 932abf7b4..2696a9961 100644 --- a/core/models/pdo/SettingModel.php +++ b/core/models/pdo/SettingModel.php @@ -17,7 +17,7 @@ * Pdo Model */ class SettingModel extends SettingModelBase -{ + { /** get by name*/ function getDaoByName($name, $module = 'core') { @@ -29,4 +29,4 @@ function getDaoByName($name, $module = 'core') $dao = $this->initDao(ucfirst($this->_name), $row); return $dao; } -}// end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/core/models/pdo/TokenModel.php b/core/models/pdo/TokenModel.php index d6835c9ca..e7400db37 100644 --- a/core/models/pdo/TokenModel.php +++ b/core/models/pdo/TokenModel.php @@ -22,7 +22,7 @@ /** Api Token model implementation */ class TokenModel extends TokenModelBase -{ + { /** Remove all expired api tokens */ function cleanExpired() { @@ -34,4 +34,4 @@ function cleanExpired() parent::delete($tmpDao); } } -} + } diff --git a/core/models/pdo/UserModel.php b/core/models/pdo/UserModel.php index 7e3abf82c..e1baeda2e 100644 --- a/core/models/pdo/UserModel.php +++ b/core/models/pdo/UserModel.php @@ -25,7 +25,7 @@ * Pdo Model */ class UserModel extends UserModelBase -{ + { /** get by uuid*/ function getByUuid($uuid) { @@ -334,4 +334,4 @@ function legacyAuthenticate($userDao, $instanceSalt, $password, $hash = false) } return $pw === $hash; } -}// end class + } // end class diff --git a/core/models/pdo/UserapiModel.php b/core/models/pdo/UserapiModel.php index a9dd99f46..30957adb3 100644 --- a/core/models/pdo/UserapiModel.php +++ b/core/models/pdo/UserapiModel.php @@ -22,7 +22,7 @@ /** User api key model implementation */ class UserapiModel extends UserapiModelBase -{ + { /** * Get UserapiDao by * @param string $appname Application Name @@ -190,4 +190,4 @@ function getByUser($userDao) } return $return; } -} + } diff --git a/core/models/profiler/ProductionDbProfiler.php b/core/models/profiler/ProductionDbProfiler.php index 5f0875df3..8a4c90883 100644 --- a/core/models/profiler/ProductionDbProfiler.php +++ b/core/models/profiler/ProductionDbProfiler.php @@ -54,4 +54,4 @@ public function getLastQueryProfile() return parent::getLastQueryProfile(); } -} + } diff --git a/modules/GlobalModule.php b/modules/GlobalModule.php index aeb98cb4a..466223a65 100644 --- a/modules/GlobalModule.php +++ b/modules/GlobalModule.php @@ -239,4 +239,4 @@ public function callCoreAction() return false; } } -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/api/AppController.php b/modules/api/AppController.php index 2f20e7743..07069ab59 100644 --- a/modules/api/AppController.php +++ b/modules/api/AppController.php @@ -22,4 +22,4 @@ class Api_AppController extends MIDAS_GlobalModule { public $moduleName = 'api'; - } //end class + } // end class diff --git a/modules/api/Notification.php b/modules/api/Notification.php index 42d4e6ee9..dfb32dc31 100644 --- a/modules/api/Notification.php +++ b/modules/api/Notification.php @@ -32,4 +32,4 @@ public function init() $this->enableWebAPI('api'); }//end init - } //end class + } // end class diff --git a/modules/api/controllers/ConfigController.php b/modules/api/controllers/ConfigController.php index 6729c6705..b5edac5af 100644 --- a/modules/api/controllers/ConfigController.php +++ b/modules/api/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** api config controller */ class Api_ConfigController extends Api_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility'); @@ -66,4 +66,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/api/controllers/IndexController.php b/modules/api/controllers/IndexController.php index 160681be7..cd7080e9a 100644 --- a/modules/api/controllers/IndexController.php +++ b/modules/api/controllers/IndexController.php @@ -22,7 +22,7 @@ /** Main controller for the web api module */ class Api_IndexController extends Api_AppController -{ + { public $_moduleComponents = array('Api'); var $kwWebApiCore = null; diff --git a/modules/api/controllers/JsonController.php b/modules/api/controllers/JsonController.php index ecaa58f00..a0378af79 100644 --- a/modules/api/controllers/JsonController.php +++ b/modules/api/controllers/JsonController.php @@ -20,7 +20,7 @@ /** Api controller for /json */ class Api_JsonController extends Api_AppController -{ + { /** Before filter */ function preDispatch() diff --git a/modules/api/controllers/RestController.php b/modules/api/controllers/RestController.php index 53499c521..18b48cde7 100644 --- a/modules/api/controllers/RestController.php +++ b/modules/api/controllers/RestController.php @@ -20,7 +20,7 @@ /** Api controller for /rest */ class Api_RestController extends Api_AppController -{ + { /** Before filter */ function preDispatch() diff --git a/modules/api/controllers/forms/ConfigForm.php b/modules/api/controllers/forms/ConfigForm.php index eb4ab151c..86ea5d8f8 100644 --- a/modules/api/controllers/forms/ConfigForm.php +++ b/modules/api/controllers/forms/ConfigForm.php @@ -20,7 +20,7 @@ /** api config form */ class Api_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() { @@ -38,4 +38,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/archive/Notification.php b/modules/archive/Notification.php index beec7fefc..1daff518d 100644 --- a/modules/archive/Notification.php +++ b/modules/archive/Notification.php @@ -63,4 +63,4 @@ public function getItemViewJs($params) { return array($this->moduleWebroot.'/public/js/common/archive.common.js'); } - } //end class + } // end class diff --git a/modules/archive/controllers/ConfigController.php b/modules/archive/controllers/ConfigController.php index 11821d7c6..925d3931e 100644 --- a/modules/archive/controllers/ConfigController.php +++ b/modules/archive/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Configure controller for archive module */ class Archive_ConfigController extends Archive_AppController -{ + { public $_models = array('Setting'); /** Admin config page */ @@ -48,4 +48,4 @@ function submitAction() $this->Setting->setConfig('unzipCommand', $unzipCmd, $this->moduleName); echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Changes saved')); } -}//end class + } // end class diff --git a/modules/archive/controllers/ExtractController.php b/modules/archive/controllers/ExtractController.php index f2bc5f493..c5d07b242 100644 --- a/modules/archive/controllers/ExtractController.php +++ b/modules/archive/controllers/ExtractController.php @@ -20,7 +20,7 @@ /** Main controller for the web api module */ class Archive_ExtractController extends Archive_AppController -{ + { public $_models = array('Item', 'Progress'); public $_moduleComponents = array('Extract'); diff --git a/modules/batchmake/AppController.php b/modules/batchmake/AppController.php index b36a512f1..7a95ccee0 100644 --- a/modules/batchmake/AppController.php +++ b/modules/batchmake/AppController.php @@ -22,4 +22,4 @@ class Batchmake_AppController extends MIDAS_GlobalModule { public $moduleName='batchmake'; - } //end class + } // end class diff --git a/modules/batchmake/Notification.php b/modules/batchmake/Notification.php index fc3011b8d..bef3674a0 100644 --- a/modules/batchmake/Notification.php +++ b/modules/batchmake/Notification.php @@ -62,4 +62,4 @@ public function getLeftLink() return array(ucfirst(MIDAS_BATCHMAKE_MODULE) => array($moduleWebroot . '/index', $baseURL . '/modules/batchmake/public/images/cmake.png')); } - } //end class + } // end class diff --git a/modules/batchmake/controllers/ConfigController.php b/modules/batchmake/controllers/ConfigController.php index f72fe64cf..b367e64fb 100644 --- a/modules/batchmake/controllers/ConfigController.php +++ b/modules/batchmake/controllers/ConfigController.php @@ -31,7 +31,7 @@ * - change ajax callst o be through web api, and standard ajax */ class Batchmake_ConfigController extends Batchmake_AppController -{ + { @@ -153,4 +153,4 @@ public function indexAction() -}//end class + } // end class diff --git a/modules/batchmake/controllers/IndexController.php b/modules/batchmake/controllers/IndexController.php index 030c72ae4..51699dc72 100644 --- a/modules/batchmake/controllers/IndexController.php +++ b/modules/batchmake/controllers/IndexController.php @@ -22,7 +22,7 @@ * Batchmake_IndexController */ class Batchmake_IndexController extends Batchmake_AppController -{ + { /** * @method indexAction(), will display the index page of the batchmake module. @@ -34,4 +34,4 @@ public function indexAction() -}//end class + } // end class diff --git a/modules/batchmake/controllers/components/ApiComponent.php b/modules/batchmake/controllers/components/ApiComponent.php index 38ce8b4ac..025906c2b 100644 --- a/modules/batchmake/controllers/components/ApiComponent.php +++ b/modules/batchmake/controllers/components/ApiComponent.php @@ -24,7 +24,7 @@ /** Component for api methods */ class Batchmake_ApiComponent extends AppComponent -{ + { /** @@ -196,7 +196,7 @@ public function addCondorJob($params) -} // end class + } // end class diff --git a/modules/batchmake/controllers/components/ExecuteComponent.php b/modules/batchmake/controllers/components/ExecuteComponent.php index a540f44b5..848d4ef65 100644 --- a/modules/batchmake/controllers/components/ExecuteComponent.php +++ b/modules/batchmake/controllers/components/ExecuteComponent.php @@ -184,4 +184,4 @@ public function generateBatchmakeConfig($taskDao, $appTaskConfigProperties, $con -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/batchmake/controllers/components/KWBatchmakeComponent.php b/modules/batchmake/controllers/components/KWBatchmakeComponent.php index cce132958..4f316376a 100644 --- a/modules/batchmake/controllers/components/KWBatchmakeComponent.php +++ b/modules/batchmake/controllers/components/KWBatchmakeComponent.php @@ -25,7 +25,7 @@ * provides utility methods needed to interact with Batchmake via Midas3. */ class Batchmake_KWBatchmakeComponent extends AppComponent -{ + { protected static $configPropertiesRequirements = array(MIDAS_BATCHMAKE_TMP_DIR_PROPERTY => MIDAS_BATCHMAKE_CHECK_IF_CHMODABLE_RW, MIDAS_BATCHMAKE_BIN_DIR_PROPERTY => MIDAS_BATCHMAKE_CHECK_IF_READABLE, @@ -705,5 +705,5 @@ public function condorSubmitDag($workDir, $dagScript) -} // end class + } // end class ?> diff --git a/modules/batchmake/controllers/forms/ConfigForm.php b/modules/batchmake/controllers/forms/ConfigForm.php index 7613a1ab2..4480fc574 100644 --- a/modules/batchmake/controllers/forms/ConfigForm.php +++ b/modules/batchmake/controllers/forms/ConfigForm.php @@ -22,7 +22,7 @@ * Batchmake_ConfigForm */ class Batchmake_ConfigForm extends AppForm -{ + { /** * @method createConfigForm @@ -52,4 +52,4 @@ public function createConfigForm($configPropertiesRequirements) $form->addElements($formElements); return $form; } -} // end class + } // end class diff --git a/modules/batchmake/database/upgrade/0.2.0.php b/modules/batchmake/database/upgrade/0.2.0.php index 5c085ed65..fab371439 100644 --- a/modules/batchmake/database/upgrade/0.2.0.php +++ b/modules/batchmake/database/upgrade/0.2.0.php @@ -19,10 +19,9 @@ =========================================================================*/ class Batchmake_Upgrade_0_2_0 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -44,6 +43,5 @@ public function pgsql() public function postUpgrade() { - } -} + } diff --git a/modules/batchmake/models/AppDao.php b/modules/batchmake/models/AppDao.php index 90ee3e9ec..b30c948d3 100644 --- a/modules/batchmake/models/AppDao.php +++ b/modules/batchmake/models/AppDao.php @@ -22,4 +22,4 @@ class Batchmake_AppDao extends MIDAS_GlobalDao { public $moduleName = 'batchmake'; - } //end class + } // end class diff --git a/modules/batchmake/models/AppModel.php b/modules/batchmake/models/AppModel.php index 18cc6168c..ba9878adf 100644 --- a/modules/batchmake/models/AppModel.php +++ b/modules/batchmake/models/AppModel.php @@ -17,9 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ -/** Batchmake_AppModel */ -class Batchmake_AppModel extends MIDASModel { +/** Batchmake_AppModel */ +class Batchmake_AppModel extends MIDASModel + { public $moduleName = 'batchmake'; - -} + } diff --git a/modules/batchmake/models/base/CondorDagModelBase.php b/modules/batchmake/models/base/CondorDagModelBase.php index 9e93e4790..435824828 100644 --- a/modules/batchmake/models/base/CondorDagModelBase.php +++ b/modules/batchmake/models/base/CondorDagModelBase.php @@ -9,13 +9,12 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -include_once BASE_PATH . '/modules/batchmake/constant/module.php'; -/** CondorDag Base class */ -class Batchmake_CondorDagModelBase extends Batchmake_AppModel { - - +include_once BASE_PATH . '/modules/batchmake/constant/module.php'; +/** CondorDag Base class */ +class Batchmake_CondorDagModelBase extends Batchmake_AppModel + { /** constructor */ public function __construct() { @@ -31,10 +30,4 @@ public function __construct() 'dag_filename' => array('type' => MIDAS_DATA)); $this->initialize(); // required } - - - - - - -} // end class Batchmake_CondorDagModelBase + } // end class diff --git a/modules/batchmake/models/base/CondorJobModelBase.php b/modules/batchmake/models/base/CondorJobModelBase.php index 6475a1b45..658d5c196 100644 --- a/modules/batchmake/models/base/CondorJobModelBase.php +++ b/modules/batchmake/models/base/CondorJobModelBase.php @@ -9,13 +9,12 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -include_once BASE_PATH . '/modules/batchmake/constant/module.php'; -/** CondorJob Base class */ -class Batchmake_CondorJobModelBase extends Batchmake_AppModel { - - +include_once BASE_PATH . '/modules/batchmake/constant/module.php'; +/** CondorJob Base class */ +class Batchmake_CondorJobModelBase extends Batchmake_AppModel + { /** constructor */ public function __construct() { @@ -34,8 +33,4 @@ public function __construct() 'post_filename' => array('type' => MIDAS_DATA)); $this->initialize(); // required } - - - - -} // end class Batchmake_CondorJobModelBase + } // end class diff --git a/modules/batchmake/models/base/ItemmetricModelBase.php b/modules/batchmake/models/base/ItemmetricModelBase.php index 23c275ae1..d2fc82e81 100644 --- a/modules/batchmake/models/base/ItemmetricModelBase.php +++ b/modules/batchmake/models/base/ItemmetricModelBase.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ -abstract class Batchmake_ItemmetricModelBase extends Batchmake_AppModel { +abstract class Batchmake_ItemmetricModelBase extends Batchmake_AppModel + { /** * constructor */ @@ -63,9 +64,4 @@ public function createItemmetric($metricName, $bmsName) * getAll returns all rows */ public abstract function getAll(); - - - - - -} // end class Batchmake_ItemmetricModelBase + } // end class diff --git a/modules/batchmake/models/base/TaskModelBase.php b/modules/batchmake/models/base/TaskModelBase.php index ef008264a..93344d1ba 100644 --- a/modules/batchmake/models/base/TaskModelBase.php +++ b/modules/batchmake/models/base/TaskModelBase.php @@ -17,7 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + include_once BASE_PATH . '/modules/batchmake/constant/module.php'; + /** TaskModel Base class */ class Batchmake_TaskModelBase extends Batchmake_AppModel { @@ -58,11 +60,4 @@ function createTask($userDao, $tmpWorkDirRoot) $this->save($task); return $task; } // end createTask() - - - - - - - -} // end class Batchmake_TaskModelBase \ No newline at end of file + } // end class diff --git a/modules/batchmake/models/dao/CondorDagDao.php b/modules/batchmake/models/dao/CondorDagDao.php index ea02995c1..d57621008 100644 --- a/modules/batchmake/models/dao/CondorDagDao.php +++ b/modules/batchmake/models/dao/CondorDagDao.php @@ -9,10 +9,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -/** CondorDagDao class */ -class Batchmake_CondorDagDao extends AppDao { +/** CondorDagDao class */ +class Batchmake_CondorDagDao extends AppDao + { public $_model = 'CondorDag'; public $_module = 'batchmake'; - -} + } diff --git a/modules/batchmake/models/dao/CondorJobDao.php b/modules/batchmake/models/dao/CondorJobDao.php index b82b6ae7b..06c44a2ee 100644 --- a/modules/batchmake/models/dao/CondorJobDao.php +++ b/modules/batchmake/models/dao/CondorJobDao.php @@ -9,10 +9,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -/** CondorJobDao class */ -class Batchmake_CondorJobDao extends AppDao { +/** CondorJobDao class */ +class Batchmake_CondorJobDao extends AppDao + { public $_model = 'CondorJob'; public $_module = 'batchmake'; - -} + } diff --git a/modules/batchmake/models/dao/ItemmetricDao.php b/modules/batchmake/models/dao/ItemmetricDao.php index e3649182b..59acfdf0d 100644 --- a/modules/batchmake/models/dao/ItemmetricDao.php +++ b/modules/batchmake/models/dao/ItemmetricDao.php @@ -17,10 +17,10 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ -/** Batchmake_ItemmetricDao */ -class Batchmake_ItemmetricDao extends AppDao { +/** Batchmake_ItemmetricDao */ +class Batchmake_ItemmetricDao extends AppDao + { public $_model = 'Itemmetric'; public $_module = 'batchmake'; - -} + } diff --git a/modules/batchmake/models/dao/TaskDao.php b/modules/batchmake/models/dao/TaskDao.php index 35d16184b..f9530d9fd 100644 --- a/modules/batchmake/models/dao/TaskDao.php +++ b/modules/batchmake/models/dao/TaskDao.php @@ -17,10 +17,10 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ -/** Batchmake_TaskDao */ -class Batchmake_TaskDao extends AppDao { +/** Batchmake_TaskDao */ +class Batchmake_TaskDao extends AppDao + { public $_model = 'Task'; public $_module = 'batchmake'; - -} + } diff --git a/modules/batchmake/models/pdo/CondorDagModel.php b/modules/batchmake/models/pdo/CondorDagModel.php index b01d2f35a..ad9fa5752 100644 --- a/modules/batchmake/models/pdo/CondorDagModel.php +++ b/modules/batchmake/models/pdo/CondorDagModel.php @@ -9,10 +9,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH . '/modules/batchmake/models/base/CondorDagModelBase.php'; /** CondorDag class */ -class Batchmake_CondorDagModel extends Batchmake_CondorDagModelBase { - - -} +class Batchmake_CondorDagModel extends Batchmake_CondorDagModelBase + { + } diff --git a/modules/batchmake/models/pdo/CondorJobModel.php b/modules/batchmake/models/pdo/CondorJobModel.php index e83312995..5f3d0433b 100644 --- a/modules/batchmake/models/pdo/CondorJobModel.php +++ b/modules/batchmake/models/pdo/CondorJobModel.php @@ -9,10 +9,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH . '/modules/batchmake/models/base/CondorJobModelBase.php'; /** CondorJob class */ -class Batchmake_CondorJobModel extends Batchmake_CondorJobModelBase { - - -} +class Batchmake_CondorJobModel extends Batchmake_CondorJobModelBase + { + } diff --git a/modules/batchmake/models/pdo/ItemmetricModel.php b/modules/batchmake/models/pdo/ItemmetricModel.php index ec7ba4a1d..5487b0b18 100644 --- a/modules/batchmake/models/pdo/ItemmetricModel.php +++ b/modules/batchmake/models/pdo/ItemmetricModel.php @@ -17,11 +17,12 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH . '/modules/batchmake/models/base/ItemmetricModelBase.php'; /** Batchmake_ItemmetricModel */ -class Batchmake_ItemmetricModel extends Batchmake_ItemmetricModelBase { - +class Batchmake_ItemmetricModel extends Batchmake_ItemmetricModelBase + { /** * @return all rows stored. */ @@ -30,6 +31,4 @@ public function getAll() $rowsetDAOs = $this->database->getAll('Itemmetric', 'batchmake'); return $rowsetDAOs; } - - -} + } diff --git a/modules/batchmake/models/pdo/TaskModel.php b/modules/batchmake/models/pdo/TaskModel.php index 39d3865e0..ee898bcef 100644 --- a/modules/batchmake/models/pdo/TaskModel.php +++ b/modules/batchmake/models/pdo/TaskModel.php @@ -17,10 +17,10 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ -require_once BASE_PATH . '/modules/batchmake/models/base/TaskModelBase.php'; +require_once BASE_PATH . '/modules/batchmake/models/base/TaskModelBase.php'; /** Batchmake_TaskModel */ -class Batchmake_TaskModel extends Batchmake_TaskModelBase { - -} +class Batchmake_TaskModel extends Batchmake_TaskModelBase + { + } diff --git a/modules/batchmake/tests/library/BatchmakeMock.php b/modules/batchmake/tests/library/BatchmakeMock.php index 14070d011..f4327eddc 100644 --- a/modules/batchmake/tests/library/BatchmakeMock.php +++ b/modules/batchmake/tests/library/BatchmakeMock.php @@ -21,7 +21,7 @@ * Mock object used to simulate BatchMake executable for testing. */ class Batchmake_BatchmakeMock -{ + { protected $compileFlag = "'-c'"; protected $generateDagFlag = "'--condor'"; @@ -212,4 +212,4 @@ public function execGenerateCondorDag($command, &$output = null, $chdir = "", &$ } -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/batchmake/tests/library/CondorSubmitDagMock.php b/modules/batchmake/tests/library/CondorSubmitDagMock.php index 5d52f0edd..fc58b7679 100644 --- a/modules/batchmake/tests/library/CondorSubmitDagMock.php +++ b/modules/batchmake/tests/library/CondorSubmitDagMock.php @@ -22,7 +22,7 @@ * Mock object simulating condor_submit_dag executable. */ class Batchmake_CondorSubmitDagMock -{ + { // Problematic to throw exceptions as many test cases expect exceptions // The way around this is to have application code throw exceptions with @@ -85,4 +85,4 @@ public function exec($command, &$output = null, $chdir = "", &$return_val = null } -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/batchmake/tests/library/ExecutorMock.php b/modules/batchmake/tests/library/ExecutorMock.php index 7c0ae2547..9432b254e 100644 --- a/modules/batchmake/tests/library/ExecutorMock.php +++ b/modules/batchmake/tests/library/ExecutorMock.php @@ -72,7 +72,7 @@ public function exec($command, &$output = null, $chdir = "", &$return_val = null KWUtils::exec($command, $output, $chdir, $return_val); } } -} // end class + } // end class diff --git a/modules/cleanup/AppController.php b/modules/cleanup/AppController.php index 4bd68b477..d40be93b4 100644 --- a/modules/cleanup/AppController.php +++ b/modules/cleanup/AppController.php @@ -14,4 +14,4 @@ class Cleanup_AppController extends MIDAS_GlobalModule { public $moduleName = 'cleanup'; - } //end class + } // end class diff --git a/modules/cleanup/Notification.php b/modules/cleanup/Notification.php index 550e5e765..55e7d8a9c 100644 --- a/modules/cleanup/Notification.php +++ b/modules/cleanup/Notification.php @@ -79,4 +79,4 @@ private function _cleanupRecursive($dir, $cutoff, &$log) } } } - } //end class + } // end class diff --git a/modules/cleanup/controllers/ConfigController.php b/modules/cleanup/controllers/ConfigController.php index 5ac30e825..3744e4be7 100644 --- a/modules/cleanup/controllers/ConfigController.php +++ b/modules/cleanup/controllers/ConfigController.php @@ -2,7 +2,7 @@ /** Configure controller for cleanup module */ class Cleanup_ConfigController extends Cleanup_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); @@ -77,4 +77,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/cleanup/controllers/IndexController.php b/modules/cleanup/controllers/IndexController.php index ee4919e1c..560a7804c 100644 --- a/modules/cleanup/controllers/IndexController.php +++ b/modules/cleanup/controllers/IndexController.php @@ -2,10 +2,10 @@ /** Index controller for cleanup module */ class Cleanup_IndexController extends Cleanup_AppController -{ + { /** index action*/ function indexAction() { } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/cleanup/controllers/forms/ConfigForm.php b/modules/cleanup/controllers/forms/ConfigForm.php index f5fd3fce7..f916a6f0c 100644 --- a/modules/cleanup/controllers/forms/ConfigForm.php +++ b/modules/cleanup/controllers/forms/ConfigForm.php @@ -1,7 +1,7 @@ getLog(); } -} + } diff --git a/modules/comments/AppController.php b/modules/comments/AppController.php index beabb5190..0ad137cb9 100644 --- a/modules/comments/AppController.php +++ b/modules/comments/AppController.php @@ -14,4 +14,4 @@ class Comments_AppController extends MIDAS_GlobalModule { public $moduleName = 'comments'; - } //end class + } // end class diff --git a/modules/comments/controllers/CommentController.php b/modules/comments/controllers/CommentController.php index bd8ceaa7f..00d56f8a3 100644 --- a/modules/comments/controllers/CommentController.php +++ b/modules/comments/controllers/CommentController.php @@ -2,7 +2,7 @@ /** Controller for adding and removing comments */ class Comments_CommentController extends Comments_AppController -{ + { public $_models = array('Item'); public $_moduleModels = array('Itemcomment'); @@ -104,4 +104,4 @@ function deleteAction() } echo JsonComponent::encode($retVal); } -}//end class + } // end class diff --git a/modules/comments/controllers/ConfigController.php b/modules/comments/controllers/ConfigController.php index 87fab8244..b79f24589 100644 --- a/modules/comments/controllers/ConfigController.php +++ b/modules/comments/controllers/ConfigController.php @@ -2,11 +2,11 @@ /** Configure controller for comments module */ class Comments_ConfigController extends Comments_AppController -{ + { /** index action*/ function indexAction() { $this->requireAdminPrivileges(); } -}//end class + } // end class diff --git a/modules/comments/controllers/IndexController.php b/modules/comments/controllers/IndexController.php index 2c05d97f7..1daddab9f 100644 --- a/modules/comments/controllers/IndexController.php +++ b/modules/comments/controllers/IndexController.php @@ -2,10 +2,10 @@ /** Index controller for comments module */ class Comments_IndexController extends Comments_AppController -{ + { /** index action*/ function indexAction() { } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/comments/controllers/components/CommentComponent.php b/modules/comments/controllers/components/CommentComponent.php index cc48637b7..e4dda0a50 100644 --- a/modules/comments/controllers/components/CommentComponent.php +++ b/modules/comments/controllers/components/CommentComponent.php @@ -20,7 +20,7 @@ /** Helper component for the comments module */ class Comments_CommentComponent extends AppComponent -{ + { /** * Returns a page of comments and all required information * to be rendered in the view @@ -42,4 +42,4 @@ public function getComments($item, $limit, $offset) } return array($commentsList, $total); } -} // end class + } // end class diff --git a/modules/comments/models/AppDao.php b/modules/comments/models/AppDao.php index ddaa67dbc..8130f5a59 100644 --- a/modules/comments/models/AppDao.php +++ b/modules/comments/models/AppDao.php @@ -4,4 +4,4 @@ class Comments_AppDao extends MIDAS_GlobalDao { public $_module = 'comments'; - } //end class + } // end class diff --git a/modules/comments/models/AppModel.php b/modules/comments/models/AppModel.php index aaad49ff4..82c256855 100644 --- a/modules/comments/models/AppModel.php +++ b/modules/comments/models/AppModel.php @@ -12,6 +12,6 @@ /** Base model class for the comments module */ class Comments_AppModel extends MIDASModel -{ + { public $moduleName = 'comments'; -} + } diff --git a/modules/comments/models/base/ItemcommentModelBase.php b/modules/comments/models/base/ItemcommentModelBase.php index 184031c69..da672ed58 100644 --- a/modules/comments/models/base/ItemcommentModelBase.php +++ b/modules/comments/models/base/ItemcommentModelBase.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + abstract class Comments_ItemcommentModelBase extends Comments_AppModel -{ + { /** constructor */ public function __construct() { @@ -59,4 +60,4 @@ public function addComment($user, $item, $comment) Zend_Registry::get('notifier')->callback('CALLBACK_COMMENTS_ADDED_COMMENT', array('comment' => $commentDao)); } -} + } diff --git a/modules/comments/models/pdo/ItemcommentModel.php b/modules/comments/models/pdo/ItemcommentModel.php index ad5d5c25f..0146ea08d 100644 --- a/modules/comments/models/pdo/ItemcommentModel.php +++ b/modules/comments/models/pdo/ItemcommentModel.php @@ -17,11 +17,12 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH.'/modules/comments/models/base/ItemcommentModelBase.php'; /** Item comment model implementation */ class Comments_ItemcommentModel extends Comments_ItemcommentModelBase -{ + { /** * Get (paginated) comments on an item */ @@ -69,4 +70,4 @@ public function getTotal($item) $row = $this->database->fetchRow($sql); return $row['count']; } -} + } diff --git a/modules/communityagreement/AppController.php b/modules/communityagreement/AppController.php index 09f9d4921..79da4e6b5 100644 --- a/modules/communityagreement/AppController.php +++ b/modules/communityagreement/AppController.php @@ -33,4 +33,4 @@ class Communityagreement_AppController extends MIDAS_GlobalModule * @var Communityagreement_AgreementModelBase */ var $Communityagreement_Agreement; - } //end class + } // end class diff --git a/modules/communityagreement/Notification.php b/modules/communityagreement/Notification.php index e49237e2d..0df3bc713 100644 --- a/modules/communityagreement/Notification.php +++ b/modules/communityagreement/Notification.php @@ -78,4 +78,4 @@ public function getCommunityViewExtraHtml($params) return $val; } - } //end class + } // end class diff --git a/modules/communityagreement/controllers/ConfigController.php b/modules/communityagreement/controllers/ConfigController.php index af1d20bd9..e307e07d0 100644 --- a/modules/communityagreement/controllers/ConfigController.php +++ b/modules/communityagreement/controllers/ConfigController.php @@ -24,7 +24,7 @@ * @package communityagreement */ class Communityagreement_ConfigController extends Communityagreement_AppController -{ + { public $_models = array('Community'); public $_moduleModels = array('Agreement'); public $_moduleForms = array('Config'); @@ -139,4 +139,4 @@ function agreementdialogAction() $this->view->agreementDao = $agreementDao; } -}//end class + } // end class diff --git a/modules/communityagreement/controllers/forms/ConfigForm.php b/modules/communityagreement/controllers/forms/ConfigForm.php index dbccb9298..550dc916a 100644 --- a/modules/communityagreement/controllers/forms/ConfigForm.php +++ b/modules/communityagreement/controllers/forms/ConfigForm.php @@ -27,7 +27,7 @@ */ class Communityagreement_ConfigForm extends AppForm -{ + { /** * Create create_agreement form * @@ -48,4 +48,4 @@ public function createCreateAgreementForm($community_id) return $form; } -} // end class + } // end class diff --git a/modules/communityagreement/models/AppDao.php b/modules/communityagreement/models/AppDao.php index 50210f243..5dadbe093 100644 --- a/modules/communityagreement/models/AppDao.php +++ b/modules/communityagreement/models/AppDao.php @@ -26,4 +26,4 @@ class Communityagreement_AppDao extends MIDAS_GlobalDao { public $moduleName='communityagreement'; - } //end class + } // end class diff --git a/modules/communityagreement/models/AppModel.php b/modules/communityagreement/models/AppModel.php index f0f20e64c..7f3aba85f 100644 --- a/modules/communityagreement/models/AppModel.php +++ b/modules/communityagreement/models/AppModel.php @@ -25,6 +25,6 @@ * @package communityagreement */ class Communityagreement_AppModel extends MIDASModel -{ + { public $moduleName='communityagreement'; -} + } diff --git a/modules/communityagreement/models/base/AgreementModelBase.php b/modules/communityagreement/models/base/AgreementModelBase.php index b4295d92f..b2ddfec7b 100644 --- a/modules/communityagreement/models/base/AgreementModelBase.php +++ b/modules/communityagreement/models/base/AgreementModelBase.php @@ -26,7 +26,7 @@ * @package communityagreement */ class Communityagreement_AgreementModelBase extends Communityagreement_AppModel -{ + { /** constructor*/ public function __construct() { @@ -58,4 +58,4 @@ function createAgreement($community_id, $agreement) return $agreementDao; } -} // end class AgreementModelBase \ No newline at end of file + } // end class AgreementModelBase \ No newline at end of file diff --git a/modules/communityagreement/models/pdo/AgreementModel.php b/modules/communityagreement/models/pdo/AgreementModel.php index cd9252af0..f55ede733 100644 --- a/modules/communityagreement/models/pdo/AgreementModel.php +++ b/modules/communityagreement/models/pdo/AgreementModel.php @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH.'/modules/communityagreement/models/base/AgreementModelBase.php'; /** @@ -28,7 +29,7 @@ * @package communityagreement */ class Communityagreement_AgreementModel extends Communityagreement_AgreementModelBase -{ + { /** * get all the community agreements * @@ -59,4 +60,4 @@ function getByCommunityId($community_id) $dao = $this->initDao('Agreement', $row, 'communityagreement'); return $dao; } -} // end class \ No newline at end of file + } // end class diff --git a/modules/dicomanonymize/AppController.php b/modules/dicomanonymize/AppController.php index f9c1fa0e8..e5ad5a75c 100644 --- a/modules/dicomanonymize/AppController.php +++ b/modules/dicomanonymize/AppController.php @@ -14,4 +14,4 @@ class Dicomanonymize_AppController extends MIDAS_GlobalModule { public $moduleName = 'dicomanonymize'; - } //end class + } // end class diff --git a/modules/dicomanonymize/Notification.php b/modules/dicomanonymize/Notification.php index a64123d01..94b279479 100644 --- a/modules/dicomanonymize/Notification.php +++ b/modules/dicomanonymize/Notification.php @@ -31,4 +31,4 @@ public function getUploadTab($params) { return array('DICOM' => $this->webroot.'/'.$this->moduleName.'/upload'); } -} //end class + } // end class diff --git a/modules/dicomanonymize/controllers/ConfigController.php b/modules/dicomanonymize/controllers/ConfigController.php index e34308ac9..956019eb3 100644 --- a/modules/dicomanonymize/controllers/ConfigController.php +++ b/modules/dicomanonymize/controllers/ConfigController.php @@ -12,7 +12,7 @@ /** Module configuration controller (for admin use) */ class Dicomanonymize_ConfigController extends Dicomanonymize_AppController -{ + { public $_components = array('Breadcrumb'); /** @@ -46,4 +46,4 @@ function submitAction() echo JsonComponent::encode(array('message' => 'Changes saved', 'status' => 'ok')); } -}//end class + } // end class diff --git a/modules/dicomanonymize/controllers/UploadController.php b/modules/dicomanonymize/controllers/UploadController.php index d571eb0c4..d65ce7a7b 100644 --- a/modules/dicomanonymize/controllers/UploadController.php +++ b/modules/dicomanonymize/controllers/UploadController.php @@ -12,7 +12,7 @@ /** DICOM Anonymized upload controller */ class Dicomanonymize_UploadController extends Dicomanonymize_AppController -{ + { public $_models = array('License'); /** @@ -75,4 +75,4 @@ function indexAction() array('folder' => $folder)); } -}//end class + } // end class diff --git a/modules/dicomextractor/AppController.php b/modules/dicomextractor/AppController.php index f26852887..9ffa51b58 100644 --- a/modules/dicomextractor/AppController.php +++ b/modules/dicomextractor/AppController.php @@ -13,4 +13,4 @@ class Dicomextractor_AppController extends MIDAS_GlobalModule { public $moduleName='dicomextractor'; - } //end class + } // end class diff --git a/modules/dicomextractor/Notification.php b/modules/dicomextractor/Notification.php index f8f10b83e..12e30ae05 100644 --- a/modules/dicomextractor/Notification.php +++ b/modules/dicomextractor/Notification.php @@ -61,4 +61,4 @@ public function getDashboard() return $return; }//end _getDasboard -} //end class + } // end class diff --git a/modules/dicomextractor/controllers/ConfigController.php b/modules/dicomextractor/controllers/ConfigController.php index cfaa49b01..cbdf4eae5 100644 --- a/modules/dicomextractor/controllers/ConfigController.php +++ b/modules/dicomextractor/controllers/ConfigController.php @@ -11,7 +11,7 @@ =========================================================================*/ class Dicomextractor_ConfigController extends Dicomextractor_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); @@ -72,4 +72,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/dicomextractor/controllers/api/ItemController.php b/modules/dicomextractor/controllers/api/ItemController.php index 295b0afff..22913014b 100644 --- a/modules/dicomextractor/controllers/api/ItemController.php +++ b/modules/dicomextractor/controllers/api/ItemController.php @@ -21,9 +21,8 @@ /** * WebApi controller for Item Resource (in dicomextractor module) */ - class Apidicomextractor_ItemController extends ApiController -{ + { /** * The put action handles PUT requests and receives an 'id' parameter; it * should update the server resource state of the resource identified by @@ -44,5 +43,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, PUT'); } - -} + } diff --git a/modules/dicomextractor/controllers/components/ApiComponent.php b/modules/dicomextractor/controllers/components/ApiComponent.php index 04551286a..e338b9b10 100644 --- a/modules/dicomextractor/controllers/components/ApiComponent.php +++ b/modules/dicomextractor/controllers/components/ApiComponent.php @@ -12,8 +12,7 @@ /** Component for api methods */ class Dicomextractor_ApiComponent extends AppComponent -{ - + { /** Return the user dao */ private function _callModuleApiMethod($args, $coreApiMethod, $resource = null, $hasReturn = true) { @@ -31,10 +30,9 @@ private function _callModuleApiMethod($args, $coreApiMethod, $resource = null, * @return the id of the revision */ function extract($args) - { + { $ApihelperComponent = MidasLoader::loadComponent('Apihelper'); $ApihelperComponent->renameParamKey($args, 'item', 'id'); return $this->_callModuleApiMethod($args, 'extract', 'item'); + } } - -} diff --git a/modules/dicomextractor/controllers/components/ApiitemComponent.php b/modules/dicomextractor/controllers/components/ApiitemComponent.php index 6f2d6480a..542fff8b2 100644 --- a/modules/dicomextractor/controllers/components/ApiitemComponent.php +++ b/modules/dicomextractor/controllers/components/ApiitemComponent.php @@ -12,7 +12,7 @@ /** Apiitem Component for api methods */ class Dicomextractor_ApiitemComponent extends AppComponent -{ + { /** * Extract the dicom metadata from a revision * @path /dicomextractor/item/{id} @@ -21,7 +21,7 @@ class Dicomextractor_ApiitemComponent extends AppComponent * @return the id of the revision */ function extract($args) - { + { $apihelperComponent = MidasLoader::loadComponent('Apihelper'); $apihelperComponent->validateParams($args, array('id')); @@ -44,6 +44,5 @@ function extract($args) $dicomComponent->extract($revisionDao); $dicomComponent->thumbnail($itemDao); return json_encode($revisionDao); + } } - -} diff --git a/modules/dicomextractor/controllers/components/ExtractorComponent.php b/modules/dicomextractor/controllers/components/ExtractorComponent.php index 1d3e38aab..d20a9d7ab 100644 --- a/modules/dicomextractor/controllers/components/ExtractorComponent.php +++ b/modules/dicomextractor/controllers/components/ExtractorComponent.php @@ -12,7 +12,7 @@ include_once BASE_PATH . '/library/KWUtils.php'; /** Exract dicom metadata */ class Dicomextractor_ExtractorComponent extends AppComponent -{ + { /** * Check whether a given application is configured properly. @@ -264,4 +264,4 @@ public function extract($revision) } } -} // end class + } // end class diff --git a/modules/dicomextractor/controllers/forms/ConfigForm.php b/modules/dicomextractor/controllers/forms/ConfigForm.php index bf190db37..3f0722b04 100644 --- a/modules/dicomextractor/controllers/forms/ConfigForm.php +++ b/modules/dicomextractor/controllers/forms/ConfigForm.php @@ -12,7 +12,7 @@ /** Configuration form for the dicom extractor */ class Dicomextractor_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() @@ -35,4 +35,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/dicomserver/AppController.php b/modules/dicomserver/AppController.php index fdeb92873..adc6bd2c2 100644 --- a/modules/dicomserver/AppController.php +++ b/modules/dicomserver/AppController.php @@ -13,4 +13,4 @@ class Dicomserver_AppController extends MIDAS_GlobalModule { public $moduleName='dicomserver'; - } //end class + } // end class diff --git a/modules/dicomserver/Notification.php b/modules/dicomserver/Notification.php index ede9ae644..f8ca7a0bb 100644 --- a/modules/dicomserver/Notification.php +++ b/modules/dicomserver/Notification.php @@ -72,4 +72,4 @@ public function getItemInfo($params) '; } -} //end class + } // end class diff --git a/modules/dicomserver/controllers/ConfigController.php b/modules/dicomserver/controllers/ConfigController.php index 28939938b..651c65faf 100644 --- a/modules/dicomserver/controllers/ConfigController.php +++ b/modules/dicomserver/controllers/ConfigController.php @@ -11,7 +11,7 @@ =========================================================================*/ class Dicomserver_ConfigController extends Dicomserver_AppController -{ + { public $_moduleComponents = array('Server'); public $_moduleForms=array('Config'); public $_components=array('Utility', 'Date'); @@ -107,4 +107,4 @@ function indexAction() $this->view->dashboard = $dashboard_array; } -}//end class + } // end class diff --git a/modules/dicomserver/controllers/api/ServerController.php b/modules/dicomserver/controllers/api/ServerController.php index 410c85faa..87f899bf1 100644 --- a/modules/dicomserver/controllers/api/ServerController.php +++ b/modules/dicomserver/controllers/api/ServerController.php @@ -21,9 +21,8 @@ /** * WebApi controller for Server Resource (in dicomserver module) */ - class Apidicomserver_ServerController extends ApiController -{ + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -82,5 +81,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, GET, HEAD, POST'); } - -} + } diff --git a/modules/dicomserver/controllers/components/ApiComponent.php b/modules/dicomserver/controllers/components/ApiComponent.php index 431188702..6e853d2de 100644 --- a/modules/dicomserver/controllers/components/ApiComponent.php +++ b/modules/dicomserver/controllers/components/ApiComponent.php @@ -11,9 +11,10 @@ =========================================================================*/ include_once BASE_PATH . '/library/KWUtils.php'; + /** Component for api methods */ class Dicomserver_ApiComponent extends AppComponent -{ + { /** Return the user dao */ private function _callModuleApiMethod($args, $coreApiMethod, $resource = null, $hasReturn = true) { @@ -87,4 +88,4 @@ function registrationStatus($args) { return $this->_callModuleApiMethod($args, 'registrationStatus', 'server'); } -} + } diff --git a/modules/dicomserver/controllers/components/ApiserverComponent.php b/modules/dicomserver/controllers/components/ApiserverComponent.php index d5b54e801..3b79435a3 100644 --- a/modules/dicomserver/controllers/components/ApiserverComponent.php +++ b/modules/dicomserver/controllers/components/ApiserverComponent.php @@ -11,10 +11,10 @@ =========================================================================*/ include_once BASE_PATH . '/library/KWUtils.php'; + /** Component for api methods */ class Dicomserver_ApiserverComponent extends AppComponent -{ - + { /** * Start DICOM server * @path /dicomserver/server/start @@ -408,5 +408,5 @@ function registrationStatus($args) { return array('status' => true); } + } } -} diff --git a/modules/dicomserver/controllers/components/ServerComponent.php b/modules/dicomserver/controllers/components/ServerComponent.php index a9099b583..153da87ec 100644 --- a/modules/dicomserver/controllers/components/ServerComponent.php +++ b/modules/dicomserver/controllers/components/ServerComponent.php @@ -12,7 +12,7 @@ include_once BASE_PATH . '/library/KWUtils.php'; /** Uploade dicom files */ class Dicomserver_ServerComponent extends AppComponent -{ + { /** * Verify that DICOM server is setup properly @@ -171,4 +171,4 @@ public function register($revision) } } -} // end class + } // end class diff --git a/modules/dicomserver/controllers/forms/ConfigForm.php b/modules/dicomserver/controllers/forms/ConfigForm.php index 2c63ba6a2..d9285fe89 100644 --- a/modules/dicomserver/controllers/forms/ConfigForm.php +++ b/modules/dicomserver/controllers/forms/ConfigForm.php @@ -12,7 +12,7 @@ /** Configuration form for the dicom server */ class Dicomserver_ConfigForm extends AppForm -{ + { /** create createConfigform */ public function createConfigForm() @@ -45,4 +45,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/dicomserver/models/AppDao.php b/modules/dicomserver/models/AppDao.php index daab62972..c2fc4e252 100644 --- a/modules/dicomserver/models/AppDao.php +++ b/modules/dicomserver/models/AppDao.php @@ -21,4 +21,4 @@ class Dicomserver_AppDao extends MIDAS_GlobalDao { public $moduleName='dicomserver'; - } //end class + } // end class diff --git a/modules/dicomserver/models/AppModel.php b/modules/dicomserver/models/AppModel.php index 9a7611d7a..4ae75ae0b 100644 --- a/modules/dicomserver/models/AppModel.php +++ b/modules/dicomserver/models/AppModel.php @@ -19,7 +19,6 @@ =========================================================================*/ class Dicomserver_AppModel extends MIDASModel -{ + { public $moduleName = 'dicomserver'; - -} + } diff --git a/modules/dicomserver/models/base/RegistrationModelBase.php b/modules/dicomserver/models/base/RegistrationModelBase.php index 6914d9eea..f78c87fca 100644 --- a/modules/dicomserver/models/base/RegistrationModelBase.php +++ b/modules/dicomserver/models/base/RegistrationModelBase.php @@ -9,10 +9,12 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + include_once BASE_PATH . '/modules/dicomserver/constant/module.php'; -/** RegistrationModel Base class */ -abstract class Dicomserver_RegistrationModelBase extends Dicomserver_AppModel { +/** RegistrationModel Base class */ +abstract class Dicomserver_RegistrationModelBase extends Dicomserver_AppModel + { /** * constructor */ @@ -47,6 +49,4 @@ function createRegistration($item_id) $this->save($registrationDao); return $registrationDao; } - - -} // end class Dicomserver_RegistrationModelBase + } // end class diff --git a/modules/dicomserver/models/dao/RegistrationDao.php b/modules/dicomserver/models/dao/RegistrationDao.php index efe8b024b..0bb65675d 100644 --- a/modules/dicomserver/models/dao/RegistrationDao.php +++ b/modules/dicomserver/models/dao/RegistrationDao.php @@ -9,10 +9,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -/** Dicomserver_RegistrationDao */ -class Dicomserver_RegistrationDao extends AppDao { +/** Dicomserver_RegistrationDao */ +class Dicomserver_RegistrationDao extends AppDao + { public $_model = 'Registration'; public $_module = 'dicomserver'; - -} + } diff --git a/modules/dicomserver/models/pdo/RegistrationModel.php b/modules/dicomserver/models/pdo/RegistrationModel.php index 08a57ad1e..f6eb12b3c 100644 --- a/modules/dicomserver/models/pdo/RegistrationModel.php +++ b/modules/dicomserver/models/pdo/RegistrationModel.php @@ -9,22 +9,20 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ -require_once BASE_PATH . '/modules/dicomserver/models/base/RegistrationModelBase.php'; +require_once BASE_PATH . '/modules/dicomserver/models/base/RegistrationModelBase.php'; /** Dicomserver_RegistrationModel */ -class Dicomserver_RegistrationModel extends Dicomserver_RegistrationModelBase { - +class Dicomserver_RegistrationModel extends Dicomserver_RegistrationModelBase + { /** * Returns registration by a itemId * @param type $itemId * @return type */ - function checkByItemId($itemId) { $row = $this->database->fetchRow($this->database->select()->where('item_id=?', $itemId)); return $this->initDao('Registration', $row, 'dicomserver'); } - -} + } diff --git a/modules/example/AppController.php b/modules/example/AppController.php index 24bab6917..48abb2c0c 100644 --- a/modules/example/AppController.php +++ b/modules/example/AppController.php @@ -22,4 +22,4 @@ class Example_AppController extends MIDAS_GlobalModule { public $moduleName='example'; - } //end class + } // end class diff --git a/modules/example/controllers/IndexController.php b/modules/example/controllers/IndexController.php index 0858fdd82..a64d14e66 100644 --- a/modules/example/controllers/IndexController.php +++ b/modules/example/controllers/IndexController.php @@ -21,7 +21,7 @@ /** example index controller*/ class Example_IndexController extends Example_AppController -{ + { /** init method */ function init() @@ -37,4 +37,4 @@ function indexAction() -}//end class + } // end class diff --git a/modules/example/controllers/SampleController.php b/modules/example/controllers/SampleController.php index 99baa247d..07c1c547c 100644 --- a/modules/example/controllers/SampleController.php +++ b/modules/example/controllers/SampleController.php @@ -54,4 +54,4 @@ function deleteAction() } - }//end class + } // end class diff --git a/modules/example/database/upgrade/1.0.1.php b/modules/example/database/upgrade/1.0.1.php index 4abac63fe..23147102a 100644 --- a/modules/example/database/upgrade/1.0.1.php +++ b/modules/example/database/upgrade/1.0.1.php @@ -19,7 +19,7 @@ =========================================================================*/ class Example_Upgrade_1_0_1 extends MIDASUpgrade -{ + { public function preUpgrade() { } @@ -39,4 +39,4 @@ public function pgsql() public function postUpgrade() { } -} + } diff --git a/modules/example/models/AppDao.php b/modules/example/models/AppDao.php index 23135fd32..a2d782f85 100644 --- a/modules/example/models/AppDao.php +++ b/modules/example/models/AppDao.php @@ -16,5 +16,5 @@ class Example_AppDao extends MIDAS_GlobalDao { public $moduleName = 'example'; - } //end class + } // end class diff --git a/modules/example/models/base/WalletModelBase.php b/modules/example/models/base/WalletModelBase.php index 90fd32e13..0e80600f3 100644 --- a/modules/example/models/base/WalletModelBase.php +++ b/modules/example/models/base/WalletModelBase.php @@ -54,4 +54,4 @@ function createWallet($userDao, $dollars) return $wallet; } // end createWallet() - } // end class Example_WalletModelBase + } // end class diff --git a/modules/keyfiles/AppController.php b/modules/keyfiles/AppController.php index a35eb07a9..c085f7ea9 100644 --- a/modules/keyfiles/AppController.php +++ b/modules/keyfiles/AppController.php @@ -14,4 +14,4 @@ class Keyfiles_AppController extends MIDAS_GlobalModule { public $moduleName = 'keyfiles'; - } //end class + } // end class diff --git a/modules/keyfiles/Notification.php b/modules/keyfiles/Notification.php index 9a74c641b..3bad7c166 100644 --- a/modules/keyfiles/Notification.php +++ b/modules/keyfiles/Notification.php @@ -48,4 +48,4 @@ public function getFooter() { return ''; } - } //end class + } // end class diff --git a/modules/keyfiles/controllers/DownloadController.php b/modules/keyfiles/controllers/DownloadController.php index f4557a339..ad6437b1d 100644 --- a/modules/keyfiles/controllers/DownloadController.php +++ b/modules/keyfiles/controllers/DownloadController.php @@ -2,7 +2,7 @@ /** Controller for downloading key files */ class Keyfiles_DownloadController extends Keyfiles_AppController -{ + { var $_models = array('Bitstream', 'Folder', 'Item'); /** @@ -204,4 +204,4 @@ public function outputCallback(&$zip, $path, $item, $bitstream, $count) $path .= '/'.$bitstream->getName().'.md5'; $zip->add_file($path, $bitstream->getChecksum()); } -}//end class + } // end class diff --git a/modules/keyfiles/models/AppDao.php b/modules/keyfiles/models/AppDao.php index 2609d9775..a9254a859 100644 --- a/modules/keyfiles/models/AppDao.php +++ b/modules/keyfiles/models/AppDao.php @@ -4,4 +4,4 @@ class Keyfiles_AppDao extends MIDAS_GlobalDao { public $_module = 'keyfiles'; - } //end class + } // end class diff --git a/modules/keyfiles/models/AppModel.php b/modules/keyfiles/models/AppModel.php index 73aed7ef1..4d81c80f8 100644 --- a/modules/keyfiles/models/AppModel.php +++ b/modules/keyfiles/models/AppModel.php @@ -12,6 +12,6 @@ /** Base model class for the key files module */ class Keyfiles_AppModel extends MIDASModel -{ + { public $moduleName = 'keyfiles'; -} + } diff --git a/modules/keyfiles/tests/controllers/KeyfilesDownloadControllerTest.php b/modules/keyfiles/tests/controllers/KeyfilesDownloadControllerTest.php index 0a9c97d28..f32ded30e 100644 --- a/modules/keyfiles/tests/controllers/KeyfilesDownloadControllerTest.php +++ b/modules/keyfiles/tests/controllers/KeyfilesDownloadControllerTest.php @@ -12,7 +12,7 @@ /** test keyfiles download controller */ class KeyfilesDownloadControllerTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -61,4 +61,4 @@ public function testDownloadZip() $this->assertController('download'); $this->assertAction('batch'); } -} + } diff --git a/modules/landingpage/AppController.php b/modules/landingpage/AppController.php index 8eeb39626..a76f811d4 100644 --- a/modules/landingpage/AppController.php +++ b/modules/landingpage/AppController.php @@ -21,4 +21,4 @@ class Landingpage_AppController extends MIDAS_GlobalModule { public $moduleName='landingpage'; - } //end class + } // end class diff --git a/modules/landingpage/Notification.php b/modules/landingpage/Notification.php index 00639d87c..a6b2562fb 100644 --- a/modules/landingpage/Notification.php +++ b/modules/landingpage/Notification.php @@ -26,4 +26,4 @@ public function init() { }//end init - } //end class + } // end class diff --git a/modules/landingpage/controllers/ConfigController.php b/modules/landingpage/controllers/ConfigController.php index 575ed9f40..fc5bb7a27 100644 --- a/modules/landingpage/controllers/ConfigController.php +++ b/modules/landingpage/controllers/ConfigController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** demo config controller*/ class Landingpage_ConfigController extends Landingpage_AppController -{ + { public $_moduleForms=array('Config'); public $_components=array('Utility'); public $_moduleModels = array('Text'); @@ -63,4 +63,4 @@ function indexAction() } } } -} // end class + } // end class diff --git a/modules/landingpage/controllers/IndexCoreController.php b/modules/landingpage/controllers/IndexCoreController.php index 5fac97ea8..472d71a37 100644 --- a/modules/landingpage/controllers/IndexCoreController.php +++ b/modules/landingpage/controllers/IndexCoreController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** demo overwrite component */ class Landingpage_IndexCoreController extends Landingpage_AppController -{ + { public $_moduleModels = array('Text'); public $_components = array('Utility'); @@ -47,4 +47,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/landingpage/controllers/forms/ConfigForm.php b/modules/landingpage/controllers/forms/ConfigForm.php index ecd0484c4..e2471a46f 100644 --- a/modules/landingpage/controllers/forms/ConfigForm.php +++ b/modules/landingpage/controllers/forms/ConfigForm.php @@ -20,7 +20,7 @@ /** Landingpage module config form*/ class Landingpage_ConfigForm extends AppForm -{ + { /** main config form */ public function createForm() { @@ -42,4 +42,4 @@ public function createForm() return $form; } // end function createForm -} // end class + } // end class diff --git a/modules/landingpage/models/AppDao.php b/modules/landingpage/models/AppDao.php index 84069cc3c..5cdfe8b9d 100644 --- a/modules/landingpage/models/AppDao.php +++ b/modules/landingpage/models/AppDao.php @@ -21,4 +21,4 @@ class Landingpage_AppDao extends MIDAS_GlobalDao { public $moduleName='landingpage'; - } //end class + } // end class diff --git a/modules/landingpage/models/AppModel.php b/modules/landingpage/models/AppModel.php index c9d3098da..236c09e76 100644 --- a/modules/landingpage/models/AppModel.php +++ b/modules/landingpage/models/AppModel.php @@ -19,5 +19,5 @@ =========================================================================*/ class Landingpage_AppModel extends MIDASModel -{ -} + { + } diff --git a/modules/landingpage/models/base/TextModelBase.php b/modules/landingpage/models/base/TextModelBase.php index 4ee23011a..f1c4fc8c8 100644 --- a/modules/landingpage/models/base/TextModelBase.php +++ b/modules/landingpage/models/base/TextModelBase.php @@ -17,10 +17,12 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH . '/modules/landingpage/models/AppModel.php'; + /** demo base model*/ abstract class Landingpage_TextModelBase extends Landingpage_AppModel -{ + { /** constructor*/ public function __construct() { @@ -36,5 +38,4 @@ public function __construct() } // end __construct() abstract function getAll(); - -} // end class Helloworld_HelloModelBase + } // end class diff --git a/modules/landingpage/models/pdo/TextModel.php b/modules/landingpage/models/pdo/TextModel.php index 0c6d27429..9b9775a01 100644 --- a/modules/landingpage/models/pdo/TextModel.php +++ b/modules/landingpage/models/pdo/TextModel.php @@ -17,12 +17,12 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH.'/modules/landingpage/models/base/TextModelBase.php'; /** Landingpage text pdo model */ - class Landingpage_TextModel extends Landingpage_TextModelBase -{ + { /** Get all */ public function getAll() { @@ -34,5 +34,4 @@ public function getAll() } return $return; } // end getAll() - -} // end class + } // end class diff --git a/modules/ldap/AppController.php b/modules/ldap/AppController.php index fb0023b8e..6901c9802 100644 --- a/modules/ldap/AppController.php +++ b/modules/ldap/AppController.php @@ -22,4 +22,4 @@ class Ldap_AppController extends MIDAS_GlobalModule { public $moduleName = 'ldap'; - } //end class + } // end class diff --git a/modules/ldap/Notification.php b/modules/ldap/Notification.php index 287f1bb8c..93c193d31 100644 --- a/modules/ldap/Notification.php +++ b/modules/ldap/Notification.php @@ -388,4 +388,4 @@ static function eatWarnings($errno, $errstr, $errfile, $errline) { return true; } - } //end class + } // end class diff --git a/modules/ldap/controllers/ConfigController.php b/modules/ldap/controllers/ConfigController.php index 7cda242c9..8089c4c6e 100644 --- a/modules/ldap/controllers/ConfigController.php +++ b/modules/ldap/controllers/ConfigController.php @@ -19,7 +19,7 @@ =========================================================================*/ class Ldap_ConfigController extends Ldap_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility'); @@ -95,4 +95,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/ldap/controllers/forms/ConfigForm.php b/modules/ldap/controllers/forms/ConfigForm.php index 944099128..daaac2c48 100644 --- a/modules/ldap/controllers/forms/ConfigForm.php +++ b/modules/ldap/controllers/forms/ConfigForm.php @@ -22,7 +22,7 @@ * Admin configuration form for the ldap module */ class Ldap_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() { @@ -92,4 +92,4 @@ public function createConfigForm() $submit)); return $form; } -} // end class + } // end class diff --git a/modules/ldap/database/upgrade/1.0.1.php b/modules/ldap/database/upgrade/1.0.1.php index 2ba03280c..e7d5e4ace 100644 --- a/modules/ldap/database/upgrade/1.0.1.php +++ b/modules/ldap/database/upgrade/1.0.1.php @@ -1,10 +1,9 @@ ModuleComponent->Extractor->extract($params[1]); return; } - } //end class + } // end class diff --git a/modules/metadataextractor/controllers/ConfigController.php b/modules/metadataextractor/controllers/ConfigController.php index e4ee5b597..a5c5cf3b1 100644 --- a/modules/metadataextractor/controllers/ConfigController.php +++ b/modules/metadataextractor/controllers/ConfigController.php @@ -19,7 +19,7 @@ =========================================================================*/ class Metadataextractor_ConfigController extends Metadataextractor_AppController -{ + { public $_moduleForms=array('Config'); public $_components=array('Utility', 'Date'); @@ -66,4 +66,4 @@ function indexAction() } } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/metadataextractor/controllers/components/ExtractorComponent.php b/modules/metadataextractor/controllers/components/ExtractorComponent.php index 36286cbf9..a432cd41f 100644 --- a/modules/metadataextractor/controllers/components/ExtractorComponent.php +++ b/modules/metadataextractor/controllers/components/ExtractorComponent.php @@ -19,7 +19,7 @@ =========================================================================*/ class Metadataextractor_ExtractorComponent extends AppComponent -{ + { /** extract metadata */ public function extract($revision) { @@ -96,4 +96,4 @@ public function extract($revision) return; } -} // end class + } // end class diff --git a/modules/metadataextractor/controllers/forms/ConfigForm.php b/modules/metadataextractor/controllers/forms/ConfigForm.php index 0f70bd300..58c348312 100644 --- a/modules/metadataextractor/controllers/forms/ConfigForm.php +++ b/modules/metadataextractor/controllers/forms/ConfigForm.php @@ -18,7 +18,7 @@ limitations under the License. =========================================================================*/ class Metadataextractor_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() @@ -37,4 +37,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/mfa/AppController.php b/modules/mfa/AppController.php index 7cd1f59da..6474afe1a 100644 --- a/modules/mfa/AppController.php +++ b/modules/mfa/AppController.php @@ -19,6 +19,6 @@ =========================================================================*/ class Mfa_AppController extends MIDAS_GlobalModule -{ + { public $moduleName = 'mfa'; -} //end class + } // end class diff --git a/modules/mfa/Notification.php b/modules/mfa/Notification.php index 6bfe24d86..0082c12fb 100644 --- a/modules/mfa/Notification.php +++ b/modules/mfa/Notification.php @@ -122,5 +122,5 @@ public function authInterceptApi($params) return array(); } } - } //end class + } // end class diff --git a/modules/mfa/controllers/ConfigController.php b/modules/mfa/controllers/ConfigController.php index 5c4ea48a1..015332282 100644 --- a/modules/mfa/controllers/ConfigController.php +++ b/modules/mfa/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Config controller for MFA module */ class Mfa_ConfigController extends Mfa_AppController -{ + { public $_models = array('Setting', 'User'); public $_moduleModels = array('Otpdevice'); public $_moduleDaos = array('Otpdevice'); @@ -200,5 +200,5 @@ function usersubmitAction() echo JsonComponent::encode(array('status' => 'ok', 'message' => 'OTP Authentication enabled')); } } -}//end class + } // end class diff --git a/modules/mfa/controllers/LoginController.php b/modules/mfa/controllers/LoginController.php index 7480220f4..dbfd98690 100644 --- a/modules/mfa/controllers/LoginController.php +++ b/modules/mfa/controllers/LoginController.php @@ -20,7 +20,7 @@ /** Login controller for MFA module */ class Mfa_LoginController extends Mfa_AppController -{ + { public $_models = array('User'); public $_moduleModels = array('Otpdevice'); public $_moduleComponents = array('Otp'); @@ -96,4 +96,4 @@ function submitAction() } } -}//end class + } // end class diff --git a/modules/mfa/controllers/components/ApiComponent.php b/modules/mfa/controllers/components/ApiComponent.php index 0bd4c339e..e0324605d 100644 --- a/modules/mfa/controllers/components/ApiComponent.php +++ b/modules/mfa/controllers/components/ApiComponent.php @@ -20,7 +20,7 @@ /** Component for api methods */ class Mfa_ApiComponent extends AppComponent -{ + { /** * Helper function for verifying keys in an input array */ @@ -82,4 +82,4 @@ public function otpLogin($params) return array('token' => $token); } -} // end class + } // end class diff --git a/modules/mfa/controllers/components/OtpComponent.php b/modules/mfa/controllers/components/OtpComponent.php index ab90a2876..920877ca8 100644 --- a/modules/mfa/controllers/components/OtpComponent.php +++ b/modules/mfa/controllers/components/OtpComponent.php @@ -23,7 +23,7 @@ * for all of the supported OTP technologies. */ class Mfa_OtpComponent extends AppComponent -{ + { /** Constructor */ function __construct() { @@ -115,10 +115,11 @@ protected function _radiusauth($otpDevice, $token) radius_strerror($rh)); } - if(!radius_create_request($rh, RADIUS_ACCESS_REQUEST)) { + if(!radius_create_request($rh, RADIUS_ACCESS_REQUEST)) + { throw new Zend_Exception('Cannot process requests to RADIUS server: ' . radius_strerror($rh)); - } + } /* this is the key parameter */ @@ -149,5 +150,4 @@ protected function _radiusauth($otpDevice, $token) radius_strerror($rh)); } } - -} + } diff --git a/modules/mfa/models/AppModel.php b/modules/mfa/models/AppModel.php index e9d8379f3..ed84d5a13 100644 --- a/modules/mfa/models/AppModel.php +++ b/modules/mfa/models/AppModel.php @@ -20,6 +20,6 @@ /** Base model class for MFA module */ class Mfa_AppModel extends MIDASModel -{ + { public $moduleName = 'mfa'; -} + } diff --git a/modules/mfa/models/base/ApitokenModelBase.php b/modules/mfa/models/base/ApitokenModelBase.php index abcea4c55..9a25648a5 100644 --- a/modules/mfa/models/base/ApitokenModelBase.php +++ b/modules/mfa/models/base/ApitokenModelBase.php @@ -23,7 +23,7 @@ * real api token, which they will have access to once they enter their OTP correctly. */ abstract class Mfa_ApitokenModelBase extends Mfa_AppModel -{ + { /** constructor */ public function __construct() { @@ -57,4 +57,4 @@ public function createTempToken($user, $tokenDao) return $newToken; } -} + } diff --git a/modules/mfa/models/base/OtpdeviceModelBase.php b/modules/mfa/models/base/OtpdeviceModelBase.php index 0fa1121ba..a147ad09a 100644 --- a/modules/mfa/models/base/OtpdeviceModelBase.php +++ b/modules/mfa/models/base/OtpdeviceModelBase.php @@ -23,7 +23,7 @@ * one-time-password device. */ abstract class Mfa_OtpdeviceModelBase extends Mfa_AppModel -{ + { /** constructor */ public function __construct() { @@ -44,4 +44,4 @@ public function __construct() } abstract function getByUser($userDao); -} + } diff --git a/modules/mfa/models/pdo/ApitokenModel.php b/modules/mfa/models/pdo/ApitokenModel.php index 7884dbff5..22f09094b 100644 --- a/modules/mfa/models/pdo/ApitokenModel.php +++ b/modules/mfa/models/pdo/ApitokenModel.php @@ -24,5 +24,5 @@ * PDO-level implementation of the MFA API Token model */ class Mfa_ApitokenModel extends Mfa_ApitokenModelBase -{ -} + { + } diff --git a/modules/mfa/models/pdo/OtpdeviceModel.php b/modules/mfa/models/pdo/OtpdeviceModel.php index 1f941d030..6564a2429 100644 --- a/modules/mfa/models/pdo/OtpdeviceModel.php +++ b/modules/mfa/models/pdo/OtpdeviceModel.php @@ -24,7 +24,7 @@ * PDO-level implementation of the OTP device model. */ class Mfa_OtpdeviceModel extends Mfa_OtpdeviceModelBase -{ + { /** * Get the user's OTP device dao. * @param userDao The user dao @@ -32,10 +32,12 @@ class Mfa_OtpdeviceModel extends Mfa_OtpdeviceModelBase */ function getByUser($userDao) { - if($userDao == null) { + if($userDao == null) + { return null; - } + } + $row = $this->database->fetchRow($this->database->select()->where('user_id = ?', $userDao->getKey())); return $this->initDao('Otpdevice', $row, 'mfa'); } -} + } diff --git a/modules/oai/AppController.php b/modules/oai/AppController.php index c8b893360..753f46714 100644 --- a/modules/oai/AppController.php +++ b/modules/oai/AppController.php @@ -21,4 +21,4 @@ class Oai_AppController extends MIDAS_GlobalModule { public $moduleName='oai'; - } //end class + } // end class diff --git a/modules/oai/Notification.php b/modules/oai/Notification.php index 054e0f00c..5a36066eb 100644 --- a/modules/oai/Notification.php +++ b/modules/oai/Notification.php @@ -27,4 +27,4 @@ public function init() { }//end init - } //end class + } // end class diff --git a/modules/oai/controllers/ConfigController.php b/modules/oai/controllers/ConfigController.php index 8185b84cb..3f7c2b1b1 100644 --- a/modules/oai/controllers/ConfigController.php +++ b/modules/oai/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Config controller*/ class Oai_ConfigController extends Oai_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); public $_moduleModels = array(); @@ -72,4 +72,4 @@ function indexAction() } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/oai/controllers/IndexController.php b/modules/oai/controllers/IndexController.php index 0b2b397c6..2710d3cdd 100644 --- a/modules/oai/controllers/IndexController.php +++ b/modules/oai/controllers/IndexController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Index */ class Oai_IndexController extends Oai_AppController -{ + { public $_moduleModels = array(); public $_models = array(); public $_components = array(); diff --git a/modules/oai/controllers/forms/ConfigForm.php b/modules/oai/controllers/forms/ConfigForm.php index e540c1511..590820a4f 100644 --- a/modules/oai/controllers/forms/ConfigForm.php +++ b/modules/oai/controllers/forms/ConfigForm.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Forms */ class Oai_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() @@ -40,4 +40,4 @@ public function createConfigForm() return $form; } -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/oauth/AppController.php b/modules/oauth/AppController.php index 35c526b93..b6641c086 100644 --- a/modules/oauth/AppController.php +++ b/modules/oauth/AppController.php @@ -22,4 +22,4 @@ class Oauth_AppController extends MIDAS_GlobalModule { public $moduleName = 'oauth'; - } //end class + } // end class diff --git a/modules/oauth/Notification.php b/modules/oauth/Notification.php index 015d99b55..b164cee24 100644 --- a/modules/oauth/Notification.php +++ b/modules/oauth/Notification.php @@ -103,4 +103,4 @@ public function getUserTabs($params) $moduleWebroot = $fc->getBaseUrl().'/'.$this->moduleName; return array('OAuth' => $moduleWebroot.'/client?userId='.$user->getKey()); } - } //end class + } // end class diff --git a/modules/oauth/controllers/AuthorizeController.php b/modules/oauth/controllers/AuthorizeController.php index d5c705c5e..a215aef6d 100644 --- a/modules/oauth/controllers/AuthorizeController.php +++ b/modules/oauth/controllers/AuthorizeController.php @@ -20,7 +20,7 @@ /** Handles grant authorization requests from the user agent */ class Oauth_AuthorizeController extends Oauth_AppController -{ + { public $_models = array('User'); public $_moduleModels = array('Client', 'Code'); diff --git a/modules/oauth/controllers/ClientController.php b/modules/oauth/controllers/ClientController.php index 953b6f512..536173d8d 100644 --- a/modules/oauth/controllers/ClientController.php +++ b/modules/oauth/controllers/ClientController.php @@ -20,7 +20,7 @@ /** Client management */ class Oauth_ClientController extends Oauth_AppController -{ + { public $_models = array('User'); public $_moduleModels = array('Client', 'Code', 'Token'); diff --git a/modules/oauth/controllers/TokenController.php b/modules/oauth/controllers/TokenController.php index ea189a915..fb536707d 100644 --- a/modules/oauth/controllers/TokenController.php +++ b/modules/oauth/controllers/TokenController.php @@ -20,7 +20,7 @@ /** Handles issuing new tokens and refreshing tokens for a registered client */ class Oauth_TokenController extends Oauth_AppController -{ + { public $_models = array('User'); public $_moduleModels = array('Client', 'Code', 'Token'); diff --git a/modules/oauth/models/AppDao.php b/modules/oauth/models/AppDao.php index da3a0add7..e6356752b 100644 --- a/modules/oauth/models/AppDao.php +++ b/modules/oauth/models/AppDao.php @@ -21,4 +21,4 @@ /** Module App Dao */ class Oauth_AppDao extends MIDAS_GlobalDao { - } //end class + } // end class diff --git a/modules/oauth/models/AppModel.php b/modules/oauth/models/AppModel.php index 0c19993b9..2d63fef03 100644 --- a/modules/oauth/models/AppModel.php +++ b/modules/oauth/models/AppModel.php @@ -20,6 +20,6 @@ /** App model for oauth module */ class Oauth_AppModel extends MIDASModel -{ + { public $moduleName = 'oauth'; -} + } diff --git a/modules/oauth/models/base/ClientModelBase.php b/modules/oauth/models/base/ClientModelBase.php index cba9ac763..fc3f8b4c4 100644 --- a/modules/oauth/models/base/ClientModelBase.php +++ b/modules/oauth/models/base/ClientModelBase.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + abstract class Oauth_ClientModelBase extends Oauth_AppModel -{ + { /** constructor */ public function __construct() { @@ -91,4 +92,4 @@ public function delete($clientDao) parent::delete($clientDao); } -} + } diff --git a/modules/oauth/models/base/CodeModelBase.php b/modules/oauth/models/base/CodeModelBase.php index 007566244..35b12f5c3 100644 --- a/modules/oauth/models/base/CodeModelBase.php +++ b/modules/oauth/models/base/CodeModelBase.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + abstract class Oauth_CodeModelBase extends Oauth_AppModel -{ + { /** constructor */ public function __construct() { @@ -78,4 +79,4 @@ public function create($userDao, $clientDao, $scopes) return $codeDao; } -} + } diff --git a/modules/oauth/models/base/TokenModelBase.php b/modules/oauth/models/base/TokenModelBase.php index f9a3cf1ef..3ec56faee 100644 --- a/modules/oauth/models/base/TokenModelBase.php +++ b/modules/oauth/models/base/TokenModelBase.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + abstract class Oauth_TokenModelBase extends Oauth_AppModel -{ + { /** constructor */ public function __construct() { @@ -92,4 +93,4 @@ private function _createToken($fromDao, $type, $expire = null) return $tokenDao; } -} + } diff --git a/modules/oauth/models/pdo/ClientModel.php b/modules/oauth/models/pdo/ClientModel.php index 8c3c6541a..5b3d035d3 100644 --- a/modules/oauth/models/pdo/ClientModel.php +++ b/modules/oauth/models/pdo/ClientModel.php @@ -22,7 +22,7 @@ /** pdo model implementation */ class Oauth_ClientModel extends Oauth_ClientModelBase -{ + { /** * Return all client records owned by the given user */ @@ -38,4 +38,4 @@ public function getByUser($userDao) } return $daos; } -} + } diff --git a/modules/oauth/models/pdo/CodeModel.php b/modules/oauth/models/pdo/CodeModel.php index c7ea2a5a2..35cae4b61 100644 --- a/modules/oauth/models/pdo/CodeModel.php +++ b/modules/oauth/models/pdo/CodeModel.php @@ -22,7 +22,7 @@ /** pdo model implementation */ class Oauth_CodeModel extends Oauth_CodeModelBase -{ + { /** * Return all auth code records for the given user */ @@ -65,4 +65,4 @@ public function cleanExpired() $tmpDao = null; //mark for memory reclamation } } -} + } diff --git a/modules/oauth/models/pdo/TokenModel.php b/modules/oauth/models/pdo/TokenModel.php index 9eb066777..4eda9bd7e 100644 --- a/modules/oauth/models/pdo/TokenModel.php +++ b/modules/oauth/models/pdo/TokenModel.php @@ -22,7 +22,7 @@ /** pdo model implementation */ class Oauth_TokenModel extends Oauth_TokenModelBase -{ + { /** * Retrieve a token dao based on the token value. Checking if it has expired * is left up to the caller. @@ -80,4 +80,4 @@ public function cleanExpired() $tmpDao = null; //mark for memory reclamation } } -} + } diff --git a/modules/oauth/tests/controllers/AuthorizeControllerTest.php b/modules/oauth/tests/controllers/AuthorizeControllerTest.php index 6246d3f15..60e132a93 100644 --- a/modules/oauth/tests/controllers/AuthorizeControllerTest.php +++ b/modules/oauth/tests/controllers/AuthorizeControllerTest.php @@ -12,7 +12,7 @@ /** test oauth authorize controller */ class OauthAuthorizeControllerTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -126,4 +126,4 @@ public function testSubmitAction() $this->assertEquals($json['status'], 'ok'); $this->assertEquals($json['redirect'], $params['redirect_uri'].'?code='.$codeDao->getCode().'&state='.$this->params['state']); } -} + } diff --git a/modules/oauth/tests/controllers/ClientControllerTest.php b/modules/oauth/tests/controllers/ClientControllerTest.php index d16f61881..522561ec5 100644 --- a/modules/oauth/tests/controllers/ClientControllerTest.php +++ b/modules/oauth/tests/controllers/ClientControllerTest.php @@ -12,7 +12,7 @@ /** test oauth client controller */ class OauthClientControllerTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -30,4 +30,4 @@ public function setUp() public function testStub() { } -} + } diff --git a/modules/oauth/tests/controllers/TokenControllerTest.php b/modules/oauth/tests/controllers/TokenControllerTest.php index 9cbab8633..addf1cb13 100644 --- a/modules/oauth/tests/controllers/TokenControllerTest.php +++ b/modules/oauth/tests/controllers/TokenControllerTest.php @@ -12,7 +12,7 @@ /** test oauth token controller */ class OauthTokenControllerTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -274,4 +274,4 @@ public function testDeauthorize() $this->dispatchUri('/oauth/token/delete?tokenId='.$refreshToken->getKey(), $adminUser); $this->resetAll(); } -} + } diff --git a/modules/packages/Notification.php b/modules/packages/Notification.php index 78b4ce322..0a7ac3d23 100644 --- a/modules/packages/Notification.php +++ b/modules/packages/Notification.php @@ -172,4 +172,4 @@ public function getItemMenuLink($params) '"> '.$this->t('Manage '.$type).''; } - } //end class + } // end class diff --git a/modules/packages/controllers/ApplicationController.php b/modules/packages/controllers/ApplicationController.php index 0068c993e..a79b231b1 100644 --- a/modules/packages/controllers/ApplicationController.php +++ b/modules/packages/controllers/ApplicationController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** packages application controller*/ class Packages_ApplicationController extends Packages_AppController -{ + { public $_components = array('Breadcrumb'); public $_models = array('Community'); public $_moduleDaos = array('Application'); @@ -264,4 +264,4 @@ public function getpackagesAction() 'release' => $this->_getParam('release'))); echo JsonComponent::encode($releasePackages); } -}//end class + } // end class diff --git a/modules/packages/controllers/PackageController.php b/modules/packages/controllers/PackageController.php index 0cb7ce77e..32811b920 100644 --- a/modules/packages/controllers/PackageController.php +++ b/modules/packages/controllers/PackageController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** package controller*/ class Packages_PackageController extends Packages_AppController -{ + { public $_models = array('Community', 'Item'); public $_moduleModels = array('Application', 'Package', 'Project'); @@ -117,4 +117,4 @@ public function latestAction() } echo JsonComponent::encode($filtered); } -}//end class + } // end class diff --git a/modules/packages/controllers/ViewController.php b/modules/packages/controllers/ViewController.php index a470a2dfb..10bd52ce1 100644 --- a/modules/packages/controllers/ViewController.php +++ b/modules/packages/controllers/ViewController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** packages view controller*/ class Packages_ViewController extends Packages_AppController -{ + { public $_models = array('Community'); public $_moduleModels = array('Application', 'Project'); @@ -35,4 +35,4 @@ public function projectAction() $this->view->community, $this->userSession->Dao, MIDAS_POLICY_ADMIN); $this->view->json['projectId'] = $projectId; } -}//end class + } // end class diff --git a/modules/packages/controllers/components/ApiComponent.php b/modules/packages/controllers/components/ApiComponent.php index 2d00032b5..72e4e93d3 100644 --- a/modules/packages/controllers/components/ApiComponent.php +++ b/modules/packages/controllers/components/ApiComponent.php @@ -12,7 +12,7 @@ /** Component for api methods */ class Packages_ApiComponent extends AppComponent -{ + { /** * Helper function for verifying keys in an input array @@ -455,4 +455,4 @@ public function scriptDownload($args) echo file_get_contents($file); exit(); } -} // end class + } // end class diff --git a/modules/packages/models/AppDao.php b/modules/packages/models/AppDao.php index fe4e77a56..537b27a34 100644 --- a/modules/packages/models/AppDao.php +++ b/modules/packages/models/AppDao.php @@ -14,6 +14,6 @@ * AppDao for the module. */ class Packages_AppDao extends MIDAS_GlobalDao -{ + { public $moduleName = 'packages'; -} //end class + } // end class diff --git a/modules/packages/models/AppModel.php b/modules/packages/models/AppModel.php index 926ec21b3..577de4036 100644 --- a/modules/packages/models/AppModel.php +++ b/modules/packages/models/AppModel.php @@ -14,6 +14,6 @@ * Base model class for the module */ class Packages_AppModel extends MIDASModel -{ + { public $moduleName = 'packages'; -} + } diff --git a/modules/packages/models/base/ApplicationModelBase.php b/modules/packages/models/base/ApplicationModelBase.php index 53c3f6f9b..ed7ea0ba5 100644 --- a/modules/packages/models/base/ApplicationModelBase.php +++ b/modules/packages/models/base/ApplicationModelBase.php @@ -14,7 +14,7 @@ * Application Model Base */ abstract class Packages_ApplicationModelBase extends Packages_AppModel -{ + { /** constructor*/ public function __construct() { @@ -48,4 +48,4 @@ public function save($application) $application->setDescription(UtilityComponent::filterHtmlTags($application->getDescription())); parent::save($application); } -} + } diff --git a/modules/packages/models/base/ExtensionModelBase.php b/modules/packages/models/base/ExtensionModelBase.php index 649bc718e..55dac1a8e 100644 --- a/modules/packages/models/base/ExtensionModelBase.php +++ b/modules/packages/models/base/ExtensionModelBase.php @@ -14,7 +14,7 @@ * Packages Extension Model Base */ abstract class Packages_ExtensionModelBase extends Packages_AppModel -{ + { /** constructor*/ public function __construct() { @@ -88,5 +88,4 @@ public function matchExistingExtension($params) return $results['extensions'][0]; } } - -} + } diff --git a/modules/packages/models/base/PackageModelBase.php b/modules/packages/models/base/PackageModelBase.php index 05f18b3b5..807a7534c 100644 --- a/modules/packages/models/base/PackageModelBase.php +++ b/modules/packages/models/base/PackageModelBase.php @@ -14,7 +14,7 @@ * Package Model Base */ abstract class Packages_PackageModelBase extends Packages_AppModel -{ + { /** constructor*/ public function __construct() { @@ -50,4 +50,4 @@ public function __construct() public abstract function getAll(); public abstract function getByItemId($itemId); public abstract function getLatestOfEachPackageType($application, $os, $arch, $submissiontype = null); -} + } diff --git a/modules/packages/models/base/ProjectModelBase.php b/modules/packages/models/base/ProjectModelBase.php index eaf0fd132..778081ab9 100644 --- a/modules/packages/models/base/ProjectModelBase.php +++ b/modules/packages/models/base/ProjectModelBase.php @@ -14,7 +14,7 @@ * Project Model Base */ abstract class Packages_ProjectModelBase extends Packages_AppModel -{ + { /** constructor*/ public function __construct() { @@ -71,4 +71,4 @@ public function delete($project) } parent::delete($project); } -} + } diff --git a/modules/packages/models/pdo/ApplicationModel.php b/modules/packages/models/pdo/ApplicationModel.php index 507cdcf08..3c0a8e286 100644 --- a/modules/packages/models/pdo/ApplicationModel.php +++ b/modules/packages/models/pdo/ApplicationModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/packages/models/base/ApplicationModelBase.php'; /** * Application PDO Model */ class Packages_ApplicationModel extends Packages_ApplicationModelBase -{ + { /** * Get all applications under a given project */ @@ -92,4 +93,4 @@ public function delete($application) $this->database->getDB()->delete('packages_extension', 'application_id = '.$application->getKey()); parent::delete($application); } -} + } diff --git a/modules/packages/models/pdo/ExtensionModel.php b/modules/packages/models/pdo/ExtensionModel.php index f81efb0a0..ac5800eaf 100644 --- a/modules/packages/models/pdo/ExtensionModel.php +++ b/modules/packages/models/pdo/ExtensionModel.php @@ -10,13 +10,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/packages/models/base/ExtensionModelBase.php'; /** * Package PDO Model */ class Packages_ExtensionModel extends Packages_ExtensionModelBase -{ + { /** * Return all the records in the table * @param params Optional associative array specifying 'extension_id', 'os', 'arch', @@ -141,4 +142,4 @@ public function getAllReleases($applicationId) } return $releases; } -} + } diff --git a/modules/packages/models/pdo/PackageModel.php b/modules/packages/models/pdo/PackageModel.php index f92509567..7f2154155 100644 --- a/modules/packages/models/pdo/PackageModel.php +++ b/modules/packages/models/pdo/PackageModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/packages/models/base/PackageModelBase.php'; /** * Package PDO Model */ class Packages_PackageModel extends Packages_PackageModelBase -{ + { /** * Return all the record in the table * @param params Optional associative array specifying an 'os', 'arch', 'submissiontype' and 'packagetype'. @@ -115,5 +116,4 @@ public function getLatestOfEachPackageType($application, $os, $arch, $submission } return $latestPackages; } - -} // end class + } // end class diff --git a/modules/packages/models/pdo/ProjectModel.php b/modules/packages/models/pdo/ProjectModel.php index bf9663401..84fb97c4e 100644 --- a/modules/packages/models/pdo/ProjectModel.php +++ b/modules/packages/models/pdo/ProjectModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/packages/models/base/ProjectModelBase.php'; /** * Package PDO Model */ class Packages_ProjectModel extends Packages_ProjectModelBase -{ + { /** * Get all enabled project communities */ @@ -50,5 +51,4 @@ public function getByCommunityId($communityId) $dao = $this->initDao('Project', $row, 'packages'); return $dao; } - -} + } diff --git a/modules/packages/tests/controllers/NotificationTest.php b/modules/packages/tests/controllers/NotificationTest.php index 32ee65e13..1b86a147a 100644 --- a/modules/packages/tests/controllers/NotificationTest.php +++ b/modules/packages/tests/controllers/NotificationTest.php @@ -12,7 +12,7 @@ /** test slicerpackages notifier behavior */ class NotificationTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -48,4 +48,4 @@ public function testDeleteItemDeletesPackage() $this->Item->delete($itemDao); $this->assertEquals(0, count($packageModel->getAll())); } -} + } diff --git a/modules/packages/tests/models/base/PackageModelTest.php b/modules/packages/tests/models/base/PackageModelTest.php index 1c7480a9b..48e4fa624 100644 --- a/modules/packages/tests/models/base/PackageModelTest.php +++ b/modules/packages/tests/models/base/PackageModelTest.php @@ -11,7 +11,7 @@ =========================================================================*/ /** test slicerpackages_package model*/ class PackageModelTest extends DatabaseTestCase -{ + { /** set up tests*/ public function setUp() { @@ -30,4 +30,4 @@ public function testGetAll() $daos = $packageModel->getAll(); $this->assertEquals(1, count($daos)); } -} + } diff --git a/modules/pvw/AppController.php b/modules/pvw/AppController.php index fc3cc63aa..aad19336b 100644 --- a/modules/pvw/AppController.php +++ b/modules/pvw/AppController.php @@ -23,4 +23,4 @@ class Pvw_AppController extends MIDAS_GlobalModule { public $moduleName='pvw'; - } //end class + } // end class diff --git a/modules/pvw/Notification.php b/modules/pvw/Notification.php index 3c621f701..76b23f28c 100644 --- a/modules/pvw/Notification.php +++ b/modules/pvw/Notification.php @@ -88,4 +88,4 @@ public function getAdminTab() $webroot = Zend_Controller_Front::getInstance()->getBaseUrl(); return array('ParaViewWeb' => $webroot.'/'.$this->moduleName.'/config/status'); } - } //end class + } // end class diff --git a/modules/pvw/controllers/ConfigController.php b/modules/pvw/controllers/ConfigController.php index b9d64837c..e9128123d 100644 --- a/modules/pvw/controllers/ConfigController.php +++ b/modules/pvw/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Config controller for the instance-wide module settings */ class Pvw_ConfigController extends Pvw_AppController -{ + { public $_moduleForms = array('Config'); public $_models = array('Setting'); public $_moduleModels = array('Instance'); @@ -86,4 +86,4 @@ function statusAction() } } -}//end class + } // end class diff --git a/modules/pvw/controllers/ParaviewController.php b/modules/pvw/controllers/ParaviewController.php index afd4cee95..2b505867e 100644 --- a/modules/pvw/controllers/ParaviewController.php +++ b/modules/pvw/controllers/ParaviewController.php @@ -20,7 +20,7 @@ /** Paraview Controller */ class Pvw_ParaviewController extends Pvw_AppController -{ + { public $_models = array('Item', 'ItemRevision', 'Bitstream', 'Setting'); public $_moduleComponents = array('Paraview'); public $_moduleModels = array('Instance'); @@ -316,4 +316,4 @@ protected function _getHostName() } } -} // end class + } // end class diff --git a/modules/pvw/controllers/components/ParaviewComponent.php b/modules/pvw/controllers/components/ParaviewComponent.php index 51445d4ac..88e4dd81d 100644 --- a/modules/pvw/controllers/components/ParaviewComponent.php +++ b/modules/pvw/controllers/components/ParaviewComponent.php @@ -23,7 +23,7 @@ * paraview (pvpython) instances. */ class Pvw_ParaviewComponent extends AppComponent -{ + { /** * Creates a new pvpython instance and a corresponding database record for it. * @param item The item dao to visualize @@ -244,4 +244,4 @@ private function _createDataDir($itemDao, $meshItems, $instanceDao) } return $path; } -} // end class + } // end class diff --git a/modules/pvw/controllers/components/ValidationComponent.php b/modules/pvw/controllers/components/ValidationComponent.php index 7086961cc..27dd76fb8 100644 --- a/modules/pvw/controllers/components/ValidationComponent.php +++ b/modules/pvw/controllers/components/ValidationComponent.php @@ -24,7 +24,7 @@ * various paraviewweb apps */ class Pvw_ValidationComponent extends AppComponent -{ + { /** Test whether we can visualize with slice viewer */ public function canVisualizeWithSliceView($itemDao) @@ -56,4 +56,4 @@ private function _testItem($itemDao, $extensions) $ext = strtolower(substr(strrchr($bitstreams[0]->getName(), '.'), 1)); return in_array($ext, $extensions); } -} // end class + } // end class diff --git a/modules/pvw/controllers/forms/ConfigForm.php b/modules/pvw/controllers/forms/ConfigForm.php index 349b49e6f..f189dfcfa 100644 --- a/modules/pvw/controllers/forms/ConfigForm.php +++ b/modules/pvw/controllers/forms/ConfigForm.php @@ -20,7 +20,7 @@ /** config form*/ class Pvw_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() { @@ -39,4 +39,4 @@ public function createConfigForm() $form->addElements(array($pvpython, $ports, $displayEnv, $submit)); return $form; } -} // end class + } // end class diff --git a/modules/pvw/models/AppDao.php b/modules/pvw/models/AppDao.php index 8f2bc3710..20b1b8a5f 100644 --- a/modules/pvw/models/AppDao.php +++ b/modules/pvw/models/AppDao.php @@ -21,4 +21,4 @@ class Pvw_AppDao extends MIDAS_GlobalDao { - } //end class + } // end class diff --git a/modules/pvw/models/AppModel.php b/modules/pvw/models/AppModel.php index 8554115e3..6cd4e8185 100644 --- a/modules/pvw/models/AppModel.php +++ b/modules/pvw/models/AppModel.php @@ -17,8 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + /** Base model class for PVW module */ class Pvw_AppModel extends MIDASModel -{ + { public $moduleName = 'pvw'; -} + } diff --git a/modules/pvw/models/base/InstanceModelBase.php b/modules/pvw/models/base/InstanceModelBase.php index 61eb07342..39fc7f7f5 100644 --- a/modules/pvw/models/base/InstanceModelBase.php +++ b/modules/pvw/models/base/InstanceModelBase.php @@ -20,7 +20,7 @@ /** Base class for instance model */ abstract class Pvw_InstanceModelBase extends Pvw_AppModel -{ + { /** constructor */ public function __construct() { @@ -43,4 +43,4 @@ public function __construct() } public abstract function getAll(); -} + } diff --git a/modules/pvw/models/pdo/InstanceModel.php b/modules/pvw/models/pdo/InstanceModel.php index 5e8ead2a3..55e8dea66 100644 --- a/modules/pvw/models/pdo/InstanceModel.php +++ b/modules/pvw/models/pdo/InstanceModel.php @@ -17,11 +17,12 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH.'/modules/pvw/models/base/InstanceModelBase.php'; /** Instance model implementation */ class Pvw_InstanceModel extends Pvw_InstanceModelBase -{ + { /** * Return all daos of this type */ @@ -35,4 +36,4 @@ public function getAll() } return $daos; } -} + } diff --git a/modules/ratings/AppController.php b/modules/ratings/AppController.php index 20b57b2f4..1b7411ecf 100644 --- a/modules/ratings/AppController.php +++ b/modules/ratings/AppController.php @@ -14,4 +14,4 @@ class Ratings_AppController extends MIDAS_GlobalModule { public $moduleName = 'ratings'; - } //end class + } // end class diff --git a/modules/ratings/controllers/ConfigController.php b/modules/ratings/controllers/ConfigController.php index 62676b121..f73833ef9 100644 --- a/modules/ratings/controllers/ConfigController.php +++ b/modules/ratings/controllers/ConfigController.php @@ -2,11 +2,11 @@ /** Configure controller for ratings module */ class Ratings_ConfigController extends Ratings_AppController -{ + { /** index action*/ function indexAction() { $this->requireAdminPrivileges(); } -}//end class + } // end class diff --git a/modules/ratings/controllers/IndexController.php b/modules/ratings/controllers/IndexController.php index ae17cfc1c..a4bdd7458 100644 --- a/modules/ratings/controllers/IndexController.php +++ b/modules/ratings/controllers/IndexController.php @@ -2,10 +2,10 @@ /** Index controller for ratings module */ class Ratings_IndexController extends Ratings_AppController -{ + { /** index action*/ function indexAction() { } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/ratings/controllers/RatingController.php b/modules/ratings/controllers/RatingController.php index 94060d35e..c7c122ae4 100644 --- a/modules/ratings/controllers/RatingController.php +++ b/modules/ratings/controllers/RatingController.php @@ -2,7 +2,7 @@ /** Controller for setting and getting ratings */ class Ratings_RatingController extends Ratings_AppController -{ + { public $_models = array('Item'); /** @@ -44,4 +44,4 @@ function rateitemAction() echo JsonComponent::encode(array_merge(array('status' => 'ok', 'message' => $message), $info)); } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/ratings/controllers/forms/ConfigForm.php b/modules/ratings/controllers/forms/ConfigForm.php index f5fd3fce7..f916a6f0c 100644 --- a/modules/ratings/controllers/forms/ConfigForm.php +++ b/modules/ratings/controllers/forms/ConfigForm.php @@ -1,7 +1,7 @@ delete($this->_name, 'item_id = '.$item->getKey()); } -} - + } diff --git a/modules/readmes/AppController.php b/modules/readmes/AppController.php index 809c419d7..f2d84610f 100644 --- a/modules/readmes/AppController.php +++ b/modules/readmes/AppController.php @@ -29,4 +29,4 @@ class Readmes_AppController extends MIDAS_GlobalModule public $moduleName='readmes'; - } //end class + } // end class diff --git a/modules/readmes/Notification.php b/modules/readmes/Notification.php index cfd9c42bd..1c60569cd 100644 --- a/modules/readmes/Notification.php +++ b/modules/readmes/Notification.php @@ -58,4 +58,4 @@ public function getCommunityViewJs() return array($moduleUriroot.'/public/js/readmes.community.js'); } - } //end class + } // end class diff --git a/modules/readmes/controllers/ConfigController.php b/modules/readmes/controllers/ConfigController.php index c6f3c332b..1a4717019 100644 --- a/modules/readmes/controllers/ConfigController.php +++ b/modules/readmes/controllers/ConfigController.php @@ -17,6 +17,7 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + /** * Readmes_ConfigController * @@ -24,8 +25,7 @@ * @package readmes */ class Readmes_ConfigController extends Readmes_AppController -{ - + { public $_components = array('Breadcrumb'); /** @@ -44,5 +44,4 @@ function indexAction() 'icon' => $iconPath); $this->Component->Breadcrumb->setBreadcrumbHeader($breadcrumbs, $this->view); } - -} // end of class \ No newline at end of file + } // end class diff --git a/modules/readmes/controllers/api/CommunityController.php b/modules/readmes/controllers/api/CommunityController.php index 09ce2b1b0..95bf52eb9 100644 --- a/modules/readmes/controllers/api/CommunityController.php +++ b/modules/readmes/controllers/api/CommunityController.php @@ -21,9 +21,8 @@ /** * WebApi controller for the Community Resource (in readmes module) */ - class Apireadmes_CommunityController extends ApiController -{ + { /** * The put action handles GET requests and receives an 'id' parameter; it * should update the server resource state of the resource identified by @@ -44,5 +43,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, GET'); } - -} \ No newline at end of file + } diff --git a/modules/readmes/controllers/api/FolderController.php b/modules/readmes/controllers/api/FolderController.php index c34257758..fa6f665f4 100644 --- a/modules/readmes/controllers/api/FolderController.php +++ b/modules/readmes/controllers/api/FolderController.php @@ -21,9 +21,8 @@ /** * WebApi controller for the Folder Resource (in readmes module) */ - class Apireadmes_FolderController extends ApiController -{ + { /** * The put action handles GET requests and receives an 'id' parameter; it * should update the server resource state of the resource identified by @@ -44,5 +43,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, GET'); } - -} + } diff --git a/modules/readmes/controllers/components/ApicommunityComponent.php b/modules/readmes/controllers/components/ApicommunityComponent.php index d376d5695..1a16b0f3c 100644 --- a/modules/readmes/controllers/components/ApicommunityComponent.php +++ b/modules/readmes/controllers/components/ApicommunityComponent.php @@ -12,7 +12,7 @@ /** Apicommunity Component for api methods */ class Readmes_ApicommunityComponent extends AppComponent -{ + { /** * Get the readme text for a community * @path /readmes/community/{id} @@ -33,5 +33,4 @@ function get($args) return $readme; } - -} + } diff --git a/modules/readmes/controllers/components/ApifolderComponent.php b/modules/readmes/controllers/components/ApifolderComponent.php index be3f71c40..0051cc4f2 100644 --- a/modules/readmes/controllers/components/ApifolderComponent.php +++ b/modules/readmes/controllers/components/ApifolderComponent.php @@ -12,7 +12,7 @@ /** Apifolder Component for api methods */ class Readmes_ApifolderComponent extends AppComponent -{ + { /** * Get the readme text for a folder * @path /readmes/folder/{id} @@ -33,5 +33,4 @@ function get($args) return $readme; } - -} + } diff --git a/modules/readmes/controllers/components/GetReadmeComponent.php b/modules/readmes/controllers/components/GetReadmeComponent.php index 78988ee63..5277cd288 100644 --- a/modules/readmes/controllers/components/GetReadmeComponent.php +++ b/modules/readmes/controllers/components/GetReadmeComponent.php @@ -12,7 +12,7 @@ /** Exract readme text according to the folder or community*/ class Readmes_GetReadmeComponent extends AppComponent -{ + { /** * Get the readme text from the specified folder */ @@ -59,4 +59,4 @@ public function fromCommunity($community) $publicFolder = $folderModel->getFolderByName($rootFolder, 'Public'); return $this->fromFolder($publicFolder); } -} + } diff --git a/modules/readmes/models/AppDao.php b/modules/readmes/models/AppDao.php index 2a7344402..2575d81bf 100644 --- a/modules/readmes/models/AppDao.php +++ b/modules/readmes/models/AppDao.php @@ -14,4 +14,4 @@ class Readmes_AppDao extends MIDAS_GlobalDao { public $_module = 'readmes'; - } //end class + } // end class diff --git a/modules/readmes/models/AppModel.php b/modules/readmes/models/AppModel.php index 42db61598..8d6dedf12 100644 --- a/modules/readmes/models/AppModel.php +++ b/modules/readmes/models/AppModel.php @@ -12,6 +12,6 @@ /** Base model class for the cleanup module */ class Readmes_AppModel extends MIDASModel -{ + { public $moduleName = 'readmes'; -} + } diff --git a/modules/readmes/tests/controllers/ReadmesApiTest.php b/modules/readmes/tests/controllers/ReadmesApiTest.php index bc901e8a1..bf20f53a8 100644 --- a/modules/readmes/tests/controllers/ReadmesApiTest.php +++ b/modules/readmes/tests/controllers/ReadmesApiTest.php @@ -17,7 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. =========================================================================*/ + require_once BASE_PATH . '/core/tests/controllers/api/RestCallMethodsTest.php'; + /** config controller test*/ class ReadmesApiTest extends RestCallMethodsTest { @@ -109,5 +111,4 @@ public function testCommunityReadme() $this->_assertStatusOk($resp); $this->assertEquals($resp["body"]->data->text, "

This is a readme

\n"); } - -} + } diff --git a/modules/remoteprocessing/AppController.php b/modules/remoteprocessing/AppController.php index c640cacfa..52ebebdd2 100644 --- a/modules/remoteprocessing/AppController.php +++ b/modules/remoteprocessing/AppController.php @@ -32,4 +32,4 @@ class Remoteprocessing_AppController extends MIDAS_GlobalModule { public $moduleName='remoteprocessing'; - } //end class + } // end class diff --git a/modules/remoteprocessing/Notification.php b/modules/remoteprocessing/Notification.php index 7cf47b180..f78160faa 100644 --- a/modules/remoteprocessing/Notification.php +++ b/modules/remoteprocessing/Notification.php @@ -334,4 +334,4 @@ public function addJob($params) return; } - } //end class + } // end class diff --git a/modules/remoteprocessing/controllers/ConfigController.php b/modules/remoteprocessing/controllers/ConfigController.php index 2d67365dc..a02394302 100644 --- a/modules/remoteprocessing/controllers/ConfigController.php +++ b/modules/remoteprocessing/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Config controller */ class Remoteprocessing_ConfigController extends Remoteprocessing_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); @@ -115,5 +115,5 @@ function indexAction() } } } -}//end class + } // end class diff --git a/modules/remoteprocessing/controllers/ExecutableController.php b/modules/remoteprocessing/controllers/ExecutableController.php index b2b1f39f1..6eda847f5 100644 --- a/modules/remoteprocessing/controllers/ExecutableController.php +++ b/modules/remoteprocessing/controllers/ExecutableController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Executable controller */ class Remoteprocessing_ExecutableController extends Remoteprocessing_AppController -{ + { public $_models = array('Item', 'Bitstream', 'ItemRevision', 'Assetstore'); public $_components = array('Upload'); public $_moduleComponents = array('Executable'); @@ -115,4 +115,4 @@ function defineAction() } -}//end class + } // end class diff --git a/modules/remoteprocessing/controllers/IndexController.php b/modules/remoteprocessing/controllers/IndexController.php index 3347deb52..9a6daca4a 100644 --- a/modules/remoteprocessing/controllers/IndexController.php +++ b/modules/remoteprocessing/controllers/IndexController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** index controller*/ class Remoteprocessing_IndexController extends Remoteprocessing_AppController -{ + { /** select action */ function selectactionAction() @@ -32,4 +32,4 @@ function dashboardAction() { } -}//end class + } // end class diff --git a/modules/remoteprocessing/controllers/JobController.php b/modules/remoteprocessing/controllers/JobController.php index 431bed1cb..aace527cb 100644 --- a/modules/remoteprocessing/controllers/JobController.php +++ b/modules/remoteprocessing/controllers/JobController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** job controller*/ class Remoteprocessing_JobController extends Remoteprocessing_AppController -{ + { public $_models = array('Item', 'Bitstream', 'ItemRevision', 'Assetstore', 'Folder'); public $_components = array('Upload'); public $_moduleComponents = array('Executable', 'Job'); @@ -383,4 +383,4 @@ public function getentryAction() } } //end valid entry -}//end class + } // end class diff --git a/modules/remoteprocessing/controllers/components/ApiComponent.php b/modules/remoteprocessing/controllers/components/ApiComponent.php index bda5ec7ed..1b8534610 100644 --- a/modules/remoteprocessing/controllers/components/ApiComponent.php +++ b/modules/remoteprocessing/controllers/components/ApiComponent.php @@ -20,7 +20,7 @@ require_once BASE_PATH.'/core/controllers/components/UtilityComponent.php'; /** Component for api methods */ class Remoteprocessing_ApiComponent extends AppComponent -{ + { /** * Register a server * @param email (Optional) @@ -316,7 +316,7 @@ private function _rrmdir($dir) rmdir($dir); } -} // end class + } // end class diff --git a/modules/remoteprocessing/controllers/components/ExecutableComponent.php b/modules/remoteprocessing/controllers/components/ExecutableComponent.php index 2bb462cd9..929af49a1 100644 --- a/modules/remoteprocessing/controllers/components/ExecutableComponent.php +++ b/modules/remoteprocessing/controllers/components/ExecutableComponent.php @@ -20,8 +20,7 @@ /** Web API Authentication Component */ class Remoteprocessing_ExecutableComponent extends AppComponent -{ - + { /** Constructor */ function __construct() { @@ -360,5 +359,4 @@ function createDefinitionFile($elements) $xml = $xml->asXML(); return $xml; } - -} + } diff --git a/modules/remoteprocessing/controllers/components/JobComponent.php b/modules/remoteprocessing/controllers/components/JobComponent.php index 6eeed440c..2a03a51d2 100644 --- a/modules/remoteprocessing/controllers/components/JobComponent.php +++ b/modules/remoteprocessing/controllers/components/JobComponent.php @@ -20,8 +20,7 @@ /** Web API Authentication Component */ class Remoteprocessing_JobComponent extends AppComponent -{ - + { /** Constructor */ function __construct() { @@ -211,5 +210,4 @@ public function convertXmlREsults($xml) } return $return; } - -} + } diff --git a/modules/remoteprocessing/controllers/forms/ConfigForm.php b/modules/remoteprocessing/controllers/forms/ConfigForm.php index d4e562bf8..ff5bcd1af 100644 --- a/modules/remoteprocessing/controllers/forms/ConfigForm.php +++ b/modules/remoteprocessing/controllers/forms/ConfigForm.php @@ -19,7 +19,7 @@ =========================================================================*/ /** form*/ class Remoteprocessing_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() @@ -39,5 +39,5 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/remoteprocessing/database/upgrade/1.0.1.php b/modules/remoteprocessing/database/upgrade/1.0.1.php index 699575c3a..ead5cd6c5 100644 --- a/modules/remoteprocessing/database/upgrade/1.0.1.php +++ b/modules/remoteprocessing/database/upgrade/1.0.1.php @@ -19,10 +19,9 @@ =========================================================================*/ class Remoteprocessing_Upgrade_1_0_1 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -33,10 +32,9 @@ public function mysql() public function pgsql() { - } public function postUpgrade() { } -} + } diff --git a/modules/remoteprocessing/database/upgrade/1.0.2.php b/modules/remoteprocessing/database/upgrade/1.0.2.php index dc1190fd1..ab2628638 100644 --- a/modules/remoteprocessing/database/upgrade/1.0.2.php +++ b/modules/remoteprocessing/database/upgrade/1.0.2.php @@ -19,10 +19,9 @@ =========================================================================*/ class Remoteprocessing_Upgrade_1_0_2 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -33,10 +32,9 @@ public function mysql() public function pgsql() { - } public function postUpgrade() { } -} + } diff --git a/modules/remoteprocessing/models/AppDao.php b/modules/remoteprocessing/models/AppDao.php index 520d9bb8a..da93aca71 100644 --- a/modules/remoteprocessing/models/AppDao.php +++ b/modules/remoteprocessing/models/AppDao.php @@ -22,4 +22,4 @@ class Remoteprocessing_AppDao extends MIDAS_GlobalDao { public $_module='remoteprocessing'; - } //end class + } // end class diff --git a/modules/remoteprocessing/models/AppModel.php b/modules/remoteprocessing/models/AppModel.php index fbba96512..ea1da7ce4 100644 --- a/modules/remoteprocessing/models/AppModel.php +++ b/modules/remoteprocessing/models/AppModel.php @@ -19,7 +19,6 @@ =========================================================================*/ class Remoteprocessing_AppModel extends MIDASModel -{ + { public $moduleName='remoteprocessing'; - -} + } diff --git a/modules/remoteprocessing/models/base/JobModelBase.php b/modules/remoteprocessing/models/base/JobModelBase.php index 1c3da5889..b2618330a 100644 --- a/modules/remoteprocessing/models/base/JobModelBase.php +++ b/modules/remoteprocessing/models/base/JobModelBase.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Job Model*/ class Remoteprocessing_JobModelBase extends Remoteprocessing_AppModel -{ + { /** construct */ public function __construct() { @@ -53,4 +53,4 @@ public function save($dao) parent::save($dao); } -} // end class AssetstoreModelBase + } // end class diff --git a/modules/remoteprocessing/models/pdo/JobModel.php b/modules/remoteprocessing/models/pdo/JobModel.php index f1be2469f..528e999b1 100644 --- a/modules/remoteprocessing/models/pdo/JobModel.php +++ b/modules/remoteprocessing/models/pdo/JobModel.php @@ -22,7 +22,7 @@ /** job model */ class Remoteprocessing_JobModel extends Remoteprocessing_JobModelBase -{ + { /** get jobs */ function getBy($os, $condition, $expiration_date = false, $status = MIDAS_REMOTEPROCESSING_STATUS_WAIT) { @@ -156,4 +156,4 @@ function getByUser($user, $limit = 10) } return $return; } -} // end class + } // end class diff --git a/modules/scheduler/AppController.php b/modules/scheduler/AppController.php index e79415126..ca8ed7129 100644 --- a/modules/scheduler/AppController.php +++ b/modules/scheduler/AppController.php @@ -32,4 +32,4 @@ class Scheduler_AppController extends MIDAS_GlobalModule { public $moduleName='scheduler'; - } //end class + } // end class diff --git a/modules/scheduler/Notification.php b/modules/scheduler/Notification.php index f14cc249f..3b70e6243 100644 --- a/modules/scheduler/Notification.php +++ b/modules/scheduler/Notification.php @@ -103,4 +103,4 @@ public function handleUserDeleted($params) $jobModel = MidasLoader::loadModel('Job', $this->moduleName); $jobModel->removeUserReferences($user->getKey()); } - } //end class + } // end class diff --git a/modules/scheduler/controllers/ConfigController.php b/modules/scheduler/controllers/ConfigController.php index 65317e297..9acf4fcd4 100644 --- a/modules/scheduler/controllers/ConfigController.php +++ b/modules/scheduler/controllers/ConfigController.php @@ -19,7 +19,7 @@ =========================================================================*/ class Scheduler_ConfigController extends Scheduler_AppController -{ + { public $_moduleForms=array('Config'); public $_components=array('Utility', 'Date'); public $_moduleModels=array('Job', 'JobLog'); @@ -33,4 +33,4 @@ function indexAction() $this->view->jobsErrors = $this->Scheduler_Job->getLastErrors(); } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/scheduler/controllers/RunController.php b/modules/scheduler/controllers/RunController.php index d766dfdb2..77c8e001b 100644 --- a/modules/scheduler/controllers/RunController.php +++ b/modules/scheduler/controllers/RunController.php @@ -23,7 +23,7 @@ * */ class Scheduler_RunController extends Scheduler_AppController -{ + { public $_models = array('Setting'); public $_moduleModels = array('Job', 'JobLog'); public $_components = array('Json'); @@ -124,4 +124,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/scheduler/controllers/WorkflowController.php b/modules/scheduler/controllers/WorkflowController.php index 168983575..e798d98b0 100644 --- a/modules/scheduler/controllers/WorkflowController.php +++ b/modules/scheduler/controllers/WorkflowController.php @@ -23,7 +23,7 @@ * */ class Scheduler_WorkflowController extends Scheduler_AppController -{ + { public $_moduleModels=array(); public $_moduleComponents=array('Ezc'); @@ -103,4 +103,4 @@ private function _createGraph($workflow) return $image; } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/scheduler/controllers/components/EzcComponent.php b/modules/scheduler/controllers/components/EzcComponent.php index fc7b350ce..b6285f8e7 100644 --- a/modules/scheduler/controllers/components/EzcComponent.php +++ b/modules/scheduler/controllers/components/EzcComponent.php @@ -27,7 +27,7 @@ function __autoload( $className ) } class Scheduler_EzcComponent extends AppComponent -{ + { public function initWorkflowDefinitionStorage() { $autoloader = Zend_Loader_Autoloader::getInstance(); @@ -43,4 +43,4 @@ public function initWorkflowDefinitionStorage() return $definition; } -} // end class + } // end class diff --git a/modules/scheduler/controllers/forms/ConfigForm.php b/modules/scheduler/controllers/forms/ConfigForm.php index 576619ddd..4541cd5e8 100644 --- a/modules/scheduler/controllers/forms/ConfigForm.php +++ b/modules/scheduler/controllers/forms/ConfigForm.php @@ -18,7 +18,7 @@ limitations under the License. =========================================================================*/ class Scheduler_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() @@ -37,4 +37,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/scheduler/database/upgrade/1.0.1.php b/modules/scheduler/database/upgrade/1.0.1.php index f0fef72a7..de2d7467f 100644 --- a/modules/scheduler/database/upgrade/1.0.1.php +++ b/modules/scheduler/database/upgrade/1.0.1.php @@ -19,10 +19,9 @@ =========================================================================*/ class Scheduler_Upgrade_1_0_1 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -41,6 +40,5 @@ public function mysql() public function postUpgrade() { - } -} + } diff --git a/modules/scheduler/database/upgrade/1.0.2.php b/modules/scheduler/database/upgrade/1.0.2.php index 96f7f0b7e..12b702744 100644 --- a/modules/scheduler/database/upgrade/1.0.2.php +++ b/modules/scheduler/database/upgrade/1.0.2.php @@ -19,10 +19,9 @@ =========================================================================*/ class Scheduler_Upgrade_1_0_2 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -31,12 +30,9 @@ public function mysql() $this->db->query($sql); $sql = "ALTER TABLE scheduler_job_log MODIFY log_id bigint(20) NOT NULL AUTO_INCREMENT"; $this->db->query($sql); - } - public function postUpgrade() { - } -} + } diff --git a/modules/scheduler/database/upgrade/1.0.3.php b/modules/scheduler/database/upgrade/1.0.3.php index 1b301c96d..18c30cdef 100644 --- a/modules/scheduler/database/upgrade/1.0.3.php +++ b/modules/scheduler/database/upgrade/1.0.3.php @@ -19,10 +19,9 @@ =========================================================================*/ class Scheduler_Upgrade_1_0_3 extends MIDASUpgrade -{ + { public function preUpgrade() { - } public function mysql() @@ -31,8 +30,7 @@ public function mysql() $this->db->query($sql); } - public function postUpgrade() { } -} + } diff --git a/modules/scheduler/models/AppDao.php b/modules/scheduler/models/AppDao.php index c4e1ef9d6..fb7ac1bc6 100644 --- a/modules/scheduler/models/AppDao.php +++ b/modules/scheduler/models/AppDao.php @@ -21,4 +21,4 @@ class Scheduler_AppDao extends MIDAS_GlobalDao { public $moduleName = 'scheduler'; - } //end class + } // end class diff --git a/modules/scheduler/models/AppModel.php b/modules/scheduler/models/AppModel.php index eafad84d8..de534667f 100644 --- a/modules/scheduler/models/AppModel.php +++ b/modules/scheduler/models/AppModel.php @@ -19,7 +19,6 @@ =========================================================================*/ class Scheduler_AppModel extends MIDASModel -{ + { public $moduleName = 'scheduler'; - -} + } diff --git a/modules/scheduler/models/base/JobLogModelBase.php b/modules/scheduler/models/base/JobLogModelBase.php index 7098e38ac..e4506d451 100644 --- a/modules/scheduler/models/base/JobLogModelBase.php +++ b/modules/scheduler/models/base/JobLogModelBase.php @@ -20,7 +20,7 @@ /** Base class for the job log model */ class Scheduler_JobLogModelBase extends Scheduler_AppModel -{ + { public function __construct() { parent::__construct(); @@ -49,4 +49,4 @@ public function saveLog($jobDao, $text) $this->save($joblog); } -} // end class JobLogModelBase + } // end class diff --git a/modules/scheduler/models/base/JobModelBase.php b/modules/scheduler/models/base/JobModelBase.php index dc157209f..00566b5dd 100644 --- a/modules/scheduler/models/base/JobModelBase.php +++ b/modules/scheduler/models/base/JobModelBase.php @@ -19,7 +19,7 @@ =========================================================================*/ abstract class Scheduler_JobModelBase extends Scheduler_AppModel -{ + { public function __construct() { parent::__construct(); @@ -79,5 +79,5 @@ protected function getServerLoad() } $this->load = array(); return array(); - } -} // end class AssetstoreModelBase + } + } // end class diff --git a/modules/scheduler/models/pdo/JobLogModel.php b/modules/scheduler/models/pdo/JobLogModel.php index 82423b097..5bf705bf6 100644 --- a/modules/scheduler/models/pdo/JobLogModel.php +++ b/modules/scheduler/models/pdo/JobLogModel.php @@ -22,6 +22,5 @@ /** job model */ class Scheduler_JobLogModel extends Scheduler_JobLogModelBase -{ - -} // end class + { + } // end class diff --git a/modules/scheduler/models/pdo/JobModel.php b/modules/scheduler/models/pdo/JobModel.php index 4631738ab..71a6dbe6f 100644 --- a/modules/scheduler/models/pdo/JobModel.php +++ b/modules/scheduler/models/pdo/JobModel.php @@ -22,7 +22,7 @@ /** job model */ class Scheduler_JobModel extends Scheduler_JobModelBase -{ + { /** get by tasks */ public function getJobsByTask($task) { @@ -159,5 +159,4 @@ public function removeUserReferences($userId) { $this->database->update(array('creator_id' => null), array('creator_id = ?' => $userId)); } - -} // end class + } // end class diff --git a/modules/sizequota/AppController.php b/modules/sizequota/AppController.php index d679ceebe..9ea2cac25 100644 --- a/modules/sizequota/AppController.php +++ b/modules/sizequota/AppController.php @@ -25,4 +25,4 @@ class Sizequota_AppController extends MIDAS_GlobalModule /** folder quota model */ var $Sizequota_Folderquota; - } //end class + } // end class diff --git a/modules/sizequota/Notification.php b/modules/sizequota/Notification.php index 99abe0140..b49379229 100644 --- a/modules/sizequota/Notification.php +++ b/modules/sizequota/Notification.php @@ -230,4 +230,4 @@ public function validateUploadRevision($args) return array('status' => true); } - } //end class + } // end class diff --git a/modules/sizequota/controllers/ConfigController.php b/modules/sizequota/controllers/ConfigController.php index 3ef89fd15..bc3f81420 100644 --- a/modules/sizequota/controllers/ConfigController.php +++ b/modules/sizequota/controllers/ConfigController.php @@ -24,7 +24,7 @@ * maintaining folder-specific quotas. */ class Sizequota_ConfigController extends Sizequota_AppController -{ + { public $_models = array('Assetstore', 'Folder', 'Setting'); public $_moduleModels = array('FolderQuota'); public $_moduleForms = array('Config'); @@ -256,4 +256,4 @@ private function _isValidQuota($quotas) return true; } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/sizequota/controllers/api/QuotaController.php b/modules/sizequota/controllers/api/QuotaController.php index ce75602d0..9eb07ebaf 100644 --- a/modules/sizequota/controllers/api/QuotaController.php +++ b/modules/sizequota/controllers/api/QuotaController.php @@ -21,10 +21,8 @@ /** * WebApi controller for Quota Resource (in sizequota module) */ - class Apisizequota_QuotaController extends ApiController -{ - + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -78,5 +76,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST'); } - -} + } diff --git a/modules/sizequota/controllers/components/ApiComponent.php b/modules/sizequota/controllers/components/ApiComponent.php index 3f1acbdde..091285110 100644 --- a/modules/sizequota/controllers/components/ApiComponent.php +++ b/modules/sizequota/controllers/components/ApiComponent.php @@ -20,8 +20,7 @@ /** Component for api methods */ class Sizequota_ApiComponent extends AppComponent -{ - + { /** Return the user dao */ private function _callModuleApiMethod($args, $coreApiMethod, $resource = null, $hasReturn = true) { @@ -65,5 +64,4 @@ public function set($args) { return $this->_callModuleApiMethod($args, 'set', 'quota'); } - -} + } diff --git a/modules/sizequota/controllers/components/ApiquotaComponent.php b/modules/sizequota/controllers/components/ApiquotaComponent.php index 010ffea42..e5d7b8705 100644 --- a/modules/sizequota/controllers/components/ApiquotaComponent.php +++ b/modules/sizequota/controllers/components/ApiquotaComponent.php @@ -24,8 +24,7 @@ /** Sizequot Component for api methods */ class Sizequota_ApiquotaComponent extends AppComponent -{ - + { /** * Helper function for verifying keys in an input array */ @@ -149,5 +148,4 @@ public function set($args) $quotaModel = MidasLoader::loadModel('FolderQuota', 'sizequota'); return $quotaModel->setQuota($folder, $quota); } - -} + } diff --git a/modules/sizequota/controllers/forms/ConfigForm.php b/modules/sizequota/controllers/forms/ConfigForm.php index 4da143cf6..1b5689f9e 100644 --- a/modules/sizequota/controllers/forms/ConfigForm.php +++ b/modules/sizequota/controllers/forms/ConfigForm.php @@ -20,7 +20,7 @@ /** sizequota config form */ class Sizequota_ConfigForm extends AppForm -{ + { /** create the admin->modules page config form */ public function createConfigForm() { @@ -68,4 +68,4 @@ public function createFolderForm($defaultQuota) return $form; } -} // end class + } // end class diff --git a/modules/sizequota/models/AppDao.php b/modules/sizequota/models/AppDao.php index a4174c31a..c2b432451 100644 --- a/modules/sizequota/models/AppDao.php +++ b/modules/sizequota/models/AppDao.php @@ -22,4 +22,4 @@ class Sizequota_AppDao extends MIDAS_GlobalDao { - } //end class + } // end class diff --git a/modules/sizequota/models/AppModel.php b/modules/sizequota/models/AppModel.php index 5bd22f150..24fc81c73 100644 --- a/modules/sizequota/models/AppModel.php +++ b/modules/sizequota/models/AppModel.php @@ -20,6 +20,6 @@ /** App model for sizequota module */ class Sizequota_AppModel extends MIDASModel -{ + { public $moduleName = 'sizequota'; -} + } diff --git a/modules/sizequota/models/base/FolderQuotaModelBase.php b/modules/sizequota/models/base/FolderQuotaModelBase.php index b50cb7869..6ac9e28a3 100644 --- a/modules/sizequota/models/base/FolderQuotaModelBase.php +++ b/modules/sizequota/models/base/FolderQuotaModelBase.php @@ -20,7 +20,7 @@ /** Base class for the job log model */ abstract class Sizequota_FolderQuotaModelBase extends Sizequota_AppModel -{ + { /** constructor */ public function __construct() { @@ -115,4 +115,4 @@ public function setQuota($folder, $quota) return false; } } -} + } diff --git a/modules/sizequota/models/pdo/FolderQuotaModel.php b/modules/sizequota/models/pdo/FolderQuotaModel.php index 2361b1221..1a01584d4 100644 --- a/modules/sizequota/models/pdo/FolderQuotaModel.php +++ b/modules/sizequota/models/pdo/FolderQuotaModel.php @@ -24,7 +24,7 @@ * Folder quota pdo model */ class Sizequota_FolderQuotaModel extends Sizequota_FolderQuotaModelBase -{ + { /** Returns the quota dao corresponding to the given folder, or false if none is set */ public function getQuota($folder) { @@ -36,5 +36,4 @@ public function getQuota($folder) $row = $this->database->fetchRow($sql); return $this->initDao('FolderQuota', $row, 'sizequota'); } - -} + } diff --git a/modules/sizequota/tests/controllers/ConfigControllerTest.php b/modules/sizequota/tests/controllers/ConfigControllerTest.php index f7e57b90e..8d42c1338 100644 --- a/modules/sizequota/tests/controllers/ConfigControllerTest.php +++ b/modules/sizequota/tests/controllers/ConfigControllerTest.php @@ -12,7 +12,7 @@ /** Test management of the size quotas behavior */ class PerformTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -218,4 +218,4 @@ public function testGetFreeSpace() $this->assertEquals($resp['freeSpace'], '10000'); $this->assertEquals($resp['hFreeSpace'], '9.8 KB'); } -} + } diff --git a/modules/solr/AppController.php b/modules/solr/AppController.php index ca3301ea2..d1a68c9f2 100644 --- a/modules/solr/AppController.php +++ b/modules/solr/AppController.php @@ -22,4 +22,4 @@ class Solr_AppController extends MIDAS_GlobalModule { public $moduleName = 'solr'; - } //end class + } // end class diff --git a/modules/solr/Notification.php b/modules/solr/Notification.php index 1f043e589..84422cb57 100644 --- a/modules/solr/Notification.php +++ b/modules/solr/Notification.php @@ -346,4 +346,4 @@ public function getLeftLinks() $this->webroot.'/solr/advanced', $this->webroot.'/core/public/images/icons/magnifier.png')); } - } //end class + } // end class diff --git a/modules/solr/controllers/AdvancedController.php b/modules/solr/controllers/AdvancedController.php index 149da66c0..9606d2cde 100644 --- a/modules/solr/controllers/AdvancedController.php +++ b/modules/solr/controllers/AdvancedController.php @@ -22,7 +22,7 @@ * Controller for the Advanced Search feature */ class Solr_AdvancedController extends Solr_AppController -{ + { public $_models = array('Item', 'Setting'); public $_moduleForms = array('Config'); public $_moduleComponents = array('Solr'); @@ -96,4 +96,4 @@ function submitAction() 'items' => $items)); } -}//end class + } // end class diff --git a/modules/solr/controllers/ConfigController.php b/modules/solr/controllers/ConfigController.php index bb226af14..099302270 100644 --- a/modules/solr/controllers/ConfigController.php +++ b/modules/solr/controllers/ConfigController.php @@ -22,7 +22,7 @@ * Module configuration controller */ class Solr_ConfigController extends Solr_AppController -{ + { public $_models = array('Setting'); public $_moduleForms = array('Config'); @@ -90,4 +90,4 @@ function submitAction() echo JsonComponent::encode(array(true, 'Changes saved')); } -}//end class + } // end class diff --git a/modules/solr/controllers/api/SearchController.php b/modules/solr/controllers/api/SearchController.php index cb1fd5205..29b0f4a36 100644 --- a/modules/solr/controllers/api/SearchController.php +++ b/modules/solr/controllers/api/SearchController.php @@ -21,10 +21,8 @@ /** * WebApi controller for Search Resource (in solr module) */ - class Apisolr_SearchController extends ApiController -{ - + { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. @@ -66,5 +64,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET'); } - -} + } diff --git a/modules/solr/controllers/components/ApiComponent.php b/modules/solr/controllers/components/ApiComponent.php index 6707aeedd..84492db6b 100644 --- a/modules/solr/controllers/components/ApiComponent.php +++ b/modules/solr/controllers/components/ApiComponent.php @@ -12,7 +12,7 @@ /** Component for api methods */ class Solr_ApiComponent extends AppComponent -{ + { /** Return the user dao */ private function _callModuleApiMethod($args, $coreApiMethod, $resource = null, $hasReturn = true) { @@ -35,4 +35,4 @@ public function searchAdvanced($args) { return $this->_callModuleApiMethod($args, 'searchAdvanced', 'search'); } -} // end class + } // end class diff --git a/modules/solr/controllers/components/ApisearchComponent.php b/modules/solr/controllers/components/ApisearchComponent.php index 96b6473c0..b7c28c0c6 100644 --- a/modules/solr/controllers/components/ApisearchComponent.php +++ b/modules/solr/controllers/components/ApisearchComponent.php @@ -12,7 +12,7 @@ /** Component for api methods */ class Solr_ApisearchComponent extends AppComponent -{ + { /** * Search using Lucene search text queries * @path /solr/search @@ -113,4 +113,4 @@ public function searchAdvanced($args) } return $items; } -} // end class + } // end class diff --git a/modules/solr/controllers/components/SolrComponent.php b/modules/solr/controllers/components/SolrComponent.php index 333ba5857..369840392 100644 --- a/modules/solr/controllers/components/SolrComponent.php +++ b/modules/solr/controllers/components/SolrComponent.php @@ -12,7 +12,7 @@ /** Component for accessing the solr server */ class Solr_SolrComponent extends AppComponent -{ + { /** * Returns the Apache_Solr_Service object. */ @@ -63,4 +63,4 @@ public function rebuildIndex($progressDao = null) $index = $this->getSolrIndex(); $index->optimize(); } -} // end class + } // end class diff --git a/modules/solr/controllers/forms/ConfigForm.php b/modules/solr/controllers/forms/ConfigForm.php index c0282a6fa..aab0c557f 100644 --- a/modules/solr/controllers/forms/ConfigForm.php +++ b/modules/solr/controllers/forms/ConfigForm.php @@ -20,7 +20,7 @@ /** module config form */ class Solr_ConfigForm extends AppForm -{ + { /** create the admin->modules page config form */ public function createConfigForm() { @@ -39,4 +39,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/solr/models/AppDao.php b/modules/solr/models/AppDao.php index 402e48983..2471be0bf 100644 --- a/modules/solr/models/AppDao.php +++ b/modules/solr/models/AppDao.php @@ -22,4 +22,4 @@ class Solr_AppDao extends MIDAS_GlobalDao { - } //end class + } // end class diff --git a/modules/solr/models/AppModel.php b/modules/solr/models/AppModel.php index 59a05488a..14467bb3b 100644 --- a/modules/solr/models/AppModel.php +++ b/modules/solr/models/AppModel.php @@ -20,6 +20,6 @@ /** App model base class for module */ class Solr_AppModel extends MIDASModel -{ + { public $moduleName = 'solr'; -} + } diff --git a/modules/statistics/AppController.php b/modules/statistics/AppController.php index 6cc5b29be..1f8010411 100644 --- a/modules/statistics/AppController.php +++ b/modules/statistics/AppController.php @@ -32,4 +32,4 @@ class Statistics_AppController extends MIDAS_GlobalModule { public $moduleName='statistics'; - } //end class + } // end class diff --git a/modules/statistics/Notification.php b/modules/statistics/Notification.php index 18f37ee5f..ba21980e2 100644 --- a/modules/statistics/Notification.php +++ b/modules/statistics/Notification.php @@ -124,4 +124,4 @@ public function handleUserDeleted($params) $downloadModel = MidasLoader::loadModel('Download', $this->moduleName); $downloadModel->removeUserReferences($user->getKey()); } - } //end class + } // end class diff --git a/modules/statistics/controllers/ConfigController.php b/modules/statistics/controllers/ConfigController.php index 29ca990a1..371593019 100644 --- a/modules/statistics/controllers/ConfigController.php +++ b/modules/statistics/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Statistics module configure controller */ class Statistics_ConfigController extends Statistics_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); @@ -128,4 +128,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/statistics/controllers/IndexController.php b/modules/statistics/controllers/IndexController.php index 4032ac204..33463fcf1 100644 --- a/modules/statistics/controllers/IndexController.php +++ b/modules/statistics/controllers/IndexController.php @@ -20,7 +20,7 @@ /** Index controller for the statistics module */ class Statistics_IndexController extends Statistics_AppController -{ + { public $_moduleModels = array('Download'); public $_models = array('Errorlog', 'Assetstore'); public $_components = array('Utility'); @@ -91,4 +91,4 @@ function indexAction() $this->view->piwikKey = $modulesConfig['statistics']->piwik->apikey; } -}//end class + } // end class diff --git a/modules/statistics/controllers/ItemController.php b/modules/statistics/controllers/ItemController.php index 785981c5b..ad237b40e 100644 --- a/modules/statistics/controllers/ItemController.php +++ b/modules/statistics/controllers/ItemController.php @@ -20,7 +20,7 @@ /** Controller for statistics about an item */ class Statistics_ItemController extends Statistics_AppController -{ + { public $_moduleModels = array('Download'); public $_models = array('Item'); public $_components = array('Utility'); @@ -190,4 +190,4 @@ public function filterAction() echo JsonComponent::encode(array('downloads' => $markers, 'count' => $totalCount)); } -}//end class + } // end class diff --git a/modules/statistics/controllers/components/ReportComponent.php b/modules/statistics/controllers/components/ReportComponent.php index 0bdb40f7f..6d743792f 100644 --- a/modules/statistics/controllers/components/ReportComponent.php +++ b/modules/statistics/controllers/components/ReportComponent.php @@ -22,7 +22,7 @@ * Generates and sends piwik statistics reports to admin users */ class Statistics_ReportComponent extends AppComponent -{ + { /** generate report */ public function generate() { @@ -98,4 +98,4 @@ public function send() } }//end send -} // end class + } // end class diff --git a/modules/statistics/controllers/forms/ConfigForm.php b/modules/statistics/controllers/forms/ConfigForm.php index 24e81377f..af9578384 100644 --- a/modules/statistics/controllers/forms/ConfigForm.php +++ b/modules/statistics/controllers/forms/ConfigForm.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Form for configuring the statistics module */ class Statistics_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() { @@ -41,4 +41,4 @@ public function createConfigForm() return $form; } -} // end class + } // end class diff --git a/modules/statistics/database/upgrade/1.0.1.php b/modules/statistics/database/upgrade/1.0.1.php index 7a4b95a32..910152eca 100644 --- a/modules/statistics/database/upgrade/1.0.1.php +++ b/modules/statistics/database/upgrade/1.0.1.php @@ -1,7 +1,7 @@ save($download); } - -} // end class + } // end class diff --git a/modules/statistics/models/base/IpLocationModelBase.php b/modules/statistics/models/base/IpLocationModelBase.php index e2a229241..8de9523bf 100644 --- a/modules/statistics/models/base/IpLocationModelBase.php +++ b/modules/statistics/models/base/IpLocationModelBase.php @@ -12,7 +12,7 @@ /** statistics Ip location model base */ abstract class Statistics_IpLocationModelBase extends Statistics_AppModel -{ + { /** constructor */ public function __construct() { @@ -93,5 +93,4 @@ public function performGeolocation($apiKey) } return $log; } - -} // end class + } // end class diff --git a/modules/statistics/models/dao/DownloadDao.php b/modules/statistics/models/dao/DownloadDao.php index cd8068d3e..9e23dcc3b 100644 --- a/modules/statistics/models/dao/DownloadDao.php +++ b/modules/statistics/models/dao/DownloadDao.php @@ -20,7 +20,7 @@ /** dao for the statistics_download model */ class Statistics_DownloadDao extends Statistics_AppDao -{ + { public $_model = 'Download'; public $_module = 'statistics'; -} + } diff --git a/modules/statistics/models/dao/IpLocationDao.php b/modules/statistics/models/dao/IpLocationDao.php index dc4e4b4e7..edb662093 100644 --- a/modules/statistics/models/dao/IpLocationDao.php +++ b/modules/statistics/models/dao/IpLocationDao.php @@ -12,7 +12,7 @@ /** dao for the statistics_ip_location model */ class Statistics_IpLocationDao extends Statistics_AppDao -{ + { public $_model = 'IpLocation'; public $_module = 'statistics'; -} + } diff --git a/modules/statistics/models/pdo/DownloadModel.php b/modules/statistics/models/pdo/DownloadModel.php index bf2d8fae2..ae18b6a4a 100644 --- a/modules/statistics/models/pdo/DownloadModel.php +++ b/modules/statistics/models/pdo/DownloadModel.php @@ -22,7 +22,7 @@ /** statistics_download model */ class Statistics_DownloadModel extends Statistics_DownloadModelBase -{ + { /** * Return a list of downloads * @param ids Array of item ids to aggregate statistics for @@ -159,4 +159,4 @@ function getDailyCounts($items, $startDate = null, $endDate = null) } return $results; } -} // end class + } // end class diff --git a/modules/statistics/models/pdo/IpLocationModel.php b/modules/statistics/models/pdo/IpLocationModel.php index 44eeb613f..2c9938358 100644 --- a/modules/statistics/models/pdo/IpLocationModel.php +++ b/modules/statistics/models/pdo/IpLocationModel.php @@ -14,7 +14,7 @@ /** statistics Ip Location model */ class Statistics_IpLocationModel extends Statistics_IpLocationModelBase -{ + { /** * Return the record for the given ip */ @@ -49,4 +49,4 @@ function getAllUnlocated() } return $result; } -} // end class + } // end class diff --git a/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php b/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php index 3018fa509..c8cad4f7e 100644 --- a/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php +++ b/modules/statistics/tests/controllers/StatisticsGeolocationLookupTest.php @@ -12,7 +12,7 @@ /** test statistics geolocation behavior */ class StatisticsGeolocationLookupTest extends ControllerTestCase -{ + { /** set up tests*/ public function setUp() { @@ -82,4 +82,4 @@ public function testGeolocationTask() print "Log = ".$logs[0]->getLog(); } -} + } diff --git a/modules/statistics/tests/models/StatisticsDownloadModelTest.php b/modules/statistics/tests/models/StatisticsDownloadModelTest.php index ebb8b5225..5b3179a6b 100644 --- a/modules/statistics/tests/models/StatisticsDownloadModelTest.php +++ b/modules/statistics/tests/models/StatisticsDownloadModelTest.php @@ -12,7 +12,7 @@ /** Test the behavior of the statistics download model */ class StatisticsDownloadModelTest extends DatabaseTestCase -{ + { /** set up tests*/ public function setUp() { @@ -53,4 +53,4 @@ public function testDailyTotals() $this->assertEquals($arrayDownload[date('Y-m-d', strtotime('-3 day'))], 50); $this->assertEquals($arrayDownload[date('Y-m-d', strtotime('-2 day'))], 20); } -} + } diff --git a/modules/thumbnailcreator/AppController.php b/modules/thumbnailcreator/AppController.php index cdbece5ae..d18e8cd2b 100644 --- a/modules/thumbnailcreator/AppController.php +++ b/modules/thumbnailcreator/AppController.php @@ -22,4 +22,4 @@ class Thumbnailcreator_AppController extends MIDAS_GlobalModule { public $moduleName='thumbnailcreator'; - } //end class + } // end class diff --git a/modules/thumbnailcreator/Notification.php b/modules/thumbnailcreator/Notification.php index 632800cf6..e214c331a 100644 --- a/modules/thumbnailcreator/Notification.php +++ b/modules/thumbnailcreator/Notification.php @@ -111,4 +111,4 @@ public function getDashboard() return $return; }//end _getDasboard - } //end class + } // end class diff --git a/modules/thumbnailcreator/controllers/ConfigController.php b/modules/thumbnailcreator/controllers/ConfigController.php index 9c70bc191..9f3152626 100644 --- a/modules/thumbnailcreator/controllers/ConfigController.php +++ b/modules/thumbnailcreator/controllers/ConfigController.php @@ -22,7 +22,7 @@ * Thumbnailcreator module configuration */ class Thumbnailcreator_ConfigController extends Thumbnailcreator_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); @@ -82,4 +82,4 @@ function indexAction() } } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/thumbnailcreator/controllers/ThumbnailController.php b/modules/thumbnailcreator/controllers/ThumbnailController.php index a308866cb..07469043b 100644 --- a/modules/thumbnailcreator/controllers/ThumbnailController.php +++ b/modules/thumbnailcreator/controllers/ThumbnailController.php @@ -22,7 +22,7 @@ * This class is used to create thumbnails */ class Thumbnailcreator_ThumbnailController extends Thumbnailcreator_AppController -{ + { public $_models = array('Assetstore', 'Bitstream', 'Item'); public $_moduleModels = array('Itemthumbnail'); public $_moduleDaos = array('Itemthumbnail'); @@ -127,4 +127,4 @@ public function itemAction() $downloadBitstreamComponent->download($bitstream); } } -}//end class + } // end class diff --git a/modules/thumbnailcreator/controllers/api/ItemController.php b/modules/thumbnailcreator/controllers/api/ItemController.php index 8799ac920..8d1094284 100644 --- a/modules/thumbnailcreator/controllers/api/ItemController.php +++ b/modules/thumbnailcreator/controllers/api/ItemController.php @@ -21,9 +21,8 @@ /** * WebApi controller for Item Resource (in thumbnailcreator module) */ - class Apithumbnailcreator_ItemController extends ApiController -{ + { /** * The put action handles PUT requests and receives an 'id' parameter; it * should update the server resource state of the resource identified by @@ -48,5 +47,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS, PUT'); } - -} + } diff --git a/modules/thumbnailcreator/controllers/components/ApiComponent.php b/modules/thumbnailcreator/controllers/components/ApiComponent.php index aa54c6c3f..f9ce49d01 100644 --- a/modules/thumbnailcreator/controllers/components/ApiComponent.php +++ b/modules/thumbnailcreator/controllers/components/ApiComponent.php @@ -12,7 +12,7 @@ /** Component for api methods */ class Thumbnailcreator_ApiComponent extends AppComponent -{ + { /** Return the user dao */ private function _callModuleApiMethod($args, $coreApiMethod, $resource = null, $hasReturn = true) @@ -49,4 +49,4 @@ public function createSmallThumbnail($args) return $this->_callModuleApiMethod($args, 'createSmallThumbnail', 'item'); } -} // end class + } // end class diff --git a/modules/thumbnailcreator/controllers/components/ApiitemComponent.php b/modules/thumbnailcreator/controllers/components/ApiitemComponent.php index ed77a2aeb..3c4ec7fbd 100644 --- a/modules/thumbnailcreator/controllers/components/ApiitemComponent.php +++ b/modules/thumbnailcreator/controllers/components/ApiitemComponent.php @@ -12,7 +12,7 @@ /** Apiitem Component for api methods */ class Thumbnailcreator_ApiitemComponent extends AppComponent -{ + { /** * Create a big thumbnail for the given bitstream with the given width. It is used as the main image of the given item and shown in the item view page. * @path /thumbnailcreator/item/bigthumbnail/{id} @@ -141,4 +141,4 @@ public function createSmallThumbnail($args) return $return; } -} // end class + } // end class diff --git a/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php b/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php index 0cd197562..c638613f7 100644 --- a/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php +++ b/modules/thumbnailcreator/controllers/components/ImagemagickComponent.php @@ -21,7 +21,7 @@ include_once BASE_PATH . '/library/KWUtils.php'; /** Component used to create thumbnails using phMagick library (on top of ImageMagick) */ class Thumbnailcreator_ImagemagickComponent extends AppComponent -{ + { /** * Create a 100x100 thumbnail from an item. * Echoes an error message if a problem occurs (for the scheduler log) @@ -287,4 +287,4 @@ public function isImageMagickWorking() } return array(false, 'No output from '.$cmd); } -} // end class + } // end class diff --git a/modules/thumbnailcreator/controllers/forms/ConfigForm.php b/modules/thumbnailcreator/controllers/forms/ConfigForm.php index a7f802a88..dec039740 100644 --- a/modules/thumbnailcreator/controllers/forms/ConfigForm.php +++ b/modules/thumbnailcreator/controllers/forms/ConfigForm.php @@ -22,7 +22,7 @@ * Thumbnailcreator_ConfigForm */ class Thumbnailcreator_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() @@ -64,4 +64,4 @@ public function createThumbnailerForm() return $form; } -} // end class + } // end class diff --git a/modules/thumbnailcreator/database/upgrade/1.0.1.php b/modules/thumbnailcreator/database/upgrade/1.0.1.php index 1422fc2d7..0459858b0 100644 --- a/modules/thumbnailcreator/database/upgrade/1.0.1.php +++ b/modules/thumbnailcreator/database/upgrade/1.0.1.php @@ -1,10 +1,9 @@ createThumbnail($this->assetstore, $oldpath); return $bitstreamDao; } - -} + } diff --git a/modules/thumbnailcreator/models/AppDao.php b/modules/thumbnailcreator/models/AppDao.php index 69f03cb67..7a6bb6b05 100644 --- a/modules/thumbnailcreator/models/AppDao.php +++ b/modules/thumbnailcreator/models/AppDao.php @@ -21,4 +21,4 @@ class Thumbnailcreator_AppDao extends MIDAS_GlobalDao { public $moduleName='thumbnailcreator'; - } //end class + } // end class diff --git a/modules/thumbnailcreator/models/AppModel.php b/modules/thumbnailcreator/models/AppModel.php index c81f5c2cf..f2bfcc2c7 100644 --- a/modules/thumbnailcreator/models/AppModel.php +++ b/modules/thumbnailcreator/models/AppModel.php @@ -19,7 +19,5 @@ =========================================================================*/ class Thumbnailcreator_AppModel extends MIDASModel -{ - - -} + { + } diff --git a/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php b/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php index 483b7d84b..ec2ec8057 100644 --- a/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php +++ b/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php @@ -14,7 +14,7 @@ * Item thumbnail model base */ abstract class Thumbnailcreator_ItemthumbnailModelBase extends Thumbnailcreator_AppModel -{ + { /** constructor*/ public function __construct() { @@ -35,4 +35,4 @@ public function __construct() public abstract function getByItemId($itemId); public abstract function deleteByItem($item); -} + } diff --git a/modules/thumbnailcreator/models/pdo/ItemthumbnailModel.php b/modules/thumbnailcreator/models/pdo/ItemthumbnailModel.php index e49abf3c4..c6fdc9671 100644 --- a/modules/thumbnailcreator/models/pdo/ItemthumbnailModel.php +++ b/modules/thumbnailcreator/models/pdo/ItemthumbnailModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php'; /** * Item thumbnail pdo model */ class Thumbnailcreator_ItemthumbnailModel extends Thumbnailcreator_ItemthumbnailModelBase -{ + { /** * Return an itemthumbnail dao based on an itemId. */ diff --git a/modules/tracker/Notification.php b/modules/tracker/Notification.php index 4b1e78a96..ced467b5f 100644 --- a/modules/tracker/Notification.php +++ b/modules/tracker/Notification.php @@ -110,4 +110,4 @@ public function sendEmail($params) UtilityComponent::sendEmail($user->getEmail(), 'Tracker Threshold Notification', $text); } - } //end class + } // end class diff --git a/modules/tracker/controllers/ConfigController.php b/modules/tracker/controllers/ConfigController.php index 71675f762..897c3bd14 100644 --- a/modules/tracker/controllers/ConfigController.php +++ b/modules/tracker/controllers/ConfigController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Module configuration controller (for admin use) */ class Tracker_ConfigController extends Tracker_AppController -{ + { public $_models = array('Setting'); public $_components = array('Breadcrumb'); @@ -58,4 +58,4 @@ function submitAction() echo JsonComponent::encode(array('message' => 'Changes saved', 'status' => 'ok')); } -} // end class + } // end class diff --git a/modules/tracker/controllers/ProducerController.php b/modules/tracker/controllers/ProducerController.php index 26a01e592..edfbc28c6 100644 --- a/modules/tracker/controllers/ProducerController.php +++ b/modules/tracker/controllers/ProducerController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** Producer controller*/ class Tracker_ProducerController extends Tracker_AppController -{ + { public $_components = array('Breadcrumb'); public $_models = array('Community'); public $_moduleModels = array('Producer', 'Trend'); @@ -163,4 +163,4 @@ public function editsubmitAction() echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Changes saved', 'producer' => $producer)); } -}//end class + } // end class diff --git a/modules/tracker/controllers/ScalarController.php b/modules/tracker/controllers/ScalarController.php index b9f1a37b6..76d0989d0 100644 --- a/modules/tracker/controllers/ScalarController.php +++ b/modules/tracker/controllers/ScalarController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** Scalar controller*/ class Tracker_ScalarController extends Tracker_AppController -{ + { public $_models = array('Community'); public $_moduleModels = array('Scalar', 'Trend'); @@ -90,4 +90,4 @@ public function deleteAction() $this->Tracker_Scalar->delete($scalar); echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Scalar deleted')); } -}//end class + } // end class diff --git a/modules/tracker/controllers/TrendController.php b/modules/tracker/controllers/TrendController.php index 955963643..59c70c361 100644 --- a/modules/tracker/controllers/TrendController.php +++ b/modules/tracker/controllers/TrendController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** Trend controller*/ class Tracker_TrendController extends Tracker_AppController -{ + { public $_components = array('Breadcrumb'); public $_models = array('Community'); public $_moduleModels = array('Producer', 'ThresholdNotification', 'Trend'); @@ -404,4 +404,4 @@ public function notifysubmitAction() } echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Changes saved')); } -}//end class + } // end class diff --git a/modules/tracker/controllers/components/ApiComponent.php b/modules/tracker/controllers/components/ApiComponent.php index 8ea0a753a..13c70563b 100644 --- a/modules/tracker/controllers/components/ApiComponent.php +++ b/modules/tracker/controllers/components/ApiComponent.php @@ -12,7 +12,7 @@ /** Component for api methods */ class Tracker_ApiComponent extends AppComponent -{ + { /** * Helper function for verifying keys in an input array */ @@ -466,4 +466,4 @@ private function _createOrFindByName($itemName, $community) return $items[0]; } } -} // end class + } // end class diff --git a/modules/tracker/controllers/components/ThresholdNotificationComponent.php b/modules/tracker/controllers/components/ThresholdNotificationComponent.php index 8039959c0..25af62cc1 100644 --- a/modules/tracker/controllers/components/ThresholdNotificationComponent.php +++ b/modules/tracker/controllers/components/ThresholdNotificationComponent.php @@ -12,7 +12,7 @@ /** Component for performing threshold notifications */ class Tracker_ThresholdNotificationComponent extends AppComponent -{ + { /** * Add scheduled tasks for emailing users that the threshold was crossed */ @@ -34,4 +34,4 @@ public function scheduleNotifications($scalar, $notifications) $jobModel->save($job); } } -} // end class + } // end class diff --git a/modules/tracker/database/upgrade/1.0.1.php b/modules/tracker/database/upgrade/1.0.1.php index 5428a55b0..d9849e463 100644 --- a/modules/tracker/database/upgrade/1.0.1.php +++ b/modules/tracker/database/upgrade/1.0.1.php @@ -1,12 +1,11 @@ save($scalar); return $scalar; } -} + } diff --git a/modules/tracker/models/base/ThresholdNotificationModelBase.php b/modules/tracker/models/base/ThresholdNotificationModelBase.php index 2a61470a6..f59af163c 100644 --- a/modules/tracker/models/base/ThresholdNotificationModelBase.php +++ b/modules/tracker/models/base/ThresholdNotificationModelBase.php @@ -14,7 +14,7 @@ * Threshold Notification Model Base */ abstract class Tracker_ThresholdNotificationModelBase extends Tracker_AppModel -{ + { /** constructor*/ public function __construct() { @@ -62,4 +62,4 @@ public function testThreshold($value, $threshold) return false; } } -} + } diff --git a/modules/tracker/models/base/TrendModelBase.php b/modules/tracker/models/base/TrendModelBase.php index 76838f53f..a57e2f963 100644 --- a/modules/tracker/models/base/TrendModelBase.php +++ b/modules/tracker/models/base/TrendModelBase.php @@ -14,7 +14,7 @@ * Trend Model Base */ abstract class Tracker_TrendModelBase extends Tracker_AppModel -{ + { /** constructor*/ public function __construct() { @@ -135,4 +135,4 @@ public function delete($trend, $progressDao = null) $notificationModel->deleteByTrend($trend); parent::delete($trend); } -} + } diff --git a/modules/tracker/models/pdo/ProducerModel.php b/modules/tracker/models/pdo/ProducerModel.php index 1cc6ec841..44715afc1 100644 --- a/modules/tracker/models/pdo/ProducerModel.php +++ b/modules/tracker/models/pdo/ProducerModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/tracker/models/base/ProducerModelBase.php'; /** * Producer PDO Model */ class Tracker_ProducerModel extends Tracker_ProducerModelBase -{ + { /** * Return all producers for the given community */ @@ -44,4 +45,4 @@ public function getByCommunityIdAndName($communityId, $displayName) ->where('display_name = ?', $displayName); return $this->initDao('Producer', $this->database->fetchRow($sql), $this->moduleName); } -} + } diff --git a/modules/tracker/models/pdo/ScalarModel.php b/modules/tracker/models/pdo/ScalarModel.php index 9e99e25c9..d565a3bd2 100644 --- a/modules/tracker/models/pdo/ScalarModel.php +++ b/modules/tracker/models/pdo/ScalarModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/tracker/models/base/ScalarModelBase.php'; /** * Scalar PDO Model */ class Tracker_ScalarModel extends Tracker_ScalarModelBase -{ + { /** * Associate an item with a particular scalar * @param scalar The scalar dao @@ -96,4 +97,4 @@ public function getByTrendAndTimestamp($trendId, $timestamp, $userId = null) } return $this->initDao('Scalar', $this->database->fetchRow($sql), $this->moduleName); } -} + } diff --git a/modules/tracker/models/pdo/ThresholdNotificationModel.php b/modules/tracker/models/pdo/ThresholdNotificationModel.php index a7c1b3658..2b4eae709 100644 --- a/modules/tracker/models/pdo/ThresholdNotificationModel.php +++ b/modules/tracker/models/pdo/ThresholdNotificationModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/tracker/models/base/ThresholdNotificationModelBase.php'; /** * ThresholdNotification PDO Model */ class Tracker_ThresholdNotificationModel extends Tracker_ThresholdNotificationModelBase -{ + { /** * Called when a scalar is submitted. Returns a list of notifications whose conditions were met. */ @@ -65,4 +66,4 @@ public function deleteByTrend($trend) $this->delete($threshold); } } -} + } diff --git a/modules/tracker/models/pdo/TrendModel.php b/modules/tracker/models/pdo/TrendModel.php index 141b57477..9b55caf0b 100644 --- a/modules/tracker/models/pdo/TrendModel.php +++ b/modules/tracker/models/pdo/TrendModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/tracker/models/base/TrendModelBase.php'; /** * Trend PDO Model */ class Tracker_TrendModel extends Tracker_TrendModelBase -{ + { /** * Return the matching trend dao if it exists */ @@ -144,4 +145,4 @@ public function getAllByParams($params) } return $trends; } -} + } diff --git a/modules/validation/AppController.php b/modules/validation/AppController.php index 58b2d59c0..186b237d0 100644 --- a/modules/validation/AppController.php +++ b/modules/validation/AppController.php @@ -14,4 +14,4 @@ class Validation_AppController extends MIDAS_GlobalModule { public $moduleName='validation'; - } //end class + } // end class diff --git a/modules/validation/Notification.php b/modules/validation/Notification.php index 97bb9d531..c39f8e3a0 100644 --- a/modules/validation/Notification.php +++ b/modules/validation/Notification.php @@ -24,4 +24,4 @@ public function init() $this->enableWebAPI($this->moduleName); }//end init - } //end class + } // end class diff --git a/modules/validation/controllers/IndexController.php b/modules/validation/controllers/IndexController.php index aa0a0d943..b76a3e4be 100644 --- a/modules/validation/controllers/IndexController.php +++ b/modules/validation/controllers/IndexController.php @@ -11,7 +11,7 @@ =========================================================================*/ /** demo controller*/ class Validation_IndexController extends Validation_AppController -{ + { public $_models = array('User', 'Item', 'Folder'); public $_moduleModels = array('Dashboard'); @@ -44,4 +44,4 @@ function indexAction() $this->view->nDashboards = count($dashboards); } -}//end class + } // end class diff --git a/modules/validation/controllers/components/ApiComponent.php b/modules/validation/controllers/components/ApiComponent.php index e2c9312dd..b2ba5a51c 100644 --- a/modules/validation/controllers/components/ApiComponent.php +++ b/modules/validation/controllers/components/ApiComponent.php @@ -12,7 +12,7 @@ /** Component for api methods */ class Validation_ApiComponent extends AppComponent -{ + { /** * Helper function for verifying keys in an input array @@ -505,4 +505,4 @@ public function getAllScores($value) 'scores' => $scores); } -} // end class + } // end class diff --git a/modules/validation/models/AppDao.php b/modules/validation/models/AppDao.php index e4064aa39..f788cc5c5 100644 --- a/modules/validation/models/AppDao.php +++ b/modules/validation/models/AppDao.php @@ -14,6 +14,6 @@ * AppDao for the validation module. */ class Validation_AppDao extends MIDAS_GlobalDao -{ + { public $moduleName = 'validation'; -} //end class + } // end class diff --git a/modules/validation/models/AppModel.php b/modules/validation/models/AppModel.php index f91dd5815..9b9b5553f 100644 --- a/modules/validation/models/AppModel.php +++ b/modules/validation/models/AppModel.php @@ -14,6 +14,6 @@ * Validation AppModel */ class Validation_AppModel extends MIDASModel -{ + { public $moduleName = 'validation'; -} + } diff --git a/modules/validation/models/base/DashboardModelBase.php b/modules/validation/models/base/DashboardModelBase.php index 1f741a7d4..9b9076085 100644 --- a/modules/validation/models/base/DashboardModelBase.php +++ b/modules/validation/models/base/DashboardModelBase.php @@ -19,7 +19,7 @@ * he or a site administrator may modify the dashboard in any way. */ abstract class Validation_DashboardModelBase extends Validation_AppModel -{ + { /** constructor*/ public function __construct() { @@ -234,5 +234,4 @@ abstract function getScores($dashboard, $folder); * scores */ abstract function getAllScores($dashboard); - -} // end class Validation_DashboardModelBase + } // end class diff --git a/modules/validation/models/base/ScalarResultModelBase.php b/modules/validation/models/base/ScalarResultModelBase.php index 8d3d9d10c..b53556d91 100644 --- a/modules/validation/models/base/ScalarResultModelBase.php +++ b/modules/validation/models/base/ScalarResultModelBase.php @@ -15,7 +15,7 @@ * scalar is related to the result by its associated folder and item. */ abstract class Validation_ScalarResultModelBase extends Validation_AppModel -{ + { /** constructor*/ public function __construct() { @@ -85,4 +85,4 @@ function setItem($scalarResult, $item) $scalarResult->setItemId($item->getKey()); parent::save($scalarResult); } -} + } diff --git a/modules/validation/models/pdo/DashboardModel.php b/modules/validation/models/pdo/DashboardModel.php index 92350220e..958df9a53 100644 --- a/modules/validation/models/pdo/DashboardModel.php +++ b/modules/validation/models/pdo/DashboardModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/validation/models/base/DashboardModelBase.php'; /** * Dashboard PDO Model */ class Validation_DashboardModel extends Validation_DashboardModelBase -{ + { /** * Return all the record in the table * @return Array of ValidationDao @@ -246,5 +247,4 @@ function getAllScores($dashboard) } return $results; } - -} // end class + } // end class diff --git a/modules/validation/models/pdo/ScalarResultModel.php b/modules/validation/models/pdo/ScalarResultModel.php index f71b1a84b..0a0851b83 100644 --- a/modules/validation/models/pdo/ScalarResultModel.php +++ b/modules/validation/models/pdo/ScalarResultModel.php @@ -9,13 +9,14 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + require_once BASE_PATH.'/modules/validation/models/base/ScalarResultModelBase.php'; /** * ScalarResult PDO Model */ class Validation_ScalarResultModel extends Validation_ScalarResultModelBase -{ + { /** * Return all the record in the table * @return array of ScalarResultDao @@ -32,4 +33,4 @@ function getAll() } return $rowsetAnalysed; } -} + } diff --git a/modules/validation/tests/controllers/ApiComponentControllerTest.php b/modules/validation/tests/controllers/ApiComponentControllerTest.php index 44c0d9b2a..b175444a3 100644 --- a/modules/validation/tests/controllers/ApiComponentControllerTest.php +++ b/modules/validation/tests/controllers/ApiComponentControllerTest.php @@ -13,7 +13,6 @@ /** Tests the functionality of the web API methods */ class ApiControllerTest extends ControllerTestCase { - /** set up tests */ public function setUp() { @@ -715,5 +714,4 @@ public function testGetAllScores() } } } - -} + } diff --git a/modules/validation/tests/models/base/DashboardModelTest.php b/modules/validation/tests/models/base/DashboardModelTest.php index f655ee606..e7464a13b 100644 --- a/modules/validation/tests/models/base/DashboardModelTest.php +++ b/modules/validation/tests/models/base/DashboardModelTest.php @@ -9,9 +9,10 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. =========================================================================*/ + /** test hello model*/ class DashboardModelTest extends DatabaseTestCase -{ + { /** set up tests*/ public function setUp() { @@ -564,4 +565,4 @@ public function testSetScore() $scores = $dashboardModel->getScores($dao, $resultFolder); $this->assertEquals($values, $scores); } -} + } diff --git a/modules/validation/tests/models/base/ScalarResultModelTest.php b/modules/validation/tests/models/base/ScalarResultModelTest.php index 5114d3979..f15887983 100644 --- a/modules/validation/tests/models/base/ScalarResultModelTest.php +++ b/modules/validation/tests/models/base/ScalarResultModelTest.php @@ -12,7 +12,7 @@ /** test ScalarResultModel */ class ScalarResultModelTest extends DatabaseTestCase -{ + { /** set up tests*/ public function setUp() { @@ -62,4 +62,4 @@ public function testGetSetValue() $sr = $daos[0]; $this->assertEquals(90.009, $sr->getValue()); } -} + } diff --git a/modules/visualize/AppController.php b/modules/visualize/AppController.php index f0f2a1cff..9a767c380 100644 --- a/modules/visualize/AppController.php +++ b/modules/visualize/AppController.php @@ -22,4 +22,4 @@ class Visualize_AppController extends MIDAS_GlobalModule { public $moduleName='visualize'; - } //end class + } // end class diff --git a/modules/visualize/Notification.php b/modules/visualize/Notification.php index 399b4fbca..73220eb55 100644 --- a/modules/visualize/Notification.php +++ b/modules/visualize/Notification.php @@ -99,4 +99,4 @@ function getServerURL() } return $prefix.$_SERVER['SERVER_NAME'].$currentPort; } - } //end class + } // end class diff --git a/modules/visualize/controllers/ConfigController.php b/modules/visualize/controllers/ConfigController.php index fb7d1d829..f93b2b9a5 100644 --- a/modules/visualize/controllers/ConfigController.php +++ b/modules/visualize/controllers/ConfigController.php @@ -20,7 +20,7 @@ /** Config controller*/ class Visualize_ConfigController extends Visualize_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); public $_moduleModels = array(); @@ -81,4 +81,4 @@ function indexAction() } } -}//end class + } // end class diff --git a/modules/visualize/controllers/ImageController.php b/modules/visualize/controllers/ImageController.php index 599105c88..d4ebb30a5 100644 --- a/modules/visualize/controllers/ImageController.php +++ b/modules/visualize/controllers/ImageController.php @@ -20,7 +20,7 @@ /** Image controler*/ class Visualize_ImageController extends Visualize_AppController -{ + { public $_models = array('Item', 'ItemRevision', 'Bitstream'); /** index */ public function indexAction() @@ -44,4 +44,4 @@ public function indexAction() $this->view->imageUrl = $this->view->webroot."/download?items=".$item->getKey(); } -} // end class + } // end class diff --git a/modules/visualize/controllers/IndexController.php b/modules/visualize/controllers/IndexController.php index 998d41212..767f855f3 100644 --- a/modules/visualize/controllers/IndexController.php +++ b/modules/visualize/controllers/IndexController.php @@ -20,7 +20,7 @@ /** Index controller*/ class Visualize_IndexController extends Visualize_AppController -{ + { public $_moduleComponents = array('Main'); public $_models = array('Item'); diff --git a/modules/visualize/controllers/MediaController.php b/modules/visualize/controllers/MediaController.php index ded922b11..d0637445f 100644 --- a/modules/visualize/controllers/MediaController.php +++ b/modules/visualize/controllers/MediaController.php @@ -20,7 +20,7 @@ /** Media Controller*/ class Visualize_MediaController extends Visualize_AppController -{ + { public $_models = array('Item', 'ItemRevision', 'Bitstream'); /** index */ public function indexAction() @@ -57,4 +57,4 @@ public function indexAction() } $this->view->json['itemId'] = $item->getKey(); } -} // end class + } // end class diff --git a/modules/visualize/controllers/ParaviewController.php b/modules/visualize/controllers/ParaviewController.php index b0074be42..adc50679c 100644 --- a/modules/visualize/controllers/ParaviewController.php +++ b/modules/visualize/controllers/ParaviewController.php @@ -20,7 +20,7 @@ /** Paraview Controller*/ class Visualize_ParaviewController extends Visualize_AppController -{ + { public $_models = array('Item', 'ItemRevision', 'Bitstream'); public $_moduleComponents = array('Main'); @@ -570,4 +570,4 @@ protected function _getTomcatPort($pwapp) return '80'; } } -} // end class + } // end class diff --git a/modules/visualize/controllers/PdfController.php b/modules/visualize/controllers/PdfController.php index 92179f7a9..b3c4ccc00 100644 --- a/modules/visualize/controllers/PdfController.php +++ b/modules/visualize/controllers/PdfController.php @@ -20,7 +20,7 @@ /** Pdf controller*/ class Visualize_PdfController extends Visualize_AppController -{ + { public $_models = array('Item', 'ItemRevision', 'Bitstream'); /** index */ public function indexAction() @@ -47,4 +47,4 @@ public function indexAction() echo ""; } -} // end class + } // end class diff --git a/modules/visualize/controllers/TxtController.php b/modules/visualize/controllers/TxtController.php index 45293305d..046e2a7a3 100644 --- a/modules/visualize/controllers/TxtController.php +++ b/modules/visualize/controllers/TxtController.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Txt controller*/ class Visualize_TxtController extends Visualize_AppController -{ + { public $_models = array('Item', 'ItemRevision', 'Bitstream'); /** index */ public function indexAction() @@ -49,4 +49,4 @@ public function indexAction() echo file_get_contents($this->bistream->getFullPath()); echo ""; } -} // end class + } // end class diff --git a/modules/visualize/controllers/WebglController.php b/modules/visualize/controllers/WebglController.php index dcafddd79..2d3f484df 100644 --- a/modules/visualize/controllers/WebglController.php +++ b/modules/visualize/controllers/WebglController.php @@ -20,7 +20,7 @@ /** Webgl controller*/ class Visualize_WebglController extends Visualize_AppController -{ + { public $_moduleForms = array('Config'); public $_components = array('Utility', 'Date'); public $_models = array('Item', 'Folder'); @@ -111,4 +111,4 @@ private function _rgb2hex($r, $g = -1, $b = -1) $color .= (strlen($b) < 2 ? '0' : '').$b; return $color; } -}//end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/visualize/controllers/WrapperController.php b/modules/visualize/controllers/WrapperController.php index 866f8dcff..ad7036c72 100644 --- a/modules/visualize/controllers/WrapperController.php +++ b/modules/visualize/controllers/WrapperController.php @@ -20,7 +20,7 @@ /** Wrapper controller*/ class Visualize_WrapperController extends Visualize_AppController -{ + { public $_moduleComponents = array('Main'); public $_models = array('Item', 'Folder'); public $_components = array('Date', 'Utility', 'Sortdao'); diff --git a/modules/visualize/controllers/components/MainComponent.php b/modules/visualize/controllers/components/MainComponent.php index 038d853e7..a17d396b3 100644 --- a/modules/visualize/controllers/components/MainComponent.php +++ b/modules/visualize/controllers/components/MainComponent.php @@ -21,7 +21,7 @@ /** main component */ class Visualize_MainComponent extends AppComponent -{ + { /** convert to threejs */ public function convertToThreejs($revision) { @@ -582,4 +582,4 @@ private function _rrmdir($dir) reset($objects); rmdir($dir); } -} // end class + } // end class diff --git a/modules/visualize/controllers/forms/ConfigForm.php b/modules/visualize/controllers/forms/ConfigForm.php index fd4b9ceda..606653f5c 100644 --- a/modules/visualize/controllers/forms/ConfigForm.php +++ b/modules/visualize/controllers/forms/ConfigForm.php @@ -20,7 +20,7 @@ /** config form*/ class Visualize_ConfigForm extends AppForm -{ + { /** create form */ public function createConfigForm() { @@ -43,4 +43,4 @@ public function createConfigForm() $form->addElements(array($pvbatch, $PWApp, $usesymlinks, $userwebgl, $paraviewworkdir, $customtmp, $useparaview, $submit)); return $form; } -} // end class \ No newline at end of file + } // end class \ No newline at end of file diff --git a/modules/visualize/models/AppDao.php b/modules/visualize/models/AppDao.php index 3d0294172..342639c89 100644 --- a/modules/visualize/models/AppDao.php +++ b/modules/visualize/models/AppDao.php @@ -21,4 +21,4 @@ class Visualize_AppDao extends MIDAS_GlobalDao { - } //end class + } // end class diff --git a/modules/visualize/models/AppModel.php b/modules/visualize/models/AppModel.php index e590d368a..05cb28c17 100644 --- a/modules/visualize/models/AppModel.php +++ b/modules/visualize/models/AppModel.php @@ -19,7 +19,7 @@ =========================================================================*/ class Visualize_AppModel extends MIDASModel -{ + { public $moduleName='visualize'; -} + } From 49652894a7db692dcecc3056d786183d7d8407b3 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Tue, 10 Jun 2014 16:00:29 -0400 Subject: [PATCH 10/25] Ensure one new line at the end of each file --- core/AppComponent.php | 2 +- core/controllers/SearchController.php | 1 - core/controllers/ShareController.php | 1 - core/controllers/components/DemoComponent.php | 2 +- .../components/InternationalizationComponent.php | 2 +- core/controllers/components/SortdaoComponent.php | 2 +- core/models/pdo/CommunityModel.php | 2 +- core/models/pdo/SettingModel.php | 2 +- core/tests/models/base/FeedpolicyuserModelTest.php | 2 +- core/tests/models/dao/FeedDaoTest.php | 2 +- core/tests/models/dao/UserDaoTest.php | 2 +- core/views/admin/unavailable.phtml | 2 -- core/views/admin/upgrade.phtml | 2 +- core/views/apikey/usertab.phtml | 6 ------ core/views/browse/index.phtml | 4 ---- core/views/browse/selectitem.phtml | 1 - core/views/community/create.phtml | 4 ---- core/views/community/invitation.phtml | 1 - core/views/element/feed.phtml | 2 +- core/views/feed/index.phtml | 4 ---- core/views/folder/createfolder.phtml | 2 +- core/views/folder/edit.phtml | 2 +- core/views/install/index.phtml | 2 +- core/views/install/step2.phtml | 2 +- core/views/item/editmetadata.phtml | 2 +- core/views/scripts/error/error.phtml | 1 - core/views/search/index.phtml | 4 ---- core/views/share/dialog.phtml | 1 - core/views/share/links.phtml | 1 - core/views/user/index.phtml | 4 ---- core/views/user/manage.phtml | 3 --- core/views/user/recoverpassword.phtml | 2 +- core/views/user/settings.phtml | 2 +- core/views/user/termofservice.phtml | 2 +- modules/GlobalModule.php | 2 +- modules/api/views/config/index.phtml | 6 ------ modules/api/views/config/usertab.phtml | 6 ------ modules/archive/views/config/index.phtml | 2 +- .../batchmake/controllers/components/ApiComponent.php | 4 ---- .../controllers/components/ExecuteComponent.php | 2 +- modules/batchmake/tests/models/base/TaskModelTest.php | 2 +- modules/batchmake/views/index/index.phtml | 2 +- modules/cleanup/controllers/IndexController.php | 2 +- modules/cleanup/views/config/index.phtml | 6 ------ modules/comments/controllers/IndexController.php | 2 +- modules/comments/views/config/index.phtml | 6 ------ modules/comments/views/index/index.phtml | 2 +- .../models/base/AgreementModelBase.php | 3 ++- modules/communityagreement/models/dao/AgreementDao.php | 2 +- .../tests/models/base/AgreementModelTest.php | 2 +- modules/communityagreement/views/config/index.phtml | 2 +- modules/communityagreement/views/index/index.phtml | 2 +- modules/example/models/AppDao.php | 1 - modules/example/views/index/index.phtml | 2 +- modules/example/views/sample/delete.phtml | 1 - modules/example/views/sample/view.phtml | 1 - modules/ldap/views/config/index.phtml | 6 ------ .../metadataextractor/controllers/ConfigController.php | 2 +- modules/metadataextractor/views/config/index.phtml | 6 ------ modules/mfa/Notification.php | 1 - modules/mfa/controllers/ConfigController.php | 1 - modules/mfa/views/config/index.phtml | 1 - modules/oai/controllers/ConfigController.php | 2 +- modules/oai/controllers/forms/ConfigForm.php | 2 +- modules/oai/views/config/index.phtml | 6 ------ modules/packages/views/application/latest.phtml | 2 +- modules/packages/views/view/project.phtml | 1 - modules/ratings/controllers/IndexController.php | 2 +- modules/ratings/controllers/RatingController.php | 2 +- modules/ratings/views/config/index.phtml | 6 ------ modules/ratings/views/index/index.phtml | 2 +- modules/ratings/views/scripts/element/rating.phtml | 2 -- .../remoteprocessing/controllers/ConfigController.php | 1 - .../controllers/components/ApiComponent.php | 4 ---- .../remoteprocessing/controllers/forms/ConfigForm.php | 1 - modules/remoteprocessing/models/dao/JobDao.php | 2 +- modules/remoteprocessing/views/config/index.phtml | 6 ------ modules/remoteprocessing/views/executable/define.phtml | 7 ------- modules/remoteprocessing/views/index/dashboard.phtml | 2 +- modules/remoteprocessing/views/index/selectaction.phtml | 2 +- modules/remoteprocessing/views/job/init.phtml | 5 ----- modules/remoteprocessing/views/job/manage.phtml | 9 --------- modules/remoteprocessing/views/job/view.phtml | 6 ------ modules/scheduler/controllers/ConfigController.php | 2 +- modules/scheduler/controllers/WorkflowController.php | 2 +- modules/scheduler/layouts/layout-disable.phtml | 2 +- modules/scheduler/views/config/index.phtml | 6 ------ modules/scheduler/views/index/index.phtml | 2 +- modules/scheduler/views/workflow/create.phtml | 2 +- modules/sizequota/controllers/ConfigController.php | 2 +- modules/sizequota/views/config/folder.phtml | 6 ------ modules/sizequota/views/config/index.phtml | 6 ------ modules/solr/views/config/index.phtml | 6 ------ modules/statistics/views/config/index.phtml | 6 ------ modules/statistics/views/index/index.phtml | 2 +- .../thumbnailcreator/controllers/ConfigController.php | 2 +- modules/thumbnailcreator/database/upgrade/1.0.2.php | 1 - modules/thumbnailcreator/views/config/index.phtml | 6 ------ modules/validation/views/config/index.phtml | 2 +- modules/visualize/controllers/IndexController.php | 1 - modules/visualize/controllers/WebglController.php | 2 +- modules/visualize/controllers/forms/ConfigForm.php | 2 +- .../tests/controllers/WrapperControllerTest.php | 2 +- modules/visualize/views/config/index.phtml | 6 ------ modules/visualize/views/image/index.phtml | 2 +- modules/visualize/views/media/index.phtml | 2 +- modules/visualize/views/paraview/dual.phtml | 1 - modules/visualize/views/paraview/slice.phtml | 1 - modules/visualize/views/paraview/surface.phtml | 1 - modules/visualize/views/paraview/volume.phtml | 1 - modules/visualize/views/webgl/index.phtml | 2 +- modules/visualize/views/wrapper/index.phtml | 1 - 112 files changed, 59 insertions(+), 245 deletions(-) diff --git a/core/AppComponent.php b/core/AppComponent.php index 0b1b50235..5c5ca51c0 100644 --- a/core/AppComponent.php +++ b/core/AppComponent.php @@ -26,4 +26,4 @@ class AppComponent extends MIDAS_GlobalComponent { - } \ No newline at end of file + } diff --git a/core/controllers/SearchController.php b/core/controllers/SearchController.php index c3c54e0a4..d862d974e 100644 --- a/core/controllers/SearchController.php +++ b/core/controllers/SearchController.php @@ -337,4 +337,3 @@ public function liveAction() echo JsonComponent::encode($results); } } // end class - diff --git a/core/controllers/ShareController.php b/core/controllers/ShareController.php index bec158137..9281897c2 100644 --- a/core/controllers/ShareController.php +++ b/core/controllers/ShareController.php @@ -379,4 +379,3 @@ function linksAction() $this->view->downloadUrl = $baseUrl.'/download/'.$type.'/'.$id.'/'.urlencode($name); } } // end class - diff --git a/core/controllers/components/DemoComponent.php b/core/controllers/components/DemoComponent.php index 9a7fd22cc..81fe23f4c 100644 --- a/core/controllers/components/DemoComponent.php +++ b/core/controllers/components/DemoComponent.php @@ -144,4 +144,4 @@ private function _rrmdir($dir) reset($objects); rmdir($dir); } - } // end class \ No newline at end of file + } // end class diff --git a/core/controllers/components/InternationalizationComponent.php b/core/controllers/components/InternationalizationComponent.php index f6e457f66..cf4d14346 100644 --- a/core/controllers/components/InternationalizationComponent.php +++ b/core/controllers/components/InternationalizationComponent.php @@ -79,4 +79,4 @@ static public function isDebug() return false; } } - } // end class \ No newline at end of file + } // end class diff --git a/core/controllers/components/SortdaoComponent.php b/core/controllers/components/SortdaoComponent.php index 448ab7264..740c28a2f 100644 --- a/core/controllers/components/SortdaoComponent.php +++ b/core/controllers/components/SortdaoComponent.php @@ -179,4 +179,4 @@ public function arrayUniqueDao($array, $keep_key_assoc = false) return $keep_key_assoc ? $array : array_values($array); } - } // end class \ No newline at end of file + } // end class diff --git a/core/models/pdo/CommunityModel.php b/core/models/pdo/CommunityModel.php index a936a6875..70ce472ee 100644 --- a/core/models/pdo/CommunityModel.php +++ b/core/models/pdo/CommunityModel.php @@ -179,4 +179,4 @@ function getCommunitiesFromSearch($search, $userDao, $limit = 14, $group = true, return $return; } // end getCommunitiesFromSearch() - } // end class \ No newline at end of file + } // end class diff --git a/core/models/pdo/SettingModel.php b/core/models/pdo/SettingModel.php index 2696a9961..2ccd44e82 100644 --- a/core/models/pdo/SettingModel.php +++ b/core/models/pdo/SettingModel.php @@ -29,4 +29,4 @@ function getDaoByName($name, $module = 'core') $dao = $this->initDao(ucfirst($this->_name), $row); return $dao; } - } // end class \ No newline at end of file + } // end class diff --git a/core/tests/models/base/FeedpolicyuserModelTest.php b/core/tests/models/base/FeedpolicyuserModelTest.php index f446ca58e..6ea4f4475 100644 --- a/core/tests/models/base/FeedpolicyuserModelTest.php +++ b/core/tests/models/base/FeedpolicyuserModelTest.php @@ -41,4 +41,4 @@ public function testCreatePolicyAndGetPolicy() $policy = $this->Feedpolicyuser->getPolicy($usersFile[0], $feedsFile[5]); $this->assertNotEquals(false, $policy); } - } \ No newline at end of file + } diff --git a/core/tests/models/dao/FeedDaoTest.php b/core/tests/models/dao/FeedDaoTest.php index 9c5f6b81a..b672fc091 100644 --- a/core/tests/models/dao/FeedDaoTest.php +++ b/core/tests/models/dao/FeedDaoTest.php @@ -92,4 +92,4 @@ public function testGetRessource() } } } - } \ No newline at end of file + } diff --git a/core/tests/models/dao/UserDaoTest.php b/core/tests/models/dao/UserDaoTest.php index f5eca1e6a..9beb770ac 100644 --- a/core/tests/models/dao/UserDaoTest.php +++ b/core/tests/models/dao/UserDaoTest.php @@ -36,4 +36,4 @@ public function testGetFullName() $userDao = $this->User->load($usersFile[0]->getKey()); $this->assertEquals($userDao->getFullName(), $usersFile[0]->firstname." ".$usersFile[0]->lastname); } - } \ No newline at end of file + } diff --git a/core/views/admin/unavailable.phtml b/core/views/admin/unavailable.phtml index 844d3e3d8..55f028281 100644 --- a/core/views/admin/unavailable.phtml +++ b/core/views/admin/unavailable.phtml @@ -13,5 +13,3 @@ PURPOSE. See the above copyright notices for more information. ?>
Administration unavailable in demo mode - - diff --git a/core/views/admin/upgrade.phtml b/core/views/admin/upgrade.phtml index edbd17311..f140d95a9 100644 --- a/core/views/admin/upgrade.phtml +++ b/core/views/admin/upgrade.phtml @@ -48,4 +48,4 @@ if(count($this->modules) == 0)

-Upgrade from MIDAS2 \ No newline at end of file +Upgrade from MIDAS2 diff --git a/core/views/apikey/usertab.phtml b/core/views/apikey/usertab.phtml index 2328e9e19..3fb958df6 100644 --- a/core/views/apikey/usertab.phtml +++ b/core/views/apikey/usertab.phtml @@ -63,9 +63,3 @@ else form['createAPIKey']?> - - - - - - diff --git a/core/views/browse/index.phtml b/core/views/browse/index.phtml index 1aad93773..b9cb80cf0 100644 --- a/core/views/browse/index.phtml +++ b/core/views/browse/index.phtml @@ -87,7 +87,3 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro - - - - diff --git a/core/views/browse/selectitem.phtml b/core/views/browse/selectitem.phtml index 04f02aca0..946c9e602 100644 --- a/core/views/browse/selectitem.phtml +++ b/core/views/browse/selectitem.phtml @@ -66,4 +66,3 @@ echo ''; } From b8570e27e5b1b36ab9185e83ce0fcc91b63fbd83 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 11 Jun 2014 10:17:22 -0400 Subject: [PATCH 13/25] Miscellaneous PHP formatting tweaks --- core/ApiController.php | 1 - core/AppComponent.php | 2 -- core/AppForm.php | 3 +- core/Bootstrap.php | 1 - core/constant/notification.php | 6 ++-- core/controllers/AdminController.php | 3 -- core/controllers/ApidocsController.php | 1 - core/controllers/AssetstoreController.php | 3 -- core/controllers/BrowseController.php | 1 - core/controllers/CommunityController.php | 1 - core/controllers/FolderController.php | 2 -- core/controllers/ImportController.php | 4 --- core/controllers/IndexController.php | 1 - core/controllers/InstallController.php | 2 -- core/controllers/ItemController.php | 4 --- core/controllers/SearchController.php | 4 --- core/controllers/ShareController.php | 2 -- core/controllers/UploadController.php | 3 -- core/controllers/UserController.php | 2 -- core/controllers/api/IndexController.php | 1 - .../components/ApibitstreamComponent.php | 2 -- .../components/ApidocsComponent.php | 1 - .../components/ApifolderComponent.php | 3 +- .../components/ApigroupComponent.php | 1 - .../components/ApihelperComponent.php | 1 - .../components/ApiitemComponent.php | 3 +- .../components/ApiitemrevisionComponent.php | 2 -- .../components/ApisystemComponent.php | 2 -- .../components/ApiuserComponent.php | 1 - .../components/DownloadBitstreamComponent.php | 1 - .../components/FilterComponent.php | 2 +- core/controllers/components/JsonComponent.php | 1 - .../components/MIDAS2MigrationComponent.php | 2 -- .../components/NotifyErrorComponent.php | 4 +-- .../components/SortdaoComponent.php | 4 +-- .../components/UpgradeComponent.php | 1 - .../components/UploadComponent.php | 3 +- .../components/UtilityComponent.php | 33 +++++++++++++------ core/controllers/forms/AssetstoreForm.php | 1 - core/controllers/forms/ImportForm.php | 3 -- core/controllers/forms/InstallForm.php | 1 - core/controllers/forms/UploadForm.php | 1 - core/controllers/forms/UserForm.php | 3 -- core/database/upgrade/3.0.10.php | 5 ++- core/database/upgrade/3.0.11.php | 1 - core/database/upgrade/3.0.13.php | 5 ++- core/database/upgrade/3.0.14.php | 1 - core/database/upgrade/3.0.16.php | 1 - core/database/upgrade/3.0.6.php | 1 - core/database/upgrade/3.0.7.php | 1 - core/database/upgrade/3.0.9.php | 1 - core/database/upgrade/3.1.0.php | 1 - core/database/upgrade/3.1.1.php | 1 - core/database/upgrade/3.1.3.php | 1 - core/database/upgrade/3.1.4.php | 1 - core/database/upgrade/3.2.13.php | 1 - core/layouts/layout.phtml | 3 +- core/models/AppDao.php | 1 - core/models/GlobalDao.php | 1 - core/models/MIDASDatabaseMongo.php | 2 -- core/models/MIDASDatabasePdo.php | 6 ---- core/models/MIDASModel.php | 21 +++++------- core/models/MIDASModuleInstallScript.php | 1 - core/models/MIDASUpgrade.php | 9 +---- core/models/base/AssetstoreModelBase.php | 2 -- core/models/base/CommunityModelBase.php | 3 -- core/models/base/FeedModelBase.php | 14 ++++---- core/models/base/FeedpolicygroupModelBase.php | 2 -- core/models/base/GroupModelBase.php | 1 - core/models/base/ItemModelBase.php | 1 - core/models/base/ItemRevisionModelBase.php | 1 - core/models/base/ItempolicygroupModelBase.php | 1 - core/models/dao/CommunityDao.php | 1 - core/models/dao/FolderDao.php | 1 - core/models/pdo/CommunityInvitationModel.php | 1 - core/models/pdo/CommunityModel.php | 1 - core/models/pdo/FeedModel.php | 5 --- core/models/pdo/FeedpolicygroupModel.php | 1 - core/models/pdo/FeedpolicyuserModel.php | 1 - core/models/pdo/FolderModel.php | 2 -- core/models/pdo/GroupModel.php | 1 - core/models/pdo/ItemModel.php | 1 - core/models/pdo/ItemRevisionModel.php | 1 - core/models/pdo/ItempolicygroupModel.php | 1 - core/models/pdo/ItempolicyuserModel.php | 2 +- core/models/pdo/MetadataModel.php | 3 -- core/models/pdo/SettingModel.php | 2 +- core/models/pdo/UserModel.php | 4 --- core/models/pdo/UserapiModel.php | 3 -- .../controllers/AssetstoreControllerTest.php | 5 --- core/tests/controllers/FeedControllerTest.php | 1 - .../controllers/ImportControllerTest.php | 1 - .../controllers/LicenseControllerTest.php | 1 - core/tests/controllers/UserControllerTest.php | 1 - .../controllers/api/RestCallMethodsTest.php | 1 - .../api/RestCallUserMethodsTest.php | 2 -- .../controllers/api/RestKeyControllerTest.php | 1 - .../components/ExportComponentTest.php | 1 - .../components/UtilityComponentTest.php | 1 - .../tests/models/base/AssetstoreModelTest.php | 5 --- core/tests/models/base/CommunityModelTest.php | 4 --- core/tests/models/base/MetadataModelTest.php | 2 -- core/tests/models/dao/FeedDaoTest.php | 22 ++++++------- core/views/admin/index.phtml | 1 - core/views/admin/showlog.phtml | 1 - core/views/admin/upgrade.phtml | 2 +- core/views/apikey/usertab.phtml | 17 ++++++---- core/views/browse/index.phtml | 2 -- core/views/community/index.phtml | 2 +- core/views/community/manage.phtml | 13 ++++---- core/views/community/view.phtml | 11 +++---- core/views/element/feed.phtml | 14 ++++---- core/views/element/listfiles.phtml | 13 +++----- core/views/folder/view.phtml | 9 +++-- core/views/import/index.phtml | 1 - core/views/install/step2.phtml | 5 ++- core/views/install/step3.phtml | 1 - core/views/item/editmetadata.phtml | 9 ++--- core/views/item/view.phtml | 6 ++-- core/views/scripts/error/error.phtml | 3 +- core/views/upload/simpleupload.phtml | 1 - core/views/user/index.phtml | 1 - core/views/user/manage.phtml | 12 +++---- core/views/user/userpage.phtml | 7 ++-- index.php | 7 ++-- modules/GlobalModule.php | 3 +- modules/api/Notification.php | 1 - modules/api/controllers/ConfigController.php | 1 - .../controllers/components/ApiComponent.php | 5 +-- modules/api/controllers/forms/ConfigForm.php | 1 - .../ApiCallCommunityMethodsTest.php | 2 -- .../controllers/ApiCallFolderMethodsTest.php | 4 --- .../controllers/ApiCallGroupMethodsTest.php | 3 -- .../controllers/ApiCallItemMethodsTest.php | 4 --- .../tests/controllers/ApiCallMethodsTest.php | 1 - .../controllers/ApiCallUserMethodsTest.php | 2 -- .../controllers/ApiKeyControllerTest.php | 1 - modules/api/views/config/index.phtml | 2 -- modules/api/views/index/index.phtml | 3 +- modules/api/views/index/user.phtml | 26 +++++++++------ modules/batchmake/AppController.php | 3 +- modules/batchmake/Notification.php | 5 +-- modules/batchmake/constant/module.php | 26 +++++---------- .../controllers/ConfigController.php | 16 --------- .../batchmake/controllers/IndexController.php | 4 --- .../controllers/components/ApiComponent.php | 8 ----- .../components/ExecuteComponent.php | 10 ------ .../components/KWBatchmakeComponent.php | 19 ----------- .../controllers/forms/ConfigForm.php | 2 -- modules/batchmake/database/upgrade/0.2.0.php | 1 - modules/batchmake/models/AppDao.php | 1 - .../models/base/ItemmetricModelBase.php | 1 - .../batchmake/models/base/TaskModelBase.php | 1 - .../controllers/BatchmakeControllerTest.php | 2 -- .../tests/controllers/IndexControllerTest.php | 1 - .../components/ExecuteComponentTest.php | 13 -------- .../components/KWBatchmakeComponentTest.php | 14 -------- .../tests/models/base/ItemmetricModelTest.php | 3 -- .../tests/models/base/TaskModelTest.php | 4 --- modules/batchmake/views/config/index.phtml | 2 -- .../cleanup/controllers/ConfigController.php | 1 - .../cleanup/controllers/IndexController.php | 1 - .../cleanup/controllers/forms/ConfigForm.php | 2 -- .../comments/controllers/ConfigController.php | 1 - .../comments/controllers/IndexController.php | 1 - modules/communityagreement/Notification.php | 1 - .../controllers/ConfigController.php | 1 - .../controllers/forms/ConfigForm.php | 1 - .../models/base/AgreementModelBase.php | 1 - .../tests/models/base/AgreementModelTest.php | 1 - .../controllers/ConfigController.php | 3 +- .../controllers/UploadController.php | 1 - modules/dicomextractor/Notification.php | 1 - .../controllers/ConfigController.php | 5 ++- .../controllers/api/ItemController.php | 1 - .../controllers/components/ApiComponent.php | 2 +- .../components/ExtractorComponent.php | 3 +- .../controllers/forms/ConfigForm.php | 1 - modules/dicomserver/Notification.php | 1 - .../controllers/ConfigController.php | 3 +- .../controllers/api/ServerController.php | 1 - .../controllers/components/ApiComponent.php | 2 +- .../components/ServerComponent.php | 4 +-- .../controllers/forms/ConfigForm.php | 2 -- modules/example/AppController.php | 1 - .../example/controllers/IndexController.php | 5 +-- .../example/controllers/SampleController.php | 2 -- .../example/models/base/WalletModelBase.php | 2 -- modules/example/models/pdo/WalletModel.php | 1 - modules/landingpage/Notification.php | 2 -- .../controllers/IndexCoreController.php | 1 - .../controllers/forms/ConfigForm.php | 1 - modules/ldap/controllers/ConfigController.php | 1 - modules/ldap/views/config/index.phtml | 3 -- .../controllers/ConfigController.php | 4 +-- .../components/ExtractorComponent.php | 1 - .../controllers/forms/ConfigForm.php | 1 - .../views/config/index.phtml | 2 -- modules/mfa/controllers/LoginController.php | 1 - .../controllers/components/ApiComponent.php | 1 - .../controllers/components/OtpComponent.php | 1 - modules/mfa/views/login/dialog.phtml | 1 - modules/oai/Notification.php | 1 - modules/oai/controllers/ConfigController.php | 2 -- modules/oai/controllers/IndexController.php | 6 ++-- modules/oai/controllers/forms/ConfigForm.php | 1 - .../tests/controllers/IndexControllerTest.php | 1 - modules/oai/views/config/index.phtml | 2 -- modules/oai/views/index/user.phtml | 28 +++++++++------- modules/pvw/AppController.php | 3 +- modules/pvw/controllers/ConfigController.php | 1 - .../pvw/controllers/ParaviewController.php | 1 - modules/pvw/models/AppDao.php | 1 - .../ratings/controllers/ConfigController.php | 1 - .../ratings/controllers/IndexController.php | 1 - .../ratings/controllers/RatingController.php | 1 - .../ratings/controllers/forms/ConfigForm.php | 1 - modules/readmes/AppController.php | 2 -- modules/readmes/Notification.php | 1 - .../controllers/api/CommunityController.php | 1 - .../controllers/api/FolderController.php | 1 - modules/remoteprocessing/Notification.php | 3 +- .../controllers/ExecutableController.php | 2 -- .../controllers/IndexController.php | 2 -- .../controllers/JobController.php | 12 +++---- .../controllers/components/ApiComponent.php | 2 -- .../components/ExecutableComponent.php | 1 - .../controllers/components/JobComponent.php | 1 - .../controllers/forms/ConfigForm.php | 1 - modules/remoteprocessing/models/AppDao.php | 1 - .../models/base/JobModelBase.php | 2 -- .../remoteprocessing/models/dao/JobDao.php | 1 - modules/remoteprocessing/tests/ApiTest.php | 1 - .../controllers/ConfigControllerTest.php | 2 +- .../views/executable/define.phtml | 3 -- .../views/job/getinitexecutable.phtml | 3 -- .../remoteprocessing/views/job/manage.phtml | 3 -- modules/remoteprocessing/views/job/view.phtml | 9 +++-- .../controllers/ConfigController.php | 1 - .../scheduler/controllers/RunController.php | 2 -- .../controllers/WorkflowController.php | 28 +++++++--------- .../controllers/forms/ConfigForm.php | 1 - modules/scheduler/database/upgrade/1.0.1.php | 2 -- .../scheduler/layouts/layout-disable.phtml | 4 +-- .../scheduler/models/base/JobLogModelBase.php | 1 - .../scheduler/models/base/JobModelBase.php | 2 +- modules/scheduler/models/dao/JobDao.php | 6 ++-- modules/scheduler/models/dao/JobLogDao.php | 6 ++-- modules/scheduler/views/config/index.phtml | 7 ++-- modules/sizequota/Notification.php | 1 - .../controllers/ConfigController.php | 1 - .../controllers/api/QuotaController.php | 1 - .../controllers/components/ApiComponent.php | 2 +- .../controllers/forms/ConfigForm.php | 1 - modules/sizequota/models/AppDao.php | 1 - modules/sizequota/views/config/index.phtml | 1 - modules/solr/Notification.php | 1 - .../solr/controllers/AdvancedController.php | 1 - modules/solr/controllers/ConfigController.php | 1 - .../solr/controllers/api/SearchController.php | 1 - .../controllers/components/ApiComponent.php | 2 +- modules/solr/controllers/forms/ConfigForm.php | 1 - modules/solr/models/AppDao.php | 1 - modules/solr/views/config/index.phtml | 1 - .../controllers/ConfigController.php | 1 - .../controllers/IndexController.php | 1 - .../statistics/controllers/ItemController.php | 1 - .../components/ReportComponent.php | 3 +- .../controllers/forms/ConfigForm.php | 1 - modules/statistics/views/config/index.phtml | 1 - modules/statistics/views/index/index.phtml | 1 - modules/thumbnailcreator/AppController.php | 1 - modules/thumbnailcreator/constant/module.php | 4 +-- .../controllers/ConfigController.php | 1 - .../controllers/api/ItemController.php | 1 - .../controllers/components/ApiComponent.php | 6 ++-- .../components/ApiitemComponent.php | 2 -- .../controllers/forms/ConfigForm.php | 1 - .../controllers/ProducerController.php | 1 - modules/validation/AppController.php | 1 - modules/validation/Notification.php | 3 +- .../controllers/IndexController.php | 2 -- .../controllers/components/ApiComponent.php | 1 - .../ApiComponentControllerTest.php | 2 -- .../tests/controllers/IndexControllerTest.php | 1 - .../tests/models/base/DashboardModelTest.php | 1 - modules/validation/views/index/index.phtml | 9 +++-- modules/visualize/AppController.php | 3 +- .../controllers/ConfigController.php | 1 - .../controllers/components/MainComponent.php | 3 -- modules/visualize/models/AppDao.php | 1 - modules/visualize/models/AppModel.php | 1 - .../tests/controllers/IndexControllerTest.php | 1 - modules/visualize/views/image/index.phtml | 3 +- modules/visualize/views/media/index.phtml | 1 - modules/visualize/views/wrapper/index.phtml | 2 +- notification/GlobalNotification.php | 2 +- 297 files changed, 241 insertions(+), 702 deletions(-) diff --git a/core/ApiController.php b/core/ApiController.php index b3af31ab0..a1232d0b2 100644 --- a/core/ApiController.php +++ b/core/ApiController.php @@ -215,5 +215,4 @@ public function optionsAction() { $this->_response->setHeader('Allow', 'OPTIONS'); } - } // end class diff --git a/core/AppComponent.php b/core/AppComponent.php index 5c5ca51c0..3a53e16f8 100644 --- a/core/AppComponent.php +++ b/core/AppComponent.php @@ -24,6 +24,4 @@ */ class AppComponent extends MIDAS_GlobalComponent { - - } diff --git a/core/AppForm.php b/core/AppForm.php index 2c02ad462..bc2f01936 100644 --- a/core/AppForm.php +++ b/core/AppForm.php @@ -28,9 +28,8 @@ public function __construct() $this->webroot = $fc->getBaseUrl(); }//end construct - /** translation */ - protected function t($text) + protected function t($text) { Zend_Loader::loadClass("InternationalizationComponent", BASE_PATH.'/core/controllers/components'); return InternationalizationComponent::translate($text); diff --git a/core/Bootstrap.php b/core/Bootstrap.php index edfd4fba7..3e735c288 100644 --- a/core/Bootstrap.php +++ b/core/Bootstrap.php @@ -35,7 +35,6 @@ protected function _initDoctype() $view->doctype('XHTML1_STRICT'); }//end _initDoctype - /** * \fn protected _initConfig() * \brief set the configuration and save it in the registry diff --git a/core/constant/notification.php b/core/constant/notification.php index a130f45e7..293546803 100644 --- a/core/constant/notification.php +++ b/core/constant/notification.php @@ -18,6 +18,6 @@ limitations under the License. =========================================================================*/ -define("MIDAS_EVENT_PRIORITY_NORMAL",1); -define("MIDAS_EVENT_PRIORITY_LOW",0); -define("MIDAS_EVENT_PRIORITY_HIGH",2); +define("MIDAS_EVENT_PRIORITY_NORMAL", 1); +define("MIDAS_EVENT_PRIORITY_LOW", 0); +define("MIDAS_EVENT_PRIORITY_HIGH", 2); diff --git a/core/controllers/AdminController.php b/core/controllers/AdminController.php index 847339dfa..58a5507ea 100644 --- a/core/controllers/AdminController.php +++ b/core/controllers/AdminController.php @@ -397,8 +397,6 @@ function showlogAction() $offset = 0; } - - $results = $this->Errorlog->getLog($start, $end, $module, $priority, $limit, $offset, $priorityOperator); $this->view->jsonContent = array(); $this->view->jsonContent['currentFilter'] = array('start' => $start, @@ -646,7 +644,6 @@ function serversidefilechooserAction() // No views } // end function serversidefilechooserAction - /** * \fn * \brief diff --git a/core/controllers/ApidocsController.php b/core/controllers/ApidocsController.php index 09af568b7..025aabb4d 100644 --- a/core/controllers/ApidocsController.php +++ b/core/controllers/ApidocsController.php @@ -32,7 +32,6 @@ public function init() $this->disableView(); } - /** Index resource */ function indexAction() { diff --git a/core/controllers/AssetstoreController.php b/core/controllers/AssetstoreController.php index c331b9252..57f839818 100644 --- a/core/controllers/AssetstoreController.php +++ b/core/controllers/AssetstoreController.php @@ -44,10 +44,8 @@ function init() */ function indexAction() { - }// end indexAction - /** change default assetstore*/ function defaultassetstoreAction() { @@ -69,7 +67,6 @@ function defaultassetstoreAction() echo JsonComponent::encode(array(false, $this->t('Error'))); }//defaultassetstoreAction - /** delete an assetstore */ function deleteAction() { diff --git a/core/controllers/BrowseController.php b/core/controllers/BrowseController.php index bd4dbfe50..9a1c7196e 100644 --- a/core/controllers/BrowseController.php +++ b/core/controllers/BrowseController.php @@ -285,7 +285,6 @@ public function selectfolderAction() $communities = $this->User->getUserCommunities($this->userSession->Dao); - if(isset($policy) && $policy == 'read') { $policy = MIDAS_POLICY_READ; diff --git a/core/controllers/CommunityController.php b/core/controllers/CommunityController.php index 4c16e40f5..11e0b35db 100644 --- a/core/controllers/CommunityController.php +++ b/core/controllers/CommunityController.php @@ -253,7 +253,6 @@ function manageAction() $this->view->customTabs = Zend_Registry::get('notifier')->callback('CALLBACK_CORE_GET_COMMUNITY_MANAGE_TABS', array('community' => $communityDao)); }//end manageAction - /** Index */ function indexAction() { diff --git a/core/controllers/FolderController.php b/core/controllers/FolderController.php index 1745ccb3a..09a5c6a94 100644 --- a/core/controllers/FolderController.php +++ b/core/controllers/FolderController.php @@ -227,7 +227,6 @@ public function viewAction() $this->view->json['folder'] = $folder; }// end View Action - /** * Prompt the user to confirm deletion of a folder * @param folderId The id of the folder to be deleted @@ -419,5 +418,4 @@ public function createfolderAction() } } }// end createfolderAction - } // end class diff --git a/core/controllers/ImportController.php b/core/controllers/ImportController.php index 0ec80390e..c9430f1fc 100644 --- a/core/controllers/ImportController.php +++ b/core/controllers/ImportController.php @@ -98,7 +98,6 @@ private function _recursiveCountFiles($path) return $initialcount; } // end function _recursiveCountFiles - /** Check if the import should be stopped */ private function _checkStopImport() { @@ -159,7 +158,6 @@ private function _recursiveParseDirectory($path, $currentdir) continue; } - // Get the files in the directory and skip the folder if it does not // contain any files and we aren't set to import empty directories. The // count($files) <= 2 is there to account for our our friends . and .. @@ -369,7 +367,6 @@ function importAction() return false; } // end import action - /** * This function pulls the progress for the temporary importprogress_ file. */ @@ -418,5 +415,4 @@ function stopAction() } return false; } // end stopAction - } // end class diff --git a/core/controllers/IndexController.php b/core/controllers/IndexController.php index 403b2c641..9399055ac 100644 --- a/core/controllers/IndexController.php +++ b/core/controllers/IndexController.php @@ -57,5 +57,4 @@ function nobrowserAction() { $this->disableLayout(); } // end method indexAction - } // end class diff --git a/core/controllers/InstallController.php b/core/controllers/InstallController.php index 355f07efa..bdb35355c 100644 --- a/core/controllers/InstallController.php +++ b/core/controllers/InstallController.php @@ -64,7 +64,6 @@ function indexAction() } } // end method indexAction - /** * @method step2Action() */ @@ -301,7 +300,6 @@ function step3Action() } } // end method step2Action - /** ajax function which tests connectivity to a db */ public function testconnexionAction() { diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php index de9237f2e..00cef44e2 100644 --- a/core/controllers/ItemController.php +++ b/core/controllers/ItemController.php @@ -441,8 +441,6 @@ function deleteAction() } }//end delete - - /** * Delete an itemrevision * @@ -528,7 +526,6 @@ function editbitstreamAction() $formArray['name']->setValue($bitstreamDao->getName()); $formArray['mimetype']->setValue($bitstreamDao->getMimetype()); $this->view->bitstreamform = $formArray; - }//end editbitstreamAction /** @@ -636,7 +633,6 @@ public function checksharedAction() echo JsonComponent::encode($ifShared); } // end checkshared - /** * ajax function which checks if a metadata value is defined for a given * item, itemrevision, metadatatype, element, and qualifier. diff --git a/core/controllers/SearchController.php b/core/controllers/SearchController.php index d862d974e..2e4b450f6 100644 --- a/core/controllers/SearchController.php +++ b/core/controllers/SearchController.php @@ -40,7 +40,6 @@ function init() } } // end init() - /** search live Action */ public function indexAction() { @@ -76,8 +75,6 @@ public function indexAction() } }//end indexAction - - /** search live Action */ public function liveAction() { @@ -168,7 +165,6 @@ public function liveAction() $GroupsDao = array(); } - // Compute how many of each we should display $nitems = count($ItemsDao); $nfolders = count($FoldersDao); diff --git a/core/controllers/ShareController.php b/core/controllers/ShareController.php index 9281897c2..6a6a1a3c0 100644 --- a/core/controllers/ShareController.php +++ b/core/controllers/ShareController.php @@ -29,10 +29,8 @@ class ShareController extends AppController /** Init Controller */ function init() { - } // end init() - /** ajax dialog for managing permissions */ function dialogAction() { diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php index 745b5240e..f737604b4 100644 --- a/core/controllers/UploadController.php +++ b/core/controllers/UploadController.php @@ -71,7 +71,6 @@ private function _is_https() return array_key_exists('HTTPS', $_SERVER) && $_SERVER["HTTPS"] === 'on'; } - /** simple upload*/ public function simpleuploadAction() { @@ -277,7 +276,6 @@ public function revisionAction() 'CALLBACK_CORE_GET_REVISIONUPLOAD_EXTRA_HTML', array('item' => $item)); }//end revisionAction - /** save a link*/ public function savelinkAction() { @@ -406,7 +404,6 @@ function gethttpuploaduniqueidentifierAction() } } //end get_http_upload_unique_identifier - /** * Process a java upload * @param uploadUniqueIdentifier The upload token (see gethttpuploaduniqueidentifierAction) diff --git a/core/controllers/UserController.php b/core/controllers/UserController.php index 3295c3e28..9e9713b68 100644 --- a/core/controllers/UserController.php +++ b/core/controllers/UserController.php @@ -546,7 +546,6 @@ function loginAction() } } // end method login - /** Term of service */ public function termofserviceAction() { @@ -556,7 +555,6 @@ public function termofserviceAction() } } // end term of service - /** * Test whether a given user already exists or not. * @param entry The email/login to test. diff --git a/core/controllers/api/IndexController.php b/core/controllers/api/IndexController.php index 202e140fa..ca7579d26 100644 --- a/core/controllers/api/IndexController.php +++ b/core/controllers/api/IndexController.php @@ -29,7 +29,6 @@ public function preDispatch() $this->view->setScriptPath(BASE_PATH."/core/views/rest"); } - /** Index function */ function indexAction() { diff --git a/core/controllers/components/ApibitstreamComponent.php b/core/controllers/components/ApibitstreamComponent.php index 668da9440..5a8265888 100644 --- a/core/controllers/components/ApibitstreamComponent.php +++ b/core/controllers/components/ApibitstreamComponent.php @@ -92,7 +92,6 @@ function bitstreamGetWrapper($args) return $out; } - /** * Change the properties of a bitstream. Requires write access to the containing item. * @path /bitstream/{id} @@ -308,5 +307,4 @@ function bitstreamDownloadByChecksum($args) { $this->bitstreamDownload($args); } - } // end class diff --git a/core/controllers/components/ApidocsComponent.php b/core/controllers/components/ApidocsComponent.php index ae4cdeb06..c134435bd 100644 --- a/core/controllers/components/ApidocsComponent.php +++ b/core/controllers/components/ApidocsComponent.php @@ -233,5 +233,4 @@ public function getResourceApiDocs($resource, $module = '') } return $swaggerDoc; } - } // end class diff --git a/core/controllers/components/ApifolderComponent.php b/core/controllers/components/ApifolderComponent.php index 2e060d90f..8791c0af3 100644 --- a/core/controllers/components/ApifolderComponent.php +++ b/core/controllers/components/ApifolderComponent.php @@ -265,8 +265,7 @@ public function folderListPermissions($args) throw new Exception("Admin privileges required on the folder to list permissions.", MIDAS_INVALID_POLICY); } - return $apihelperComponent->listResourcePermissions($folderpolicygroupModel->computePolicyStatus($folder), $folder->getFolderpolicyuser(), $folder->getFolderpolicygroup()); - + return $apihelperComponent->listResourcePermissions($folderpolicygroupModel->computePolicyStatus($folder), $folder->getFolderpolicyuser(), $folder->getFolderpolicygroup()); } /** diff --git a/core/controllers/components/ApigroupComponent.php b/core/controllers/components/ApigroupComponent.php index 3ad4ecc04..9e555db26 100644 --- a/core/controllers/components/ApigroupComponent.php +++ b/core/controllers/components/ApigroupComponent.php @@ -223,5 +223,4 @@ function groupRemove($args) $groupModel->delete($group); return array('success' => 'true'); } - } // end class diff --git a/core/controllers/components/ApihelperComponent.php b/core/controllers/components/ApihelperComponent.php index 62fcc35df..189af2b78 100644 --- a/core/controllers/components/ApihelperComponent.php +++ b/core/controllers/components/ApihelperComponent.php @@ -485,5 +485,4 @@ public function isCallerAdmin($args) return true; } } - } // end class diff --git a/core/controllers/components/ApiitemComponent.php b/core/controllers/components/ApiitemComponent.php index 70ee7a826..07e6138d0 100644 --- a/core/controllers/components/ApiitemComponent.php +++ b/core/controllers/components/ApiitemComponent.php @@ -442,7 +442,7 @@ public function itemListPermissions($args) throw new Exception("Admin privileges required on the item to list permissions.", MIDAS_INVALID_POLICY); } - return $apihelperComponent->listResourcePermissions($itempolicygroupModel->computePolicyStatus($item), $item->getItempolicyuser(), $item->getItempolicygroup()); + return $apihelperComponent->listResourcePermissions($itempolicygroupModel->computePolicyStatus($item), $item->getItempolicyuser(), $item->getItempolicygroup()); } /** @@ -949,5 +949,4 @@ function itemDownload($args) $r = Zend_Controller_Action_HelperBroker::getStaticHelper('redirector'); $r->gotoUrl($redirUrl); } - } // end class diff --git a/core/controllers/components/ApiitemrevisionComponent.php b/core/controllers/components/ApiitemrevisionComponent.php index 812cbd6bc..f45f67342 100644 --- a/core/controllers/components/ApiitemrevisionComponent.php +++ b/core/controllers/components/ApiitemrevisionComponent.php @@ -69,7 +69,5 @@ function itemrevisionGet($args) $itemRevision->getBitstreams()); return $out; - } - } // end of class diff --git a/core/controllers/components/ApisystemComponent.php b/core/controllers/components/ApisystemComponent.php index 07ca71068..bd575c301 100644 --- a/core/controllers/components/ApisystemComponent.php +++ b/core/controllers/components/ApisystemComponent.php @@ -66,7 +66,6 @@ public function resourcesList($args) $data[$resource] = $apiroot . $resource; } return array('resources' => $data); - } /** @@ -640,5 +639,4 @@ function adminDatabaseCleanup($args) MidasLoader::loadModel($model)->removeOrphans(); } } - } // end class diff --git a/core/controllers/components/ApiuserComponent.php b/core/controllers/components/ApiuserComponent.php index a7bf9f6aa..c82faf6ea 100644 --- a/core/controllers/components/ApiuserComponent.php +++ b/core/controllers/components/ApiuserComponent.php @@ -136,5 +136,4 @@ function userSearch($args) throw new Exception('Please provide a user email or both first and last name', MIDAS_INVALID_PARAMETER); } } - } // end class diff --git a/core/controllers/components/DownloadBitstreamComponent.php b/core/controllers/components/DownloadBitstreamComponent.php index 62f8ab866..bcf3a7e9c 100644 --- a/core/controllers/components/DownloadBitstreamComponent.php +++ b/core/controllers/components/DownloadBitstreamComponent.php @@ -42,7 +42,6 @@ function download($bitstream, $offset = 0, $incrementDownload = false) apache_setenv('no-gzip', '1'); } - $mimetype = $bitstream->getMimetype(); $path = $bitstream->getAssetstore()->getPath().'/'.$bitstream->getPath(); $name = $bitstream->getName(); diff --git a/core/controllers/components/FilterComponent.php b/core/controllers/components/FilterComponent.php index c8bb28914..a64f02667 100644 --- a/core/controllers/components/FilterComponent.php +++ b/core/controllers/components/FilterComponent.php @@ -27,7 +27,7 @@ public function getFilter($filter) Zend_Loader::loadClass($filter, BASE_PATH.'/core/controllers/components/filters'); if(!class_exists($filter)) { - throw new Zend_Exception("Unable to load filter: ".$filter ); + throw new Zend_Exception("Unable to load filter: ".$filter); } return new $filter(); } diff --git a/core/controllers/components/JsonComponent.php b/core/controllers/components/JsonComponent.php index 5b62762eb..7a4681d5c 100644 --- a/core/controllers/components/JsonComponent.php +++ b/core/controllers/components/JsonComponent.php @@ -72,7 +72,6 @@ static public function decode($encodedValue, $objectDecodeType = true) return $tab; } - /** * Encode the mixed $valueToEncode into the JSON format * diff --git a/core/controllers/components/MIDAS2MigrationComponent.php b/core/controllers/components/MIDAS2MigrationComponent.php index a6fd4d7ab..8b487754d 100644 --- a/core/controllers/components/MIDAS2MigrationComponent.php +++ b/core/controllers/components/MIDAS2MigrationComponent.php @@ -374,7 +374,6 @@ private function _createFolderForCollection($communityId, $parentFolderid) } } // end _createFolderForCollection() - /** Recursive function to create the communities */ private function _createFolderForCommunity($communityidMIDAS2, $parentFolderid) { @@ -469,7 +468,6 @@ function migrate($userid) { $this->userId = $userid; - // Check that we are in development mode if(Zend_Registry::get('configGlobal')->environment != 'development') { diff --git a/core/controllers/components/NotifyErrorComponent.php b/core/controllers/components/NotifyErrorComponent.php index ef6a11d6e..003f32bc8 100644 --- a/core/controllers/components/NotifyErrorComponent.php +++ b/core/controllers/components/NotifyErrorComponent.php @@ -19,7 +19,7 @@ =========================================================================*/ /** Error management*/ -class NotifyErrorComponent extends AppComponent +class NotifyErrorComponent extends AppComponent { protected $_environment; protected $_mailer; @@ -30,7 +30,6 @@ class NotifyErrorComponent extends AppComponent /** Constructor */ public function __construct() { - } /** Init*/ @@ -318,5 +317,4 @@ public function getShortErrorMessage() } return $message; } - } diff --git a/core/controllers/components/SortdaoComponent.php b/core/controllers/components/SortdaoComponent.php index 740c28a2f..587d28ba1 100644 --- a/core/controllers/components/SortdaoComponent.php +++ b/core/controllers/components/SortdaoComponent.php @@ -33,8 +33,8 @@ public function sortByDate($a, $b) throw new Zend_Exception("Error in field required by sortByDate."); } - $a_t = strtotime($a->$field ); - $b_t = strtotime($b->$field ); + $a_t = strtotime($a->$field); + $b_t = strtotime($b->$field); if($a_t == $b_t) { diff --git a/core/controllers/components/UpgradeComponent.php b/core/controllers/components/UpgradeComponent.php index 9730f1c4d..065e3fba4 100644 --- a/core/controllers/components/UpgradeComponent.php +++ b/core/controllers/components/UpgradeComponent.php @@ -62,7 +62,6 @@ public function initUpgrade($module, $db, $dbtype) $this->init = true; }//end init - /** get Newest version */ public function getNewestVersion($text = false) { diff --git a/core/controllers/components/UploadComponent.php b/core/controllers/components/UploadComponent.php index c217c52a1..a821d8dfb 100644 --- a/core/controllers/components/UploadComponent.php +++ b/core/controllers/components/UploadComponent.php @@ -108,7 +108,7 @@ function uploadBitstream($bitstreamdao, $assetstoredao, $copy = false) case MIDAS_ASSETSTORE_AMAZON: throw new Zend_Exception("Amazon support is not implemented yet."); break; - default : + default: break; } return true; @@ -185,7 +185,6 @@ public function createLinkItem($userDao, $name, $url, $parent = null, $sizebytes return $item; } - /** * Save an uploaded file in the database as an item with a new revision * @param userDao The user who is uploading the item diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php index f13ec08ef..f947837bd 100644 --- a/core/controllers/components/UtilityComponent.php +++ b/core/controllers/components/UtilityComponent.php @@ -156,14 +156,29 @@ private function _initModulesConfig($dir) { switch($fileDB) { - case 'mysql' : $config->db->PDO_MYSQL = true; break; - case 'pgsql' : $config->db->PDO_PGSQL = true;break; - case 'ibm' : $config->db->PDO_IBM = true;break; - case 'oci' : $config->db->PDO_OCI = true;break; - case 'sqlite' : $config->db->PDO_SQLITE = true;break; - case 'cassandra' : $config->db->CASSANDRA = true;break; - case 'mongo' : $config->db->MONGO = true;break; - default : break; + case 'mysql': + $config->db->PDO_MYSQL = true; + break; + case 'pgsql': + $config->db->PDO_PGSQL = true; + break; + case 'ibm': + $config->db->PDO_IBM = true; + break; + case 'oci': + $config->db->PDO_OCI = true; + break; + case 'sqlite': + $config->db->PDO_SQLITE = true; + break; + case 'cassandra': + $config->db->CASSANDRA = true; + break; + case 'mongo': + $config->db->MONGO = true; + break; + default: + break; } } } @@ -244,7 +259,6 @@ static public function md5file($filename) return md5_file($filename); } - /** * Check if the php function/extension are available * @@ -437,7 +451,6 @@ public static function getCacheDirectory() return self::getTempDirectory('cache'); } - /** install a module */ public function installModule($moduleName) { diff --git a/core/controllers/forms/AssetstoreForm.php b/core/controllers/forms/AssetstoreForm.php index 61624fbae..bae86d656 100644 --- a/core/controllers/forms/AssetstoreForm.php +++ b/core/controllers/forms/AssetstoreForm.php @@ -37,7 +37,6 @@ public function createAssetstoreForm() $inputDirectory->setRequired(true); $form->addElement($inputDirectory); - // Input directory $basedirectory = new Zend_Form_Element_Text('basedirectory', array('label' => $this->t('Pick a base directory'), 'id' => 'assetstoreinputdirectory')); diff --git a/core/controllers/forms/ImportForm.php b/core/controllers/forms/ImportForm.php index 664066924..c69de7bf0 100644 --- a/core/controllers/forms/ImportForm.php +++ b/core/controllers/forms/ImportForm.php @@ -110,7 +110,6 @@ public function createImportForm($assetstores) $importFolder->setRequired(true); $form->addElement($importFolder); - // Hidden filed to pass the translation of the stop import $stopimport = new Zend_Form_Element_Hidden('importstop', array('value' => $this->t('Stop import'))); $stopimport->setDecorators(array( @@ -125,8 +124,6 @@ public function createImportForm($assetstores) $submit = new Zend_Form_Element_Button('importsubmit', $this->t('Import data')); $form->addElement($submit); - - return $form; } } // end class diff --git a/core/controllers/forms/InstallForm.php b/core/controllers/forms/InstallForm.php index ef633c51e..4af069bf4 100644 --- a/core/controllers/forms/InstallForm.php +++ b/core/controllers/forms/InstallForm.php @@ -130,7 +130,6 @@ public function createConfigForm() $smartoptimizer = new Zend_Form_Element_Checkbox("smartoptimizer"); - $submit = new Zend_Form_Element_Submit('submit'); $submit ->setLabel('Create configuration'); diff --git a/core/controllers/forms/UploadForm.php b/core/controllers/forms/UploadForm.php index 5a509e30b..d0880952b 100644 --- a/core/controllers/forms/UploadForm.php +++ b/core/controllers/forms/UploadForm.php @@ -39,7 +39,6 @@ public function createUploadLinkForm() ->addValidator($validator) ->addValidator('NotEmpty', true); - $submit = new Zend_Form_Element_Submit('submit'); $submit ->setLabel($this->t("Save Link")) ->setAttrib('class', 'globalButton'); diff --git a/core/controllers/forms/UserForm.php b/core/controllers/forms/UserForm.php index 0fe000459..f093827f2 100644 --- a/core/controllers/forms/UserForm.php +++ b/core/controllers/forms/UserForm.php @@ -64,14 +64,12 @@ public function createRegisterForm() ->setAttrib('id', 'registerForm') ->setAttrib('class', 'genericForm'); - $email = new Zend_Form_Element_Text('email'); $email->setRequired(true) ->addValidator('NotEmpty', true) ->setAttrib('maxLength', 255) ->addValidator('EmailAddress'); - $firstname = new Zend_Form_Element_Text('firstname'); $firstname ->setRequired(true) @@ -105,7 +103,6 @@ public function createRegisterForm() return $form; } - /** acount form */ public function createAccountForm($defaultValue = array()) { diff --git a/core/database/upgrade/3.0.10.php b/core/database/upgrade/3.0.10.php index 1de329a1a..39908134c 100644 --- a/core/database/upgrade/3.0.10.php +++ b/core/database/upgrade/3.0.10.php @@ -27,14 +27,13 @@ public function preUpgrade() public function mysql() { $this->db->query("DROP TABLE metadatatype"); - $this->renameTableField('metadata','metadatatype_id','metadatatype','int(11)','integer','0'); + $this->renameTableField('metadata', 'metadatatype_id', 'metadatatype', 'int(11)', 'integer', '0'); } - public function pgsql() { $this->db->query("DROP TABLE metadatatype"); - $this->renameTableField('metadata','metadatatype_id','metadatatype','int(11)','integer','0'); + $this->renameTableField('metadata', 'metadatatype_id', 'metadatatype', 'int(11)', 'integer', '0'); } public function postUpgrade() diff --git a/core/database/upgrade/3.0.11.php b/core/database/upgrade/3.0.11.php index c0aeac5e5..291d8807d 100644 --- a/core/database/upgrade/3.0.11.php +++ b/core/database/upgrade/3.0.11.php @@ -37,7 +37,6 @@ public function mysql() $this->db->query($sql); } - public function pgsql() { $sql = " diff --git a/core/database/upgrade/3.0.13.php b/core/database/upgrade/3.0.13.php index 4a39ed408..1239e7c60 100644 --- a/core/database/upgrade/3.0.13.php +++ b/core/database/upgrade/3.0.13.php @@ -22,8 +22,8 @@ class Upgrade_3_0_13 extends MIDASUpgrade { public function preUpgrade() { - $this->addTableField('metadatadocumentvalue', 'metadatavalue_id', 'bigint(20)', 'serial',false); - $this->addTableField('metadatavalue', 'metadatavalue_id', 'bigint(20)', 'serial',false); + $this->addTableField('metadatadocumentvalue', 'metadatavalue_id', 'bigint(20)', 'serial', false); + $this->addTableField('metadatavalue', 'metadatavalue_id', 'bigint(20)', 'serial', false); } public function mysql() @@ -36,7 +36,6 @@ public function mysql() `metadatavalue_id` BIGINT( 20 ) NOT NULL AUTO_INCREMENT"); } - public function pgsql() { } diff --git a/core/database/upgrade/3.0.14.php b/core/database/upgrade/3.0.14.php index b5f210e34..7c67db157 100644 --- a/core/database/upgrade/3.0.14.php +++ b/core/database/upgrade/3.0.14.php @@ -43,7 +43,6 @@ public function mysql() { } - public function pgsql() { } diff --git a/core/database/upgrade/3.0.16.php b/core/database/upgrade/3.0.16.php index aec423e29..61986ed53 100644 --- a/core/database/upgrade/3.0.16.php +++ b/core/database/upgrade/3.0.16.php @@ -28,7 +28,6 @@ public function mysql() { } - public function pgsql() { } diff --git a/core/database/upgrade/3.0.6.php b/core/database/upgrade/3.0.6.php index c18d4c908..5831c4d4a 100644 --- a/core/database/upgrade/3.0.6.php +++ b/core/database/upgrade/3.0.6.php @@ -32,7 +32,6 @@ public function mysql() $this->db->query($sql); } - public function pgsql() { $sql = "ALTER TABLE community ALTER COLUMN admingroup_id DROP NOT NULL; ; "; diff --git a/core/database/upgrade/3.0.7.php b/core/database/upgrade/3.0.7.php index d9486ed63..77293f5d4 100644 --- a/core/database/upgrade/3.0.7.php +++ b/core/database/upgrade/3.0.7.php @@ -30,7 +30,6 @@ public function mysql() $this->db->query($sql); } - public function pgsql() { $sql = "ALTER TABLE community ALTER COLUMN membergroup_id DROP NOT NULL; ; "; diff --git a/core/database/upgrade/3.0.9.php b/core/database/upgrade/3.0.9.php index 3d533b744..90f2d09b0 100644 --- a/core/database/upgrade/3.0.9.php +++ b/core/database/upgrade/3.0.9.php @@ -37,7 +37,6 @@ public function mysql() $this->db->query($sql); } - public function pgsql() { $sql = " diff --git a/core/database/upgrade/3.1.0.php b/core/database/upgrade/3.1.0.php index 42a4509d2..279a9b4b2 100644 --- a/core/database/upgrade/3.1.0.php +++ b/core/database/upgrade/3.1.0.php @@ -28,7 +28,6 @@ public function mysql() { } - public function pgsql() { $this->db->query('ALTER TABLE community ALTER COLUMN moderatorgroup_id DROP NOT NULL'); diff --git a/core/database/upgrade/3.1.1.php b/core/database/upgrade/3.1.1.php index 15af8786d..e8f082d20 100644 --- a/core/database/upgrade/3.1.1.php +++ b/core/database/upgrade/3.1.1.php @@ -30,7 +30,6 @@ public function mysql() $this->db->query('DROP TABLE item2keyword'); } - public function pgsql() { $this->db->query('DROP TABLE itemkeyword'); diff --git a/core/database/upgrade/3.1.3.php b/core/database/upgrade/3.1.3.php index cc2b46d5a..d79ac0bfc 100644 --- a/core/database/upgrade/3.1.3.php +++ b/core/database/upgrade/3.1.3.php @@ -30,7 +30,6 @@ public function mysql() $this->db->query($sql); } - public function pgsql() { $sql = "ALTER TABLE item ALTER COLUMN description TYPE TEXT;"; diff --git a/core/database/upgrade/3.1.4.php b/core/database/upgrade/3.1.4.php index 7340f65c6..00224801b 100644 --- a/core/database/upgrade/3.1.4.php +++ b/core/database/upgrade/3.1.4.php @@ -18,7 +18,6 @@ public function mysql() $this->db->query($sql); } - public function pgsql() { $sql = "CREATE TABLE setting ( diff --git a/core/database/upgrade/3.2.13.php b/core/database/upgrade/3.2.13.php index e05e18c5d..509f4d8ea 100644 --- a/core/database/upgrade/3.2.13.php +++ b/core/database/upgrade/3.2.13.php @@ -7,7 +7,6 @@ class Upgrade_3_2_13 extends MIDASUpgrade { public function preUpgrade() { - } public function mysql() diff --git a/core/layouts/layout.phtml b/core/layouts/layout.phtml index 43b364d37..d1294b3eb 100644 --- a/core/layouts/layout.phtml +++ b/core/layouts/layout.phtml @@ -139,7 +139,6 @@ echo $this->doctype()
  • '.$this->t('Administration').'
    • '; } - $linksModules = Zend_Registry::get('notifier')->callback("CALLBACK_CORE_GET_USER_MENU", array()); if(!empty($linksModules)) { @@ -321,7 +320,7 @@ echo $this->doctype() { if(is_array($item)) { - echo "
  • webroot}/item/{$item['item_id']}';\" class='recentItem' qtip='". str_replace("'", '"', $item['name'])."'>".$this->slicename($item['name'],20)."
    • "; + echo "
  • webroot}/item/{$item['item_id']}';\" class='recentItem' qtip='". str_replace("'", '"', $item['name'])."'>".$this->slicename($item['name'], 20)."
    • "; } } echo ''; diff --git a/core/models/AppDao.php b/core/models/AppDao.php index e07f4a871..ae4f0714c 100644 --- a/core/models/AppDao.php +++ b/core/models/AppDao.php @@ -24,5 +24,4 @@ */ class AppDao extends MIDAS_GlobalDao { - } // end class diff --git a/core/models/GlobalDao.php b/core/models/GlobalDao.php index 66ea30685..928ba707f 100644 --- a/core/models/GlobalDao.php +++ b/core/models/GlobalDao.php @@ -277,5 +277,4 @@ private function _getRealName($var) } return $return; } - } // end class diff --git a/core/models/MIDASDatabaseMongo.php b/core/models/MIDASDatabaseMongo.php index 37e983f62..b407071d5 100644 --- a/core/models/MIDASDatabaseMongo.php +++ b/core/models/MIDASDatabaseMongo.php @@ -221,7 +221,6 @@ public function getCountAll() return 0; }//end getCountAll - /** * @method public get() * Generic get function. You can define custom function. @@ -337,5 +336,4 @@ function multigetMongo($columnfamily, $keys, $columns = null, $column_start = "" throw new Zend_Exception($e); } } // end getMongo() - } // end class diff --git a/core/models/MIDASDatabasePdo.php b/core/models/MIDASDatabasePdo.php index 309f7a405..b40939a7e 100644 --- a/core/models/MIDASDatabasePdo.php +++ b/core/models/MIDASDatabasePdo.php @@ -55,7 +55,6 @@ public function initialize($name, $key, $data) } } // end function initialize - /** Return the database */ public function getDB() { @@ -241,7 +240,6 @@ public function link($var, $daoParent, $daoSon) return false; } //end method link - /** * @method public removeLink($var, $daoParent, $daoSon) * remove a link between 2 tables @@ -263,7 +261,6 @@ public function removeLink($var, $daoParent, $daoSon) )); } //end method removeLink - /** * @method public findBy($var, $value) * find all DAO by $var = $value @@ -293,7 +290,6 @@ public function getAll($modelName, $module = '') return $return; } //end method getAll - /** * @method public getValues($key) * Get all the value of a model @@ -376,7 +372,6 @@ public function delete($dao) return true; }//end delete - /** getAllByKey() */ public function getAllByKey($keys) { @@ -402,5 +397,4 @@ public function getCountAll() $count = $this->fetchRow($this->select()->from($this->_name, 'count(*) as COUNT')); return $count['COUNT']; }//end getCountAll - } // end class diff --git a/core/models/MIDASModel.php b/core/models/MIDASModel.php index f19b682e3..d00f0ae35 100644 --- a/core/models/MIDASModel.php +++ b/core/models/MIDASModel.php @@ -38,9 +38,14 @@ public function __construct() $configDatabase = Zend_Registry::get('configDatabase'); switch($configDatabase->database->type) { - case 'pdo': $this->database = new MIDASDatabasePdo(); break; - case 'mongo': $this->database = new MIDASDatabaseMongo(); break; - default: break; + case 'pdo': + $this->database = new MIDASDatabasePdo(); + break; + case 'mongo': + $this->database = new MIDASDatabaseMongo(); + break; + default: + break; } } // end __construct() @@ -61,7 +66,6 @@ protected function getTempDirectory() return UtilityComponent::getTempDirectory(); } - /** * Save a Dao to the database. * If you want to explicitly save null and unset fields as "NULL" in the database, @@ -217,7 +221,6 @@ public function initDao($name, $data, $module = null) } } //end initDao - /** * @method public __call($method, $params) * Catch ifthe method doesn't exists and create a method dynamically @@ -248,7 +251,6 @@ public function __call($method, $params) } }// end method __call - /** * @method public findBy($var, $value) * find all DAO by $var = $value @@ -306,9 +308,6 @@ public function findBy($var, $value) } } //end method findBy - - - /** * DEPRECATED: Use MidasLoader::newDao to load the class and instantiate a dao */ @@ -350,10 +349,8 @@ public function loadDaoClass($name, $module = 'core') throw new Zend_Exception('Unable to load dao class ' . ucfirst($module).'_'.$name); } } - } - /** * @fn public load() * @brief Load a dao * @@ -433,7 +430,6 @@ public function load($key = null) } } //end load - /** * @method public getValue() * Generic get function. You can define custom function. @@ -493,5 +489,4 @@ public function compareDao($dao1, $dao2, $juggleTypes = false) } return true; } //end method compareDao - } // end class diff --git a/core/models/MIDASModuleInstallScript.php b/core/models/MIDASModuleInstallScript.php index d6ad45588..78c0802c5 100644 --- a/core/models/MIDASModuleInstallScript.php +++ b/core/models/MIDASModuleInstallScript.php @@ -50,5 +50,4 @@ public function preInstall() public function postInstall() { } - } // end class diff --git a/core/models/MIDASUpgrade.php b/core/models/MIDASUpgrade.php index 48ecb5085..66367d057 100644 --- a/core/models/MIDASUpgrade.php +++ b/core/models/MIDASUpgrade.php @@ -45,28 +45,23 @@ public function __construct($db, $module, $dbType) /** preUpgrade called before the upgrade*/ public function preUpgrade() { - } /** calls if mysql enable*/ public function mysql() { - } /** called is pgsql enabled*/ public function pgsql() { - } /** called after the upgrade*/ public function postUpgrade() { - } - /** * @method public loadElements() * Loads model and components @@ -77,7 +72,7 @@ public function loadModuleElements() { MidasLoader::loadModels($this->_moduleModels, $this->moduleName); $modelsArray = Zend_Registry::get('models'); - foreach($this->_moduleModels as $value) + foreach($this->_moduleModels as $value) { if(isset($modelsArray[$this->moduleName.$value])) { @@ -217,7 +212,6 @@ public function loadElements() } }//end loadElements - /** * @method public AddTableField() * Add a field to a table @@ -375,5 +369,4 @@ function removeTablePrimaryKey($table) $this->db->query("ALTER TABLE ".$table." DROP PRIMARY KEY"); } } - } // end class diff --git a/core/models/base/AssetstoreModelBase.php b/core/models/base/AssetstoreModelBase.php index 3d0eae4ee..4af3eb1a0 100644 --- a/core/models/base/AssetstoreModelBase.php +++ b/core/models/base/AssetstoreModelBase.php @@ -93,8 +93,6 @@ protected function detectCollision($var, $value, $keyVal) } } - - /** save an assetsore*/ public function save($dao) { diff --git a/core/models/base/CommunityModelBase.php b/core/models/base/CommunityModelBase.php index ec1532e11..d8227ed51 100644 --- a/core/models/base/CommunityModelBase.php +++ b/core/models/base/CommunityModelBase.php @@ -198,7 +198,6 @@ function createCommunity($name, $description, $privacy, $user, $canJoin = null, return $communityDao; } // end createCommunity() - /** Delete a community */ function delete($communityDao) { @@ -238,7 +237,6 @@ function delete($communityDao) $communityDao->saved = false; }//end delete - /** check ifthe policy is valid * * @param FolderDao $folderDao @@ -360,7 +358,6 @@ function countBitstreams($communityDao, $userDao = null) return $folderModel->countBitstreams($folderDao, $userDao); } //end countBitstreams - /** * set the privacy on the passed in Community to the passed in privacyCode, * which should be one of MIDAS_COMMUNITY_PUBLIC, MIDAS_COMMUNITY_PRIVATE. diff --git a/core/models/base/FeedModelBase.php b/core/models/base/FeedModelBase.php index 36abf65d9..408fadd1d 100644 --- a/core/models/base/FeedModelBase.php +++ b/core/models/base/FeedModelBase.php @@ -48,7 +48,6 @@ protected abstract function getFeeds($loggedUserDao, $userDao = null, $community protected abstract function addCommunity($feed, $community); abstract function policyCheck($feedDao, $userDao = null, $policy = 0); - /** get feeds (filtered by policies) * @return Array of FeedDao */ function getGlobalFeeds($loggedUserDao, $policy = 0, $limit = 20) @@ -95,14 +94,14 @@ function createFeed($userDao, $type, $ressource, $communityDao = null) case MIDAS_FEED_COMMUNITY_INVITATION: if(!$ressource instanceof CommunityInvitationDao) { - throw new Zend_Exception("Error in parameter ressource, expecting CommunityInvitationDao, type:".$type); + throw new Zend_Exception("Error in parameter ressource, expecting CommunityInvitationDao, type:".$type); } $feed->setRessource($ressource->getKey()); break; case MIDAS_FEED_CREATE_FOLDER: if(!$ressource instanceof FolderDao) { - throw new Zend_Exception("Error in parameter ressource, expecting FolderDao, type:".$type); + throw new Zend_Exception("Error in parameter ressource, expecting FolderDao, type:".$type); } $feed->setRessource($ressource->getKey()); break; @@ -110,21 +109,21 @@ function createFeed($userDao, $type, $ressource, $communityDao = null) case MIDAS_FEED_CREATE_ITEM: if(!$ressource instanceof ItemDao) { - throw new Zend_Exception("Error in parameter ressource, expecting ItemDao, type:".$type); + throw new Zend_Exception("Error in parameter ressource, expecting ItemDao, type:".$type); } $feed->setRessource($ressource->getKey()); break; case MIDAS_FEED_CREATE_REVISION: if(!$ressource instanceof ItemRevisionDao) { - throw new Zend_Exception("Error in parameter ressource, expecting ItemRevisionDao, type:".$type); + throw new Zend_Exception("Error in parameter ressource, expecting ItemRevisionDao, type:".$type); } $feed->setRessource($ressource->getKey()); break; case MIDAS_FEED_CREATE_USER: if(!$ressource instanceof UserDao) { - throw new Zend_Exception("Error in parameter ressource, expecting UserDao, type:".$type); + throw new Zend_Exception("Error in parameter ressource, expecting UserDao, type:".$type); } $feed->setRessource($ressource->getKey()); break; @@ -133,7 +132,7 @@ function createFeed($userDao, $type, $ressource, $communityDao = null) case MIDAS_FEED_DELETE_ITEM: if(!is_string($ressource)) { - throw new Zend_Exception("Error in parameter ressource, expecting string, type:".$type); + throw new Zend_Exception("Error in parameter ressource, expecting string, type:".$type); } $feed->setRessource($ressource); break; @@ -150,5 +149,4 @@ function createFeed($userDao, $type, $ressource, $communityDao = null) } return $feed; } // end createFeed() - } // end class diff --git a/core/models/base/FeedpolicygroupModelBase.php b/core/models/base/FeedpolicygroupModelBase.php index 90927a2db..36a838a7e 100644 --- a/core/models/base/FeedpolicygroupModelBase.php +++ b/core/models/base/FeedpolicygroupModelBase.php @@ -42,7 +42,6 @@ public function __construct() abstract function getPolicy($group, $feed); abstract function deleteGroupPolicies($group); - /** create a policy * @return FeedpolicygroupDao*/ public function createPolicy($group, $feed, $policy) @@ -74,5 +73,4 @@ public function createPolicy($group, $feed, $policy) $this->save($policyGroupDao); return $policyGroupDao; } // end createPolicy - } // end class diff --git a/core/models/base/GroupModelBase.php b/core/models/base/GroupModelBase.php index 7b2c22173..1b51c48fa 100644 --- a/core/models/base/GroupModelBase.php +++ b/core/models/base/GroupModelBase.php @@ -97,7 +97,6 @@ public function delete($group) $group->saved = false; }//end deleteGroup - /** create a group * @return GroupDao*/ public function createGroup($communityDao, $name) diff --git a/core/models/base/ItemModelBase.php b/core/models/base/ItemModelBase.php index a74501260..c1e7f25a5 100644 --- a/core/models/base/ItemModelBase.php +++ b/core/models/base/ItemModelBase.php @@ -181,7 +181,6 @@ function addReadonlyPolicy($itemdao, $folderdao) } }//end addReadonlyPolicy - /** * Duplicate an item in destination folder/community * diff --git a/core/models/base/ItemRevisionModelBase.php b/core/models/base/ItemRevisionModelBase.php index 052f94778..f6c428636 100644 --- a/core/models/base/ItemRevisionModelBase.php +++ b/core/models/base/ItemRevisionModelBase.php @@ -163,7 +163,6 @@ function addBitstream($itemRevisionDao, $bitstreamDao) $ItemModel->save($item, true); } // end addBitstream - /** save */ public function save($dao) { diff --git a/core/models/base/ItempolicygroupModelBase.php b/core/models/base/ItempolicygroupModelBase.php index f8fba8089..a416ecc8f 100644 --- a/core/models/base/ItempolicygroupModelBase.php +++ b/core/models/base/ItempolicygroupModelBase.php @@ -79,7 +79,6 @@ public function createPolicy($group, $item, $policy) return $policyGroupDao; } - /** delete */ public function delete($dao) { diff --git a/core/models/dao/CommunityDao.php b/core/models/dao/CommunityDao.php index 05c580233..b0a754566 100644 --- a/core/models/dao/CommunityDao.php +++ b/core/models/dao/CommunityDao.php @@ -25,5 +25,4 @@ class CommunityDao extends AppDao { public $_model = 'Community'; - } diff --git a/core/models/dao/FolderDao.php b/core/models/dao/FolderDao.php index a2cb67252..fee7368fa 100644 --- a/core/models/dao/FolderDao.php +++ b/core/models/dao/FolderDao.php @@ -25,5 +25,4 @@ class FolderDao extends AppDao { public $_model = 'Folder'; - } // end class diff --git a/core/models/pdo/CommunityInvitationModel.php b/core/models/pdo/CommunityInvitationModel.php index 0a2716d9d..b83d5d1d9 100644 --- a/core/models/pdo/CommunityInvitationModel.php +++ b/core/models/pdo/CommunityInvitationModel.php @@ -26,5 +26,4 @@ */ class CommunityInvitationModel extends CommunityInvitationModelBase { - } // end class diff --git a/core/models/pdo/CommunityModel.php b/core/models/pdo/CommunityModel.php index 70ce472ee..922bd1eb2 100644 --- a/core/models/pdo/CommunityModel.php +++ b/core/models/pdo/CommunityModel.php @@ -178,5 +178,4 @@ function getCommunitiesFromSearch($search, $userDao, $limit = 14, $group = true, } return $return; } // end getCommunitiesFromSearch() - } // end class diff --git a/core/models/pdo/FeedModel.php b/core/models/pdo/FeedModel.php index 26e5b3dd9..b1d59c3fd 100644 --- a/core/models/pdo/FeedModel.php +++ b/core/models/pdo/FeedModel.php @@ -116,8 +116,6 @@ function policyCheck($feedDao, $userDao = null, $policy = 0) return true; } //end policyCheck - - /** get feed * @param UserDao $loggedUserDao * @param UserDao $userDao @@ -155,7 +153,6 @@ protected function getFeeds($loggedUserDao, $userDao = null, $communityDao = nul throw new Zend_Exception("Should be a community."); } - $sql = $this->database->select() ->setIntegrityCheck(false) ->from(array('f' => 'feed')) @@ -232,7 +229,6 @@ protected function getFeeds($loggedUserDao, $userDao = null, $communityDao = nul return $rowsetAnalysed; } // end _getFeeds - /** Add a community to a feed * @return void */ function addCommunity($feed, $community) @@ -274,5 +270,4 @@ function delete($feedDao) } return parent::delete($feedDao); } // end delete - } // end class diff --git a/core/models/pdo/FeedpolicygroupModel.php b/core/models/pdo/FeedpolicygroupModel.php index bb5760852..f1010b30e 100644 --- a/core/models/pdo/FeedpolicygroupModel.php +++ b/core/models/pdo/FeedpolicygroupModel.php @@ -56,5 +56,4 @@ public function deleteGroupPolicies($group) $clause = 'group_id = '.$group->getKey(); Zend_Registry::get('dbAdapter')->delete($this->_name, $clause); } - } // end class diff --git a/core/models/pdo/FeedpolicyuserModel.php b/core/models/pdo/FeedpolicyuserModel.php index b8082f30b..86281afd3 100644 --- a/core/models/pdo/FeedpolicyuserModel.php +++ b/core/models/pdo/FeedpolicyuserModel.php @@ -41,5 +41,4 @@ public function getPolicy($user, $feed) } return $this->initDao('Feedpolicyuser', $this->database->fetchRow($this->database->select()->where('feed_id = ?', $feed->getKey())->where('user_id = ?', $user->getKey()))); } // end getPolicy - } // end class diff --git a/core/models/pdo/FolderModel.php b/core/models/pdo/FolderModel.php index 3be6739b6..8cbec6b3d 100644 --- a/core/models/pdo/FolderModel.php +++ b/core/models/pdo/FolderModel.php @@ -414,7 +414,6 @@ function getAllChildren($folder, $userDao, $admin = false, $policy = 0) $subSqlFolders = $this->database->select() ->union(array($subqueryUser, $subqueryGroup)); - $rowset = $this->database->fetchAll($subSqlFolders); $folders = array(); @@ -708,7 +707,6 @@ function getFolderExists($name, $parent) ->where('parent_id = ?', $parent->getKey()))); } - /** * Get child items of a folder filtered by policy check for the provided user * @param folder The parent folder diff --git a/core/models/pdo/GroupModel.php b/core/models/pdo/GroupModel.php index ed411cf39..e938e2848 100644 --- a/core/models/pdo/GroupModel.php +++ b/core/models/pdo/GroupModel.php @@ -98,7 +98,6 @@ function removeUser($group, $user) $this->database->removeLink('users', $group, $user); } // end function removeUser - /** Return a list of group corresponding to the search */ function getGroupFromSearch($search, $limit = 14) { diff --git a/core/models/pdo/ItemModel.php b/core/models/pdo/ItemModel.php index cf1f26d56..90743603c 100644 --- a/core/models/pdo/ItemModel.php +++ b/core/models/pdo/ItemModel.php @@ -223,7 +223,6 @@ function getMostPopulars($userDao, $limit = 20) return $results; } - /** * Get Items where user policy = Admin * @param type $userDao diff --git a/core/models/pdo/ItemRevisionModel.php b/core/models/pdo/ItemRevisionModel.php index c6481d37e..a69940243 100644 --- a/core/models/pdo/ItemRevisionModel.php +++ b/core/models/pdo/ItemRevisionModel.php @@ -138,7 +138,6 @@ function delete($revisiondao) unset($revisiondao->itemrevision_id); }//end delete - /** Returns the latest revision of a model */ function getLatestRevision($itemdao) { diff --git a/core/models/pdo/ItempolicygroupModel.php b/core/models/pdo/ItempolicygroupModel.php index ef0661702..1e8661489 100644 --- a/core/models/pdo/ItempolicygroupModel.php +++ b/core/models/pdo/ItempolicygroupModel.php @@ -77,5 +77,4 @@ public function deleteGroupPolicies($group) $clause = 'group_id = '.$group->getKey(); Zend_Registry::get('dbAdapter')->delete($this->_name, $clause); } - } // end class diff --git a/core/models/pdo/ItempolicyuserModel.php b/core/models/pdo/ItempolicyuserModel.php index 1df845dcb..bb01657e2 100644 --- a/core/models/pdo/ItempolicyuserModel.php +++ b/core/models/pdo/ItempolicyuserModel.php @@ -24,7 +24,7 @@ * \class ItempolicyuserModel * \brief Pdo Model */ -class ItempolicyuserModel extends ItempolicyuserModelBase +class ItempolicyuserModel extends ItempolicyuserModelBase { /** getPolicy * @return ItempolicyuserDao diff --git a/core/models/pdo/MetadataModel.php b/core/models/pdo/MetadataModel.php index 46402e2e2..17f0d4a37 100644 --- a/core/models/pdo/MetadataModel.php +++ b/core/models/pdo/MetadataModel.php @@ -124,7 +124,6 @@ function getMetadataValueExists($metadataDao) throw new Zend_Exception("Should be a metadata."); } - $row = $this->database->fetchRow($this->database->select() ->setIntegrityCheck(false) ->from($this->getTableValueName($metadataDao->getMetadatatype())) @@ -173,6 +172,4 @@ function saveMetadataValue($metadataDao) } return true; } // end function saveMetadataValue() - - } // end class diff --git a/core/models/pdo/SettingModel.php b/core/models/pdo/SettingModel.php index 2ccd44e82..fa067ea24 100644 --- a/core/models/pdo/SettingModel.php +++ b/core/models/pdo/SettingModel.php @@ -19,7 +19,7 @@ class SettingModel extends SettingModelBase { /** get by name*/ - function getDaoByName($name, $module = 'core') + function getDaoByName($name, $module = 'core') { if(!is_string($name) || !is_string($module)) { diff --git a/core/models/pdo/UserModel.php b/core/models/pdo/UserModel.php index e1baeda2e..2b5b6571b 100644 --- a/core/models/pdo/UserModel.php +++ b/core/models/pdo/UserModel.php @@ -158,8 +158,6 @@ function getAdmins() return $return; } // end getAll() - - /** Returns a user given its root folder */ function getByFolder($folder) { @@ -242,7 +240,6 @@ function getUsersFromSearch($search, $userDao, $limit = 14, $group = true, $orde ->where('g1.user_id = u.user_id') ->where('g2.user_id= ? ', $userId); - $sql = $this->database->select(); if($group) { @@ -271,7 +268,6 @@ function getUsersFromSearch($search, $userDao, $limit = 14, $group = true, $orde ->setIntegrityCheck(false); } - if($group) { $sql->group(array('u.firstname', 'u.lastname')); diff --git a/core/models/pdo/UserapiModel.php b/core/models/pdo/UserapiModel.php index 30957adb3..b3a0b4bf3 100644 --- a/core/models/pdo/UserapiModel.php +++ b/core/models/pdo/UserapiModel.php @@ -65,7 +65,6 @@ function getByAppAndUser($appname, $userDao) return $dao; } // end getByAppAndUser - /** * Return the tokendao * @param type $email @@ -98,7 +97,6 @@ function getToken($email, $apikey, $appname) ->where('t.expiration_date > ?', $now) ->where('u.apikey = ?', $apikey); - $row = $this->database->fetchRow($sql); $tokenDao = $this->initDao('Token', $row); @@ -153,7 +151,6 @@ function getToken($email, $apikey, $appname) return $tokenDao; } //get Token - /** Return the userid from a token */ function getUserapiFromToken($token) { diff --git a/core/tests/controllers/AssetstoreControllerTest.php b/core/tests/controllers/AssetstoreControllerTest.php index d64045ac4..08612d82e 100644 --- a/core/tests/controllers/AssetstoreControllerTest.php +++ b/core/tests/controllers/AssetstoreControllerTest.php @@ -186,7 +186,6 @@ function testDeleteAction() $this->assertFalse($testAssetstoreDao); } - /** helper method, sends a request to assetstore controller */ protected function dispatchRequestJson($pageURI, $params) { @@ -220,8 +219,6 @@ protected function expectErrorJson($pageURI, $params) $this->assertTrue(isset($response->error)); } - - /** test edit action */ function testEditAction() { @@ -284,8 +281,6 @@ function testEditAction() $this->assertEquals($updatedTestAssetstore->getPath(), $testAssetstorePath); } - - /** test add action */ function testAddAction() { diff --git a/core/tests/controllers/FeedControllerTest.php b/core/tests/controllers/FeedControllerTest.php index 2032a8716..014dee298 100644 --- a/core/tests/controllers/FeedControllerTest.php +++ b/core/tests/controllers/FeedControllerTest.php @@ -28,7 +28,6 @@ public function setUp() $this->_models = array('User', 'Feed'); $this->_daos = array('User'); parent::setUp(); - } /** test index*/ diff --git a/core/tests/controllers/ImportControllerTest.php b/core/tests/controllers/ImportControllerTest.php index 00a71f0ad..36a10038d 100644 --- a/core/tests/controllers/ImportControllerTest.php +++ b/core/tests/controllers/ImportControllerTest.php @@ -245,5 +245,4 @@ function testImportAction() $this->assertEquals('baz.txt', $subSubItemsMap['baz.txt']->getName(), 'SubSubItem improperly imported via local import.'); } - } // end ImportControllerTest diff --git a/core/tests/controllers/LicenseControllerTest.php b/core/tests/controllers/LicenseControllerTest.php index f59284173..65e334195 100644 --- a/core/tests/controllers/LicenseControllerTest.php +++ b/core/tests/controllers/LicenseControllerTest.php @@ -132,5 +132,4 @@ public function testDeleteAction() $this->assertEquals($revision2->getLicenseId(), $license2->getKey()); $this->assertEquals($revision3->getLicenseId(), null); } - } diff --git a/core/tests/controllers/UserControllerTest.php b/core/tests/controllers/UserControllerTest.php index 7fc150d15..769b90f81 100644 --- a/core/tests/controllers/UserControllerTest.php +++ b/core/tests/controllers/UserControllerTest.php @@ -57,7 +57,6 @@ public function testRegisterAction() $this->request->setMethod('POST'); $this->dispatchUrI("/user/register", null, true); - $this->params = array(); $this->params['email'] = 'user2@user1.com'; $this->params['password1'] = 'test'; diff --git a/core/tests/controllers/api/RestCallMethodsTest.php b/core/tests/controllers/api/RestCallMethodsTest.php index 067e75b8e..ebe1e7455 100644 --- a/core/tests/controllers/api/RestCallMethodsTest.php +++ b/core/tests/controllers/api/RestCallMethodsTest.php @@ -417,5 +417,4 @@ protected function exerciseInvalidCases($method, $validUser, $invalidUsers, $req } } } - } diff --git a/core/tests/controllers/api/RestCallUserMethodsTest.php b/core/tests/controllers/api/RestCallUserMethodsTest.php index 2f19ca213..d23b8b85b 100644 --- a/core/tests/controllers/api/RestCallUserMethodsTest.php +++ b/core/tests/controllers/api/RestCallUserMethodsTest.php @@ -76,7 +76,6 @@ public function testUserApikeyDefault() $resp = $this->_callRestApi('POST', $apipath); $this->_assertStatusOk($resp); - $this->assertEquals($resp['body']->data->apikey, $apiKey); } @@ -147,5 +146,4 @@ public function testUserList() $usersFile = $this->loadData('User', 'default'); $this->assertEquals(count($resp['body']->data), count($usersFile)); } - } diff --git a/core/tests/controllers/api/RestKeyControllerTest.php b/core/tests/controllers/api/RestKeyControllerTest.php index 45ebd3661..bd2aa0d80 100644 --- a/core/tests/controllers/api/RestKeyControllerTest.php +++ b/core/tests/controllers/api/RestKeyControllerTest.php @@ -76,5 +76,4 @@ public function testNewUserGetsDefaultApiKey() $key = $userApiModel->getByAppAndEmail('Default', 'some.user@server.com')->getApikey(); $this->assertNotEmpty($key); } - } diff --git a/core/tests/controllers/components/ExportComponentTest.php b/core/tests/controllers/components/ExportComponentTest.php index b628f1055..99415ce6b 100644 --- a/core/tests/controllers/components/ExportComponentTest.php +++ b/core/tests/controllers/components/ExportComponentTest.php @@ -286,5 +286,4 @@ public function testExportBitStreamsInvalidCases() // clean up KWUtils::recursiveRemoveDirectory($midas_exporttest_dir); } - } // end class diff --git a/core/tests/controllers/components/UtilityComponentTest.php b/core/tests/controllers/components/UtilityComponentTest.php index 152c13281..a65b84150 100644 --- a/core/tests/controllers/components/UtilityComponentTest.php +++ b/core/tests/controllers/components/UtilityComponentTest.php @@ -55,5 +55,4 @@ public function testFilterHtmlTags() $val = UtilityComponent::filterHtmlTags($text); $this->assertEquals($val, 'malicious javascript'); } - } // end class diff --git a/core/tests/models/base/AssetstoreModelTest.php b/core/tests/models/base/AssetstoreModelTest.php index 10e2e604d..0a81ee23b 100644 --- a/core/tests/models/base/AssetstoreModelTest.php +++ b/core/tests/models/base/AssetstoreModelTest.php @@ -29,8 +29,6 @@ public function setUp() parent::setUp(); } - - /** * helper function, will save an Assetstore, using either the passed in * assetstoreDao or creating a new one, will set the three parameter @@ -99,7 +97,6 @@ public function testSave() $this->assertEquals('Default', $default->getName()); // Correct Create Test - // create new ones with a different path from existing ones $assetstoreDao1 = $this->validSaveTestcase('test_assetstore_1', '/testassetstore1/path', 0); @@ -165,7 +162,6 @@ public function testSave() $this->assertEquals($foundDao->getName(), $newName); $assetstoreDao1->setName($savedName); - // take existing, try to save with a non-colliding path $savedPath = $assetstoreDao1->getPath(); $newPath = 'noncolliding/path'; @@ -185,5 +181,4 @@ public function testSave() $this->Assetstore->delete($assetstoreDao2); $this->Assetstore->delete($assetstoreDao3); } - } diff --git a/core/tests/models/base/CommunityModelTest.php b/core/tests/models/base/CommunityModelTest.php index 253a3b79f..4198611e9 100644 --- a/core/tests/models/base/CommunityModelTest.php +++ b/core/tests/models/base/CommunityModelTest.php @@ -104,8 +104,4 @@ public function testDeleteCommunity() // ensure that any folderpolicygroups connected with the deleted community are deleted $this->assertFalse($movedFolderDeletedCommunityMemberGroupPolicy, "A moved folder still has folderpolicygroup references to a deleted community"); } - - - - } diff --git a/core/tests/models/base/MetadataModelTest.php b/core/tests/models/base/MetadataModelTest.php index b66fe17d1..337ffb6b6 100644 --- a/core/tests/models/base/MetadataModelTest.php +++ b/core/tests/models/base/MetadataModelTest.php @@ -30,7 +30,6 @@ public function setUp() parent::setUp(); } - /** * tests getMetadata and addMetadata */ @@ -142,5 +141,4 @@ public function testGetMetadataQualifiers() sort($qualifiers); $this->assertEquals($qualifiers, array('Manufacturer', 'NumSlices', 'PatientName')); } - } diff --git a/core/tests/models/dao/FeedDaoTest.php b/core/tests/models/dao/FeedDaoTest.php index b672fc091..1ff25b36c 100644 --- a/core/tests/models/dao/FeedDaoTest.php +++ b/core/tests/models/dao/FeedDaoTest.php @@ -47,47 +47,47 @@ public function testGetRessource() } switch($feedDao->getType()) { - case MIDAS_FEED_CREATE_COMMUNITY : - case MIDAS_FEED_UPDATE_COMMUNITY : + case MIDAS_FEED_CREATE_COMMUNITY: + case MIDAS_FEED_UPDATE_COMMUNITY: if(!$feedDao->getRessource() instanceof CommunityDao) { $this->fail("Error Dao"); } break; - case MIDAS_FEED_CREATE_FOLDER : + case MIDAS_FEED_CREATE_FOLDER: if(!$feedDao->getRessource() instanceof FolderDao) { $this->fail("Error Dao"); } break; - case MIDAS_FEED_CREATE_ITEM : - case MIDAS_FEED_CREATE_LINK_ITEM : + case MIDAS_FEED_CREATE_ITEM: + case MIDAS_FEED_CREATE_LINK_ITEM: if(!$feedDao->getRessource() instanceof ItemDao) { $this->fail("Error Dao"); } break; - case MIDAS_FEED_CREATE_REVISION : + case MIDAS_FEED_CREATE_REVISION: if(!$feedDao->getRessource() instanceof ItemRevisionDao) { $this->fail("Error Dao"); } break; - case MIDAS_FEED_CREATE_USER : + case MIDAS_FEED_CREATE_USER: if(!$feedDao->getRessource() instanceof UserDao) { $this->fail("Error Dao"); } break; - case MIDAS_FEED_DELETE_COMMUNITY : - case MIDAS_FEED_DELETE_FOLDER : - case MIDAS_FEED_DELETE_ITEM : + case MIDAS_FEED_DELETE_COMMUNITY: + case MIDAS_FEED_DELETE_FOLDER: + case MIDAS_FEED_DELETE_ITEM: if(!is_string($feedDao->getRessource())) { $this->fail("Error result"); } break; - default : + default: $this->fail("Unable to find resource"); } } diff --git a/core/views/admin/index.phtml b/core/views/admin/index.phtml index cd10abd19..689a3da5b 100644 --- a/core/views/admin/index.phtml +++ b/core/views/admin/index.phtml @@ -270,5 +270,4 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
    -
    diff --git a/core/views/admin/showlog.phtml b/core/views/admin/showlog.phtml index 4546da44e..980c54a96 100644 --- a/core/views/admin/showlog.phtml +++ b/core/views/admin/showlog.phtml @@ -48,7 +48,6 @@ PURPOSE. See the above copyright notices for more information. -
    Current Filter:
    diff --git a/core/views/admin/upgrade.phtml b/core/views/admin/upgrade.phtml index ef6153808..d564ab4b5 100644 --- a/core/views/admin/upgrade.phtml +++ b/core/views/admin/upgrade.phtml @@ -27,7 +27,7 @@ Current version: core['currentText']?>
    ?>

    Modules:

    modules as $name=>$module) +foreach($this->modules as $name => $module) { echo "{$name}
    "; echo "Current version: {$module['currentText']}
    "; diff --git a/core/views/apikey/usertab.phtml b/core/views/apikey/usertab.phtml index 3fb958df6..f1dc04365 100644 --- a/core/views/apikey/usertab.phtml +++ b/core/views/apikey/usertab.phtml @@ -17,7 +17,7 @@ echo ' +EOJ; + + // Always place the hidden fields before the captcha markup, and follow + // with the JS from above + switch ($placement) { + case 'PREPEND': + $content = $hidden . $markup . $js . $separator . $content; + break; + case 'APPEND': + default: + $content = $content . $separator . $hidden . $markup . $js; + } + return $content; + } +} + diff --git a/library/Zend/Form/Decorator/Captcha/Word.php b/library/Zend/Form/Decorator/Captcha/Word.php index ca6f3cc12..d6858b91b 100644 --- a/library/Zend/Form/Decorator/Captcha/Word.php +++ b/library/Zend/Form/Decorator/Captcha/Word.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Word.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Word.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Captcha_Word extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/Description.php b/library/Zend/Form/Decorator/Description.php index 0175c1405..eed3c76b2 100644 --- a/library/Zend/Form/Decorator/Description.php +++ b/library/Zend/Form/Decorator/Description.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -37,9 +37,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Description.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Description extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/DtDdWrapper.php b/library/Zend/Form/Decorator/DtDdWrapper.php index 77404113e..117974819 100644 --- a/library/Zend/Form/Decorator/DtDdWrapper.php +++ b/library/Zend/Form/Decorator/DtDdWrapper.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,9 +31,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DtDdWrapper.php 22128 2010-05-06 11:18:02Z alab $ + * @version $Id: DtDdWrapper.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_DtDdWrapper extends Zend_Form_Decorator_Abstract { @@ -51,14 +51,14 @@ class Zend_Form_Decorator_DtDdWrapper extends Zend_Form_Decorator_Abstract *
    $content
    * * $dtLabel can be set via 'dtLabel' option, defaults to '\ ' - * + * * @param string $content * @return string */ public function render($content) { $elementName = $this->getElement()->getName(); - + $dtLabel = $this->getOption('dtLabel'); if( null === $dtLabel ) { $dtLabel = ' '; diff --git a/library/Zend/Form/Decorator/Errors.php b/library/Zend/Form/Decorator/Errors.php index 9818dc4e7..922c78e77 100644 --- a/library/Zend/Form/Decorator/Errors.php +++ b/library/Zend/Form/Decorator/Errors.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Errors.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Errors.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Errors extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/Exception.php b/library/Zend/Form/Decorator/Exception.php index 6f85840d7..0989b824a 100644 --- a/library/Zend/Form/Decorator/Exception.php +++ b/library/Zend/Form/Decorator/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Decorator_Exception extends Zend_Form_Exception diff --git a/library/Zend/Form/Decorator/Fieldset.php b/library/Zend/Form/Decorator/Fieldset.php index 163f96612..2995d7aeb 100644 --- a/library/Zend/Form/Decorator/Fieldset.php +++ b/library/Zend/Form/Decorator/Fieldset.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fieldset.php 23426 2010-11-22 22:50:25Z bittarman $ + * @version $Id: Fieldset.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Fieldset extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/File.php b/library/Zend/Form/Decorator/File.php index 926f49018..66971e1de 100644 --- a/library/Zend/Form/Decorator/File.php +++ b/library/Zend/Form/Decorator/File.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_File extends Zend_Form_Decorator_Abstract diff --git a/library/Zend/Form/Decorator/Form.php b/library/Zend/Form/Decorator/Form.php index c6dbd6c12..8c0c483ff 100644 --- a/library/Zend/Form/Decorator/Form.php +++ b/library/Zend/Form/Decorator/Form.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -37,9 +37,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Form.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Form extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/FormElements.php b/library/Zend/Form/Decorator/FormElements.php index 5e80dccfa..fca82a386 100644 --- a/library/Zend/Form/Decorator/FormElements.php +++ b/library/Zend/Form/Decorator/FormElements.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormElements.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormElements.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_FormElements extends Zend_Form_Decorator_Abstract { @@ -76,6 +76,7 @@ public function render($content) $belongsTo = ($form instanceof Zend_Form) ? $form->getElementsBelongTo() : null; $elementContent = ''; + $displayGroups = ($form instanceof Zend_Form) ? $form->getDisplayGroups() : array(); $separator = $this->getSeparator(); $translator = $form->getTranslator(); $items = array(); @@ -84,6 +85,15 @@ public function render($content) $item->setView($view) ->setTranslator($translator); if ($item instanceof Zend_Form_Element) { + foreach ($displayGroups as $group) { + $elementName = $item->getName(); + $element = $group->getElement($elementName); + if ($element) { + // Element belongs to display group; only render in that + // context. + continue 2; + } + } $item->setBelongsTo($belongsTo); } elseif (!empty($belongsTo) && ($item instanceof Zend_Form)) { if ($item->isArray()) { diff --git a/library/Zend/Form/Decorator/FormErrors.php b/library/Zend/Form/Decorator/FormErrors.php index 9db269f7e..65b39d64a 100644 --- a/library/Zend/Form/Decorator/FormErrors.php +++ b/library/Zend/Form/Decorator/FormErrors.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormErrors.php 22316 2010-05-29 10:03:37Z alab $ + * @version $Id: FormErrors.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_FormErrors extends Zend_Form_Decorator_Abstract { @@ -345,13 +345,13 @@ public function setIgnoreSubForms($ignoreSubForms) /** * Get showCustomFormErrors - * + * * @return bool */ public function getShowCustomFormErrors() { if (null === $this->_showCustomFormErrors) { - if (null === ($how = $this->getOption('showCustomFormErrors'))) { + if (null === ($show = $this->getOption('showCustomFormErrors'))) { $this->setShowCustomFormErrors($this->_defaults['showCustomFormErrors']); } else { $this->setShowCustomFormErrors($show); @@ -375,7 +375,7 @@ public function setShowCustomFormErrors($showCustomFormErrors) /** * Get onlyCustomFormErrors - * + * * @return bool */ public function getOnlyCustomFormErrors() @@ -451,9 +451,13 @@ protected function _recurseForm(Zend_Form $form, Zend_View_Interface $view) . $this->getMarkupListItemEnd(); } } else if ($subitem instanceof Zend_Form && !$this->ignoreSubForms()) { - $content .= $this->getMarkupListStart() - . $this->_recurseForm($subitem, $view) - . $this->getMarkupListEnd(); + $markup = $this->_recurseForm($subitem, $view); + + if (!empty($markup)) { + $content .= $this->getMarkupListStart() + . $markup + . $this->getMarkupListEnd(); + } } } return $content; diff --git a/library/Zend/Form/Decorator/HtmlTag.php b/library/Zend/Form/Decorator/HtmlTag.php index de59b2dd0..3defa760d 100644 --- a/library/Zend/Form/Decorator/HtmlTag.php +++ b/library/Zend/Form/Decorator/HtmlTag.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -43,9 +43,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlTag.php 21970 2010-04-22 18:14:45Z alab $ + * @version $Id: HtmlTag.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_HtmlTag extends Zend_Form_Decorator_Abstract { @@ -85,8 +85,9 @@ protected function _htmlAttribs(array $attribs) $key = htmlspecialchars($key, ENT_COMPAT, $enc); if (is_array($val)) { if (array_key_exists('callback', $val) - && is_callable($val['callback'])) { - $val = $val['callback']($this); + && is_callable($val['callback']) + ) { + $val = call_user_func($val['callback'], $this); } else { $val = implode(' ', $val); } @@ -231,7 +232,7 @@ public function render($content) /** * Get encoding for use with htmlspecialchars() - * + * * @return string */ protected function _getEncoding() diff --git a/library/Zend/Form/Decorator/Image.php b/library/Zend/Form/Decorator/Image.php index de0dc0021..6a2f881f1 100644 --- a/library/Zend/Form/Decorator/Image.php +++ b/library/Zend/Form/Decorator/Image.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Image extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/Interface.php b/library/Zend/Form/Decorator/Interface.php index 4a7d37263..e3e153452 100644 --- a/library/Zend/Form/Decorator/Interface.php +++ b/library/Zend/Form/Decorator/Interface.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,9 +24,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ interface Zend_Form_Decorator_Interface { diff --git a/library/Zend/Form/Decorator/Label.php b/library/Zend/Form/Decorator/Label.php index f2f1f272d..e9df4d2de 100644 --- a/library/Zend/Form/Decorator/Label.php +++ b/library/Zend/Form/Decorator/Label.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -39,9 +39,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Label.php 22128 2010-05-06 11:18:02Z alab $ + * @version $Id: Label.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract { @@ -57,6 +57,12 @@ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract */ protected $_tag; + /** + * Class for the HTML tag with which to surround label + * @var string + */ + protected $_tagClass; + /** * Set element ID * @@ -128,6 +134,43 @@ public function getTag() return $this->_tag; } + /** + * Set the class to apply to the HTML tag with which to surround label + * + * @param string $tagClass + * @return Zend_Form_Decorator_Label + */ + public function setTagClass($tagClass) + { + if (empty($tagClass)) { + $this->_tagClass = null; + } else { + $this->_tagClass = (string) $tagClass; + } + + $this->removeOption('tagClass'); + + return $this; + } + + /** + * Get the class to apply to the HTML tag, if any, with which to surround label + * + * @return void + */ + public function getTagClass() + { + if (null === $this->_tagClass) { + $tagClass = $this->getOption('tagClass'); + if (null !== $tagClass) { + $this->removeOption('tagClass'); + $this->setTagClass($tagClass); + } + } + + return $this->_tagClass; + } + /** * Get class with which to define label * @@ -242,7 +285,7 @@ public function __call($method, $args) /** * Get label to render * - * @return void + * @return string */ public function getLabel() { @@ -297,6 +340,7 @@ public function render($content) $separator = $this->getSeparator(); $placement = $this->getPlacement(); $tag = $this->getTag(); + $tagClass = $this->getTagClass(); $id = $this->getId(); $class = $this->getClass(); $options = $this->getOptions(); @@ -316,8 +360,14 @@ public function render($content) if (null !== $tag) { // require_once 'Zend/Form/Decorator/HtmlTag.php'; $decorator = new Zend_Form_Decorator_HtmlTag(); - $decorator->setOptions(array('tag' => $tag, - 'id' => $id . '-label')); + if (null !== $this->_tagClass) { + $decorator->setOptions(array('tag' => $tag, + 'id' => $id . '-label', + 'class' => $tagClass)); + } else { + $decorator->setOptions(array('tag' => $tag, + 'id' => $id . '-label')); + } $label = $decorator->render($label); } diff --git a/library/Zend/Form/Decorator/Marker/File/Interface.php b/library/Zend/Form/Decorator/Marker/File/Interface.php index 47f9b75af..4a33ba9e6 100644 --- a/library/Zend/Form/Decorator/Marker/File/Interface.php +++ b/library/Zend/Form/Decorator/Marker/File/Interface.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,9 +24,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ interface Zend_Form_Decorator_Marker_File_Interface { diff --git a/library/Zend/Form/Decorator/PrepareElements.php b/library/Zend/Form/Decorator/PrepareElements.php index 5a50537b9..d5f2a8f69 100644 --- a/library/Zend/Form/Decorator/PrepareElements.php +++ b/library/Zend/Form/Decorator/PrepareElements.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PrepareElements.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PrepareElements.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_PrepareElements extends Zend_Form_Decorator_FormElements { diff --git a/library/Zend/Form/Decorator/Tooltip.php b/library/Zend/Form/Decorator/Tooltip.php index 807f78f22..e609a61ec 100644 --- a/library/Zend/Form/Decorator/Tooltip.php +++ b/library/Zend/Form/Decorator/Tooltip.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Tooltip.php$ */ diff --git a/library/Zend/Form/Decorator/ViewHelper.php b/library/Zend/Form/Decorator/ViewHelper.php index a84ad60dc..1ece82fa0 100644 --- a/library/Zend/Form/Decorator/ViewHelper.php +++ b/library/Zend/Form/Decorator/ViewHelper.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -37,9 +37,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewHelper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewHelper.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_ViewHelper extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Form/Decorator/ViewScript.php b/library/Zend/Form/Decorator/ViewScript.php index e69ada3a7..46f92e846 100644 --- a/library/Zend/Form/Decorator/ViewScript.php +++ b/library/Zend/Form/Decorator/ViewScript.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,9 +46,9 @@ * @category Zend * @package Zend_Form * @subpackage Decorator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewScript.php 23299 2010-11-05 04:38:14Z matthew $ + * @version $Id: ViewScript.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Decorator_ViewScript extends Zend_Form_Decorator_Abstract { @@ -108,7 +108,7 @@ public function getViewScript() /** * Set view script module - * + * * @param string $module * @return Zend_Form_Decorator_ViewScript */ @@ -120,7 +120,7 @@ public function setViewModule($viewModule) /** * Get view script module - * + * * @return string|null */ public function getViewModule() diff --git a/library/Zend/Form/DisplayGroup.php b/library/Zend/Form/DisplayGroup.php index ce5698379..79e1de0d4 100644 --- a/library/Zend/Form/DisplayGroup.php +++ b/library/Zend/Form/DisplayGroup.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,9 +23,9 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DisplayGroup.php 22930 2010-09-09 18:45:18Z matthew $ + * @version $Id: DisplayGroup.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_DisplayGroup implements Iterator,Countable { @@ -67,7 +67,7 @@ class Zend_Form_DisplayGroup implements Iterator,Countable /** * Form object to which the display group is currently registered - * + * * @var Zend_Form */ protected $_form; @@ -284,15 +284,15 @@ public function clearAttribs() /** * Set form object to which the display group is attached - * - * @param Zend_Form $form + * + * @param Zend_Form $form * @return Zend_Form_DisplayGroup */ public function setForm(Zend_Form $form) { $this->_form = $form; - // Ensure any elements attached prior to setting the form are now + // Ensure any elements attached prior to setting the form are now // removed from iteration by the form foreach ($this->getElements() as $element) { $form->removeFromIteration($element->getName()); @@ -303,7 +303,7 @@ public function setForm(Zend_Form $form) /** * Get form object to which the group is attached - * + * * @return Zend_Form|null */ public function getForm() @@ -657,7 +657,7 @@ public function loadDefaultDecoratorsIsDisabled() /** * Load default decorators * - * @return void + * @return Zend_Form_DisplayGroup */ public function loadDefaultDecorators() { diff --git a/library/Zend/Form/Element.php b/library/Zend/Form/Element.php index 0fa7d6a67..99b7f0152 100644 --- a/library/Zend/Form/Element.php +++ b/library/Zend/Form/Element.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 22464 2010-06-19 17:31:21Z alab $ + * @version $Id: Element.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element implements Zend_Validate_Interface { @@ -315,19 +315,31 @@ public function loadDefaultDecorators() $decorators = $this->getDecorators(); if (empty($decorators)) { - $getId = create_function('$decorator', - 'return $decorator->getElement()->getId() - . "-element";'); $this->addDecorator('ViewHelper') ->addDecorator('Errors') ->addDecorator('Description', array('tag' => 'p', 'class' => 'description')) - ->addDecorator('HtmlTag', array('tag' => 'dd', - 'id' => array('callback' => $getId))) + ->addDecorator('HtmlTag', array( + 'tag' => 'dd', + 'id' => array('callback' => array(get_class($this), 'resolveElementId')) + )) ->addDecorator('Label', array('tag' => 'dt')); } return $this; } + /** + * Used to resolve and return an element ID + * + * Passed to the HtmlTag decorator as a callback in order to provide an ID. + * + * @param Zend_Form_Decorator_Interface $decorator + * @return string + */ + public static function resolveElementId(Zend_Form_Decorator_Interface $decorator) + { + return $decorator->getElement()->getId() . '-element'; + } + /** * Set object state from options array * @@ -1377,7 +1389,14 @@ public function isValid($value, $context = null) if ($isArray && is_array($value)) { $messages = array(); $errors = array(); - foreach ($value as $val) { + if (empty($value)) { + if ($this->isRequired() + || (!$this->isRequired() && !$this->getAllowEmpty()) + ) { + $value = ''; + } + } + foreach ((array)$value as $val) { if (!$validator->isValid($val, $context)) { $result = false; if ($this->_hasErrorMessages()) { diff --git a/library/Zend/Form/Element/Button.php b/library/Zend/Form/Element/Button.php index e8413f430..6ed0ff07d 100644 --- a/library/Zend/Form/Element/Button.php +++ b/library/Zend/Form/Element/Button.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Button.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Button.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Button extends Zend_Form_Element_Submit { diff --git a/library/Zend/Form/Element/Captcha.php b/library/Zend/Form/Element/Captcha.php index 5ea1b3b58..2889853d4 100644 --- a/library/Zend/Form/Element/Captcha.php +++ b/library/Zend/Form/Element/Captcha.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Captcha.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Captcha.php 24774 2012-05-07 22:13:37Z adamlundrigan $ */ /** @see Zend_Form_Element_Xhtml */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Element_Captcha extends Zend_Form_Element_Xhtml @@ -154,16 +154,22 @@ public function getAttribs() */ public function setOptions(array $options) { + $captcha = null; + $captchaOptions = array(); + if (array_key_exists('captcha', $options)) { + $captcha = $options['captcha']; if (array_key_exists('captchaOptions', $options)) { - $this->setCaptcha($options['captcha'], $options['captchaOptions']); + $captchaOptions = $options['captchaOptions']; unset($options['captchaOptions']); - } else { - $this->setCaptcha($options['captcha']); } unset($options['captcha']); } parent::setOptions($options); + + if(null !== $captcha) { + $this->setCaptcha($captcha, $captchaOptions); + } return $this; } @@ -178,17 +184,24 @@ public function render(Zend_View_Interface $view = null) $captcha = $this->getCaptcha(); $captcha->setName($this->getFullyQualifiedName()); - $decorators = $this->getDecorators(); + if (!$this->loadDefaultDecoratorsIsDisabled()) { + $decorators = $this->getDecorators(); + $decorator = $captcha->getDecorator(); + $key = get_class($this->_getDecorator($decorator, null)); - $decorator = $captcha->getDecorator(); - if (!empty($decorator)) { - array_unshift($decorators, $decorator); - } + if (!empty($decorator) && !array_key_exists($key, $decorators)) { + array_unshift($decorators, $decorator); + } + + $decorator = array('Captcha', array('captcha' => $captcha)); + $key = get_class($this->_getDecorator($decorator[0], $decorator[1])); - $decorator = array('Captcha', array('captcha' => $captcha)); - array_unshift($decorators, $decorator); + if ($captcha instanceof Zend_Captcha_Word && !array_key_exists($key, $decorators)) { + array_unshift($decorators, $decorator); + } - $this->setDecorators($decorators); + $this->setDecorators($decorators); + } $this->setValue($this->getCaptcha()->generate()); @@ -253,7 +266,7 @@ public function addPrefixPath($prefix, $path, $type = null) /** * Load default decorators * - * @return void + * @return Zend_Form_Element_Captcha */ public function loadDefaultDecorators() { diff --git a/library/Zend/Form/Element/Checkbox.php b/library/Zend/Form/Element/Checkbox.php index 2d52bcc56..d139e0cb6 100644 --- a/library/Zend/Form/Element/Checkbox.php +++ b/library/Zend/Form/Element/Checkbox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Checkbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Checkbox.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Checkbox extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/Exception.php b/library/Zend/Form/Element/Exception.php index 6e3c9a6c2..7311ee35e 100644 --- a/library/Zend/Form/Element/Exception.php +++ b/library/Zend/Form/Element/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Element_Exception extends Zend_Form_Exception diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php index 873948ae0..2daf7faf9 100644 --- a/library/Zend/Form/Element/File.php +++ b/library/Zend/Form/Element/File.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 22371 2010-06-04 20:09:44Z thomas $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml { @@ -71,7 +71,7 @@ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml /** * Load default decorators * - * @return void + * @return Zend_Form_Element_File */ public function loadDefaultDecorators() { diff --git a/library/Zend/Form/Element/Hash.php b/library/Zend/Form/Element/Hash.php index c6501b554..7336a1b39 100644 --- a/library/Zend/Form/Element/Hash.php +++ b/library/Zend/Form/Element/Hash.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hash.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Hash extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/Hidden.php b/library/Zend/Form/Element/Hidden.php index 28bae576d..b1176dfe5 100644 --- a/library/Zend/Form/Element/Hidden.php +++ b/library/Zend/Form/Element/Hidden.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hidden.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hidden.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Hidden extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/Image.php b/library/Zend/Form/Element/Image.php index 3c7617fd5..63f0d045a 100644 --- a/library/Zend/Form/Element/Image.php +++ b/library/Zend/Form/Element/Image.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Image extends Zend_Form_Element_Xhtml { @@ -55,7 +55,7 @@ class Zend_Form_Element_Image extends Zend_Form_Element_Xhtml /** * Load default decorators * - * @return void + * @return Zend_Form_Element_Image */ public function loadDefaultDecorators() { diff --git a/library/Zend/Form/Element/Multi.php b/library/Zend/Form/Element/Multi.php index afcad8812..18b4e1418 100644 --- a/library/Zend/Form/Element/Multi.php +++ b/library/Zend/Form/Element/Multi.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multi.php 22322 2010-05-30 11:12:57Z thomas $ + * @version $Id: Multi.php 24594 2012-01-05 21:27:01Z matthew $ */ abstract class Zend_Form_Element_Multi extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php index b5cec8a8b..d23b5ec4d 100644 --- a/library/Zend/Form/Element/MultiCheckbox.php +++ b/library/Zend/Form/Element/MultiCheckbox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MultiCheckbox.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_MultiCheckbox extends Zend_Form_Element_Multi { diff --git a/library/Zend/Form/Element/Multiselect.php b/library/Zend/Form/Element/Multiselect.php index 83c417ef2..1cfec4391 100644 --- a/library/Zend/Form/Element/Multiselect.php +++ b/library/Zend/Form/Element/Multiselect.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multiselect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Multiselect.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Multiselect extends Zend_Form_Element_Select { diff --git a/library/Zend/Form/Element/Password.php b/library/Zend/Form/Element/Password.php index 20b2c6af8..efd3773dd 100644 --- a/library/Zend/Form/Element/Password.php +++ b/library/Zend/Form/Element/Password.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Password.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Password.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Password extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/Radio.php b/library/Zend/Form/Element/Radio.php index 4629a8569..7f8338d7c 100644 --- a/library/Zend/Form/Element/Radio.php +++ b/library/Zend/Form/Element/Radio.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Radio.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Radio.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Radio extends Zend_Form_Element_Multi { @@ -45,7 +45,7 @@ class Zend_Form_Element_Radio extends Zend_Form_Element_Multi * * Disables "for" attribute of label if label decorator enabled. * - * @return void + * @return Zend_Form_Element_Radio */ public function loadDefaultDecorators() { diff --git a/library/Zend/Form/Element/Reset.php b/library/Zend/Form/Element/Reset.php index 6d4bec4c9..d0a3f1d91 100644 --- a/library/Zend/Form/Element/Reset.php +++ b/library/Zend/Form/Element/Reset.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reset.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Reset extends Zend_Form_Element_Submit { diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php index 132e033a7..c295cf492 100644 --- a/library/Zend/Form/Element/Select.php +++ b/library/Zend/Form/Element/Select.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Select.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Select extends Zend_Form_Element_Multi { diff --git a/library/Zend/Form/Element/Submit.php b/library/Zend/Form/Element/Submit.php index e3e8092e6..27161cdda 100644 --- a/library/Zend/Form/Element/Submit.php +++ b/library/Zend/Form/Element/Submit.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Submit.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Submit.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Submit extends Zend_Form_Element_Xhtml { @@ -52,7 +52,7 @@ public function __construct($spec, $options = null) if (is_string($spec) && ((null !== $options) && is_string($options))) { $options = array('label' => $options); } - + if (!isset($options['ignore'])) { $options['ignore'] = true; } @@ -75,10 +75,10 @@ public function getLabel() if (null === $value) { $value = $this->getName(); - } - if (null !== ($translator = $this->getTranslator())) { - return $translator->translate($value); + if (null !== ($translator = $this->getTranslator())) { + return $translator->translate($value); + } } return $value; @@ -108,7 +108,7 @@ public function isChecked() * * Uses only 'Submit' and 'DtDdWrapper' decorators by default. * - * @return void + * @return Zend_Form_Element_Submit */ public function loadDefaultDecorators() { diff --git a/library/Zend/Form/Element/Text.php b/library/Zend/Form/Element/Text.php index fa30d44cf..a5ca8e584 100644 --- a/library/Zend/Form/Element/Text.php +++ b/library/Zend/Form/Element/Text.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Text extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/Textarea.php b/library/Zend/Form/Element/Textarea.php index 8dbce4553..15cd30157 100644 --- a/library/Zend/Form/Element/Textarea.php +++ b/library/Zend/Form/Element/Textarea.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Textarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Textarea.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_Element_Textarea extends Zend_Form_Element_Xhtml { diff --git a/library/Zend/Form/Element/Xhtml.php b/library/Zend/Form/Element/Xhtml.php index 24cf69303..03a5451e2 100644 --- a/library/Zend/Form/Element/Xhtml.php +++ b/library/Zend/Form/Element/Xhtml.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xhtml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Xhtml.php 24594 2012-01-05 21:27:01Z matthew $ */ abstract class Zend_Form_Element_Xhtml extends Zend_Form_Element { diff --git a/library/Zend/Form/Exception.php b/library/Zend/Form/Exception.php index 8ec65aa9b..aac747e01 100644 --- a/library/Zend/Form/Exception.php +++ b/library/Zend/Form/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Form_Exception extends Zend_Exception diff --git a/library/Zend/Form/SubForm.php b/library/Zend/Form/SubForm.php index ff62b621e..41d5aa7eb 100644 --- a/library/Zend/Form/SubForm.php +++ b/library/Zend/Form/SubForm.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubForm.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: SubForm.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Form_SubForm extends Zend_Form { diff --git a/library/Zend/Gdata.php b/library/Zend/Gdata.php index 3cd8c56c3..aa858cd53 100644 --- a/library/Zend/Gdata.php +++ b/library/Zend/Gdata.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gdata.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gdata.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata extends Zend_Gdata_App diff --git a/library/Zend/Gdata/App.php b/library/Zend/Gdata/App.php index 8bfe8b989..e65ed2c85 100644 --- a/library/Zend/Gdata/App.php +++ b/library/Zend/Gdata/App.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: App.php 22972 2010-09-18 20:33:53Z ramon $ + * @version $Id: App.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,6 +41,11 @@ */ // require_once 'Zend/Gdata/App/MediaSource.php'; +/** + * Zend_Uri/Http + */ +// require_once 'Zend/Uri/Http.php'; + /** * Provides Atom Publishing Protocol (APP) functionality. This class and all * other components of Zend_Gdata_App are designed to work independently from @@ -49,7 +54,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App @@ -1087,7 +1092,7 @@ public function __call($method, $args) * significant amount of time to complete. In some cases this may cause * execution to timeout without proper precautions in place. * - * @param $feed The feed to iterate through. + * @param object $feed The feed to iterate through. * @return mixed A new feed of the same type as the one originally * passed in, containing all relevent entries. */ @@ -1117,7 +1122,7 @@ public function retrieveAllEntriesForFeed($feed) { * NOTE: This will not work if you have customized the adapter * already to use a proxy server or other interface. * - * @param $logfile The logfile to use when logging the requests + * @param string $logfile The logfile to use when logging the requests */ public function enableRequestDebugLogging($logfile) { diff --git a/library/Zend/Gdata/App/AuthException.php b/library/Zend/Gdata/App/AuthException.php index a62b54a8e..4ef424333 100644 --- a/library/Zend/Gdata/App/AuthException.php +++ b/library/Zend/Gdata/App/AuthException.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AuthException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AuthException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_AuthException extends Zend_Gdata_App_Exception diff --git a/library/Zend/Gdata/App/BadMethodCallException.php b/library/Zend/Gdata/App/BadMethodCallException.php index 7391486f3..1b8b18a4d 100644 --- a/library/Zend/Gdata/App/BadMethodCallException.php +++ b/library/Zend/Gdata/App/BadMethodCallException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BadMethodCallException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BadMethodCallException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_BadMethodCallException extends Zend_Gdata_App_Exception diff --git a/library/Zend/Gdata/App/Base.php b/library/Zend/Gdata/App/Base.php index e2c302da9..f58a50687 100644 --- a/library/Zend/Gdata/App/Base.php +++ b/library/Zend/Gdata/App/Base.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Base.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Base diff --git a/library/Zend/Gdata/App/BaseMediaSource.php b/library/Zend/Gdata/App/BaseMediaSource.php index a89a656ff..b965cd646 100644 --- a/library/Zend/Gdata/App/BaseMediaSource.php +++ b/library/Zend/Gdata/App/BaseMediaSource.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseMediaSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BaseMediaSource.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSource diff --git a/library/Zend/Gdata/App/CaptchaRequiredException.php b/library/Zend/Gdata/App/CaptchaRequiredException.php index 4d53f19c1..dc01c8adf 100644 --- a/library/Zend/Gdata/App/CaptchaRequiredException.php +++ b/library/Zend/Gdata/App/CaptchaRequiredException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaptchaRequiredException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaptchaRequiredException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthException diff --git a/library/Zend/Gdata/App/Entry.php b/library/Zend/Gdata/App/Entry.php index ae36b61c3..6319cc4e2 100644 --- a/library/Zend/Gdata/App/Entry.php +++ b/library/Zend/Gdata/App/Entry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -62,7 +62,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Entry extends Zend_Gdata_App_FeedEntryParent diff --git a/library/Zend/Gdata/App/Exception.php b/library/Zend/Gdata/App/Exception.php index 06a41beba..69c234a0e 100644 --- a/library/Zend/Gdata/App/Exception.php +++ b/library/Zend/Gdata/App/Exception.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Exception extends Zend_Exception diff --git a/library/Zend/Gdata/App/Extension.php b/library/Zend/Gdata/App/Extension.php index 37644c23a..833420e70 100644 --- a/library/Zend/Gdata/App/Extension.php +++ b/library/Zend/Gdata/App/Extension.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension extends Zend_Gdata_App_Base diff --git a/library/Zend/Gdata/App/Extension/Author.php b/library/Zend/Gdata/App/Extension/Author.php index dc0ba2a19..3512c5ccb 100644 --- a/library/Zend/Gdata/App/Extension/Author.php +++ b/library/Zend/Gdata/App/Extension/Author.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Author.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Author extends Zend_Gdata_App_Extension_Person diff --git a/library/Zend/Gdata/App/Extension/Category.php b/library/Zend/Gdata/App/Extension/Category.php index fa0e39304..61196d504 100644 --- a/library/Zend/Gdata/App/Extension/Category.php +++ b/library/Zend/Gdata/App/Extension/Category.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Category.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Category.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Category extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Content.php b/library/Zend/Gdata/App/Extension/Content.php index 77c6ff359..1be04654f 100644 --- a/library/Zend/Gdata/App/Extension/Content.php +++ b/library/Zend/Gdata/App/Extension/Content.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Content.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Content.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Content extends Zend_Gdata_App_Extension_Text diff --git a/library/Zend/Gdata/App/Extension/Contributor.php b/library/Zend/Gdata/App/Extension/Contributor.php index cbe015d12..a00307c5d 100644 --- a/library/Zend/Gdata/App/Extension/Contributor.php +++ b/library/Zend/Gdata/App/Extension/Contributor.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Contributor.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Contributor.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Contributor extends Zend_Gdata_App_Extension_Person diff --git a/library/Zend/Gdata/App/Extension/Control.php b/library/Zend/Gdata/App/Extension/Control.php index 7a62102e0..a91170460 100644 --- a/library/Zend/Gdata/App/Extension/Control.php +++ b/library/Zend/Gdata/App/Extension/Control.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Control.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Control.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Control extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Draft.php b/library/Zend/Gdata/App/Extension/Draft.php index f19c615b7..aa3a78e42 100644 --- a/library/Zend/Gdata/App/Extension/Draft.php +++ b/library/Zend/Gdata/App/Extension/Draft.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Draft.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Draft.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Draft extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Edited.php b/library/Zend/Gdata/App/Extension/Edited.php index 88c8fb542..9b41d6d46 100644 --- a/library/Zend/Gdata/App/Extension/Edited.php +++ b/library/Zend/Gdata/App/Extension/Edited.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Edited.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Edited.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Edited extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Element.php b/library/Zend/Gdata/App/Extension/Element.php index c2a0de910..c3469b9e8 100644 --- a/library/Zend/Gdata/App/Extension/Element.php +++ b/library/Zend/Gdata/App/Extension/Element.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Element.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Element extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Email.php b/library/Zend/Gdata/App/Extension/Email.php index db3d890e1..6df792391 100644 --- a/library/Zend/Gdata/App/Extension/Email.php +++ b/library/Zend/Gdata/App/Extension/Email.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Email.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Email.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Email extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Generator.php b/library/Zend/Gdata/App/Extension/Generator.php index a1229e5b0..3f30818ed 100644 --- a/library/Zend/Gdata/App/Extension/Generator.php +++ b/library/Zend/Gdata/App/Extension/Generator.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Generator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Generator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Generator extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Icon.php b/library/Zend/Gdata/App/Extension/Icon.php index 2076e3e2a..7b4b508a9 100644 --- a/library/Zend/Gdata/App/Extension/Icon.php +++ b/library/Zend/Gdata/App/Extension/Icon.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Icon.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Icon.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Icon extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Id.php b/library/Zend/Gdata/App/Extension/Id.php index 02edd8df3..1f58c0477 100644 --- a/library/Zend/Gdata/App/Extension/Id.php +++ b/library/Zend/Gdata/App/Extension/Id.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Id.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Id.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Id extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Link.php b/library/Zend/Gdata/App/Extension/Link.php index 357f8f5fc..0c7aa5eea 100644 --- a/library/Zend/Gdata/App/Extension/Link.php +++ b/library/Zend/Gdata/App/Extension/Link.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Link extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Logo.php b/library/Zend/Gdata/App/Extension/Logo.php index d265c9fd4..5ba6f0e17 100644 --- a/library/Zend/Gdata/App/Extension/Logo.php +++ b/library/Zend/Gdata/App/Extension/Logo.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Logo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Logo.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Logo extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Name.php b/library/Zend/Gdata/App/Extension/Name.php index 99138a08e..4bdf5db9b 100644 --- a/library/Zend/Gdata/App/Extension/Name.php +++ b/library/Zend/Gdata/App/Extension/Name.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Name extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Person.php b/library/Zend/Gdata/App/Extension/Person.php index 9b6735ef1..10077adc1 100644 --- a/library/Zend/Gdata/App/Extension/Person.php +++ b/library/Zend/Gdata/App/Extension/Person.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Person.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Person.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension_Person extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Published.php b/library/Zend/Gdata/App/Extension/Published.php index 369064c7d..c553cb229 100644 --- a/library/Zend/Gdata/App/Extension/Published.php +++ b/library/Zend/Gdata/App/Extension/Published.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Published.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Published.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Published extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Rights.php b/library/Zend/Gdata/App/Extension/Rights.php index b19208ba2..5bad14153 100644 --- a/library/Zend/Gdata/App/Extension/Rights.php +++ b/library/Zend/Gdata/App/Extension/Rights.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rights.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rights.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Rights extends Zend_Gdata_App_Extension_Text diff --git a/library/Zend/Gdata/App/Extension/Source.php b/library/Zend/Gdata/App/Extension/Source.php index 6eb013188..a70b2b021 100644 --- a/library/Zend/Gdata/App/Extension/Source.php +++ b/library/Zend/Gdata/App/Extension/Source.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Source.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Source.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Source extends Zend_Gdata_App_FeedSourceParent diff --git a/library/Zend/Gdata/App/Extension/Subtitle.php b/library/Zend/Gdata/App/Extension/Subtitle.php index 18d0d7671..c93e957f5 100644 --- a/library/Zend/Gdata/App/Extension/Subtitle.php +++ b/library/Zend/Gdata/App/Extension/Subtitle.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subtitle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Subtitle.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Subtitle extends Zend_Gdata_App_Extension_Text diff --git a/library/Zend/Gdata/App/Extension/Summary.php b/library/Zend/Gdata/App/Extension/Summary.php index d1bd7563d..0c2326de1 100644 --- a/library/Zend/Gdata/App/Extension/Summary.php +++ b/library/Zend/Gdata/App/Extension/Summary.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Summary.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Summary.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Summary extends Zend_Gdata_App_Extension_Text diff --git a/library/Zend/Gdata/App/Extension/Text.php b/library/Zend/Gdata/App/Extension/Text.php index 4e64b7157..aabf4d053 100644 --- a/library/Zend/Gdata/App/Extension/Text.php +++ b/library/Zend/Gdata/App/Extension/Text.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension_Text extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Title.php b/library/Zend/Gdata/App/Extension/Title.php index 4c508ec64..8b389db75 100644 --- a/library/Zend/Gdata/App/Extension/Title.php +++ b/library/Zend/Gdata/App/Extension/Title.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Title.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Title.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Title extends Zend_Gdata_App_Extension_Text diff --git a/library/Zend/Gdata/App/Extension/Updated.php b/library/Zend/Gdata/App/Extension/Updated.php index 9ea4b029b..2fd023039 100644 --- a/library/Zend/Gdata/App/Extension/Updated.php +++ b/library/Zend/Gdata/App/Extension/Updated.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Updated.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Updated.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Updated extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Extension/Uri.php b/library/Zend/Gdata/App/Extension/Uri.php index c1bff2a6d..884d26337 100644 --- a/library/Zend/Gdata/App/Extension/Uri.php +++ b/library/Zend/Gdata/App/Extension/Uri.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Uri.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Uri extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/App/Feed.php b/library/Zend/Gdata/App/Feed.php old mode 100644 new mode 100755 index 2ee7a34f7..60f792ac0 --- a/library/Zend/Gdata/App/Feed.php +++ b/library/Zend/Gdata/App/Feed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 22880 2010-08-21 23:44:00Z ramon $ + * @version $Id: Feed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent diff --git a/library/Zend/Gdata/App/FeedEntryParent.php b/library/Zend/Gdata/App/FeedEntryParent.php old mode 100644 new mode 100755 index efd9eb2c7..316bf907a --- a/library/Zend/Gdata/App/FeedEntryParent.php +++ b/library/Zend/Gdata/App/FeedEntryParent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedEntryParent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedEntryParent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -77,7 +77,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base diff --git a/library/Zend/Gdata/App/FeedSourceParent.php b/library/Zend/Gdata/App/FeedSourceParent.php index 87ae100fd..7b8ce9539 100644 --- a/library/Zend/Gdata/App/FeedSourceParent.php +++ b/library/Zend/Gdata/App/FeedSourceParent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedSourceParent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedSourceParent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryParent diff --git a/library/Zend/Gdata/App/HttpException.php b/library/Zend/Gdata/App/HttpException.php index 7ea37b138..aa45d6f79 100644 --- a/library/Zend/Gdata/App/HttpException.php +++ b/library/Zend/Gdata/App/HttpException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_HttpException extends Zend_Gdata_App_Exception diff --git a/library/Zend/Gdata/App/IOException.php b/library/Zend/Gdata/App/IOException.php index 91b05a1f8..35512b686 100644 --- a/library/Zend/Gdata/App/IOException.php +++ b/library/Zend/Gdata/App/IOException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IOException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: IOException.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_IOException extends Zend_Gdata_App_Exception diff --git a/library/Zend/Gdata/App/InvalidArgumentException.php b/library/Zend/Gdata/App/InvalidArgumentException.php index ff6c956e5..bcb907cbd 100644 --- a/library/Zend/Gdata/App/InvalidArgumentException.php +++ b/library/Zend/Gdata/App/InvalidArgumentException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InvalidArgumentException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InvalidArgumentException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_InvalidArgumentException extends Zend_Gdata_App_Exception diff --git a/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php b/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php index e054fa0b1..336c92562 100644 --- a/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php +++ b/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @version $Id: LoggingHttpClientAdapterSocket.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: LoggingHttpClientAdapterSocket.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_LoggingHttpClientAdapterSocket extends Zend_Http_Client_Adapter_Socket diff --git a/library/Zend/Gdata/App/MediaEntry.php b/library/Zend/Gdata/App/MediaEntry.php index 174aca61c..95a62c99c 100644 --- a/library/Zend/Gdata/App/MediaEntry.php +++ b/library/Zend/Gdata/App/MediaEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_MediaEntry extends Zend_Gdata_App_Entry diff --git a/library/Zend/Gdata/App/MediaFileSource.php b/library/Zend/Gdata/App/MediaFileSource.php index 24f1e749d..db490ef4c 100644 --- a/library/Zend/Gdata/App/MediaFileSource.php +++ b/library/Zend/Gdata/App/MediaFileSource.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaFileSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaFileSource.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource diff --git a/library/Zend/Gdata/App/MediaSource.php b/library/Zend/Gdata/App/MediaSource.php index ddab69710..6244abb6b 100644 --- a/library/Zend/Gdata/App/MediaSource.php +++ b/library/Zend/Gdata/App/MediaSource.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaSource.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Gdata_App_MediaSource diff --git a/library/Zend/Gdata/App/Util.php b/library/Zend/Gdata/App/Util.php index 179078214..011a0c178 100644 --- a/library/Zend/Gdata/App/Util.php +++ b/library/Zend/Gdata/App/Util.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Util.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Util.php 24648 2012-02-25 22:06:01Z adamlundrigan $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Util @@ -45,7 +45,7 @@ public static function formatTimestamp($timestamp) $rfc3339 = '/^(\d{4})\-?(\d{2})\-?(\d{2})((T|t)(\d{2})\:?(\d{2})' . '\:?(\d{2})(\.\d{1,})?((Z|z)|([\+\-])(\d{2})\:?(\d{2})))?$/'; - if (ctype_digit($timestamp)) { + if (ctype_digit((string)$timestamp)) { return gmdate('Y-m-d\TH:i:sP', $timestamp); } elseif (preg_match($rfc3339, $timestamp) > 0) { // timestamp is already properly formatted diff --git a/library/Zend/Gdata/App/VersionException.php b/library/Zend/Gdata/App/VersionException.php index fc44f759f..f5aa07594 100644 --- a/library/Zend/Gdata/App/VersionException.php +++ b/library/Zend/Gdata/App/VersionException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VersionException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VersionException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_VersionException extends Zend_Gdata_App_Exception diff --git a/library/Zend/Gdata/AuthSub.php b/library/Zend/Gdata/AuthSub.php index 330b3b03c..22936458b 100644 --- a/library/Zend/Gdata/AuthSub.php +++ b/library/Zend/Gdata/AuthSub.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AuthSub.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AuthSub.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_AuthSub @@ -169,6 +169,7 @@ public static function AuthSubRevokeToken($token, $client = null, try { $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { + ob_end_clean(); // require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } @@ -210,6 +211,7 @@ public static function getAuthSubTokenInfo( try { $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { + ob_end_clean(); // require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } @@ -229,9 +231,9 @@ public static function getHttpClient($token, $client = null) if ($client == null) { $client = new Zend_Gdata_HttpClient(); } - if (!$client instanceof Zend_Http_Client) { + if (!$client instanceof Zend_Gdata_HttpClient) { // require_once 'Zend/Gdata/App/HttpException.php'; - throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Http_Client.'); + throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Gdata_HttpClient.'); } $useragent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION; $client->setConfig(array( diff --git a/library/Zend/Gdata/Books.php b/library/Zend/Gdata/Books.php old mode 100644 new mode 100755 index ee4558fb7..a77b863db --- a/library/Zend/Gdata/Books.php +++ b/library/Zend/Gdata/Books.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Books.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Books.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,14 +57,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books extends Zend_Gdata { - const VOLUME_FEED_URI = 'http://books.google.com/books/feeds/volumes'; - const MY_LIBRARY_FEED_URI = 'http://books.google.com/books/feeds/users/me/collections/library/volumes'; - const MY_ANNOTATION_FEED_URI = 'http://books.google.com/books/feeds/users/me/volumes'; + const VOLUME_FEED_URI = 'https://books.google.com/books/feeds/volumes'; + const MY_LIBRARY_FEED_URI = 'https://books.google.com/books/feeds/users/me/collections/library/volumes'; + const MY_ANNOTATION_FEED_URI = 'https://books.google.com/books/feeds/users/me/volumes'; const AUTH_SERVICE_NAME = 'print'; /** diff --git a/library/Zend/Gdata/Books/CollectionEntry.php b/library/Zend/Gdata/Books/CollectionEntry.php index a29e95f37..796506c2a 100644 --- a/library/Zend/Gdata/Books/CollectionEntry.php +++ b/library/Zend/Gdata/Books/CollectionEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CollectionEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CollectionEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_CollectionEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Books/CollectionFeed.php b/library/Zend/Gdata/Books/CollectionFeed.php index cfeaa6fe5..bac2b56df 100644 --- a/library/Zend/Gdata/Books/CollectionFeed.php +++ b/library/Zend/Gdata/Books/CollectionFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CollectionFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CollectionFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_CollectionFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Books/Extension/AnnotationLink.php b/library/Zend/Gdata/Books/Extension/AnnotationLink.php index 8d258b7c3..d123f04cf 100644 --- a/library/Zend/Gdata/Books/Extension/AnnotationLink.php +++ b/library/Zend/Gdata/Books/Extension/AnnotationLink.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AnnotationLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AnnotationLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_AnnotationLink extends diff --git a/library/Zend/Gdata/Books/Extension/BooksCategory.php b/library/Zend/Gdata/Books/Extension/BooksCategory.php index 67bfbffee..ff97c934f 100644 --- a/library/Zend/Gdata/Books/Extension/BooksCategory.php +++ b/library/Zend/Gdata/Books/Extension/BooksCategory.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BooksCategory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BooksCategory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_BooksCategory extends diff --git a/library/Zend/Gdata/Books/Extension/BooksLink.php b/library/Zend/Gdata/Books/Extension/BooksLink.php index 53209a91b..37556e987 100644 --- a/library/Zend/Gdata/Books/Extension/BooksLink.php +++ b/library/Zend/Gdata/Books/Extension/BooksLink.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BooksLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BooksLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_BooksLink extends Zend_Gdata_App_Extension_Link diff --git a/library/Zend/Gdata/Books/Extension/Embeddability.php b/library/Zend/Gdata/Books/Extension/Embeddability.php index d902743d9..40fbc3ee9 100644 --- a/library/Zend/Gdata/Books/Extension/Embeddability.php +++ b/library/Zend/Gdata/Books/Extension/Embeddability.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Embeddability.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Embeddability.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Embeddability extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Books/Extension/InfoLink.php b/library/Zend/Gdata/Books/Extension/InfoLink.php index 19add7eef..ea0ac2101 100644 --- a/library/Zend/Gdata/Books/Extension/InfoLink.php +++ b/library/Zend/Gdata/Books/Extension/InfoLink.php @@ -17,7 +17,7 @@ * @package Zend_Gdata * @subpackage Books * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InfoLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InfoLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_InfoLink extends diff --git a/library/Zend/Gdata/Books/Extension/PreviewLink.php b/library/Zend/Gdata/Books/Extension/PreviewLink.php index a695b8804..4696e2037 100644 --- a/library/Zend/Gdata/Books/Extension/PreviewLink.php +++ b/library/Zend/Gdata/Books/Extension/PreviewLink.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PreviewLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PreviewLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_PreviewLink extends diff --git a/library/Zend/Gdata/Books/Extension/Review.php b/library/Zend/Gdata/Books/Extension/Review.php index 258998100..7fe144ad1 100644 --- a/library/Zend/Gdata/Books/Extension/Review.php +++ b/library/Zend/Gdata/Books/Extension/Review.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Review.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Review.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Review extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Books/Extension/ThumbnailLink.php b/library/Zend/Gdata/Books/Extension/ThumbnailLink.php index 4d2327ea6..89126e43e 100644 --- a/library/Zend/Gdata/Books/Extension/ThumbnailLink.php +++ b/library/Zend/Gdata/Books/Extension/ThumbnailLink.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ThumbnailLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ThumbnailLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_ThumbnailLink extends diff --git a/library/Zend/Gdata/Books/Extension/Viewability.php b/library/Zend/Gdata/Books/Extension/Viewability.php index 8bd7979f7..567430302 100644 --- a/library/Zend/Gdata/Books/Extension/Viewability.php +++ b/library/Zend/Gdata/Books/Extension/Viewability.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Viewability.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Viewability.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Viewability extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Books/VolumeEntry.php b/library/Zend/Gdata/Books/VolumeEntry.php index 16e93a54f..4a1196dd9 100644 --- a/library/Zend/Gdata/Books/VolumeEntry.php +++ b/library/Zend/Gdata/Books/VolumeEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VolumeEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VolumeEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -102,7 +102,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Books/VolumeFeed.php b/library/Zend/Gdata/Books/VolumeFeed.php index bd2852692..75c4c0401 100644 --- a/library/Zend/Gdata/Books/VolumeFeed.php +++ b/library/Zend/Gdata/Books/VolumeFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VolumeFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VolumeFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Books/VolumeQuery.php b/library/Zend/Gdata/Books/VolumeQuery.php old mode 100644 new mode 100755 index 3afb4680e..5384e7929 --- a/library/Zend/Gdata/Books/VolumeQuery.php +++ b/library/Zend/Gdata/Books/VolumeQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VolumeQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VolumeQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeQuery extends Zend_Gdata_Query diff --git a/library/Zend/Gdata/Calendar.php b/library/Zend/Gdata/Calendar.php index af9509e2b..d91788988 100644 --- a/library/Zend/Gdata/Calendar.php +++ b/library/Zend/Gdata/Calendar.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Calendar.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Calendar.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -53,14 +53,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar extends Zend_Gdata { - const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds'; - const CALENDAR_EVENT_FEED_URI = 'http://www.google.com/calendar/feeds/default/private/full'; + const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds'; + const CALENDAR_EVENT_FEED_URI = 'https://www.google.com/calendar/feeds/default/private/full'; const AUTH_SERVICE_NAME = 'cl'; protected $_defaultPostUri = self::CALENDAR_EVENT_FEED_URI; diff --git a/library/Zend/Gdata/Calendar/EventEntry.php b/library/Zend/Gdata/Calendar/EventEntry.php index 58e945ac7..19aec41a2 100644 --- a/library/Zend/Gdata/Calendar/EventEntry.php +++ b/library/Zend/Gdata/Calendar/EventEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventEntry extends Zend_Gdata_Kind_EventEntry diff --git a/library/Zend/Gdata/Calendar/EventFeed.php b/library/Zend/Gdata/Calendar/EventFeed.php index 630ebc189..8cdbe36b5 100644 --- a/library/Zend/Gdata/Calendar/EventFeed.php +++ b/library/Zend/Gdata/Calendar/EventFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Calendar/EventQuery.php b/library/Zend/Gdata/Calendar/EventQuery.php index e8f389e8d..36df30576 100644 --- a/library/Zend/Gdata/Calendar/EventQuery.php +++ b/library/Zend/Gdata/Calendar/EventQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query { - const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds'; + const CALENDAR_FEED_URI = 'https://www.google.com/calendar/feeds'; /** * The default URI used for feeds. @@ -91,9 +91,9 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query /** * Create Gdata_Calendar_EventQuery object. If a URL is provided, * it becomes the base URL, and additional URL components may be - * appended. For instance, if $url is 'http://www.google.com/calendar', + * appended. For instance, if $url is 'https://www.google.com/calendar', * the default URL constructed will be - * 'http://www.google.com/calendar/default/public/full'. + * 'https://www.google.com/calendar/default/public/full'. * * If the URL already contains a calendar ID, projection, visibility, * event ID, or comment ID, you will need to set these fields to null diff --git a/library/Zend/Gdata/Calendar/Extension/AccessLevel.php b/library/Zend/Gdata/Calendar/Extension/AccessLevel.php index 72c9d8048..6c52cb0a9 100644 --- a/library/Zend/Gdata/Calendar/Extension/AccessLevel.php +++ b/library/Zend/Gdata/Calendar/Extension/AccessLevel.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccessLevel.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccessLevel.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_AccessLevel extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/Color.php b/library/Zend/Gdata/Calendar/Extension/Color.php index efc86ed38..20ca1b807 100644 --- a/library/Zend/Gdata/Calendar/Extension/Color.php +++ b/library/Zend/Gdata/Calendar/Extension/Color.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Color.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Color.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Color extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/Hidden.php b/library/Zend/Gdata/Calendar/Extension/Hidden.php index 236689eef..f95a82541 100644 --- a/library/Zend/Gdata/Calendar/Extension/Hidden.php +++ b/library/Zend/Gdata/Calendar/Extension/Hidden.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hidden.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hidden.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Hidden extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/Link.php b/library/Zend/Gdata/Calendar/Extension/Link.php index 04203e8aa..2e5095d50 100644 --- a/library/Zend/Gdata/Calendar/Extension/Link.php +++ b/library/Zend/Gdata/Calendar/Extension/Link.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Link extends Zend_Gdata_App_Extension_Link diff --git a/library/Zend/Gdata/Calendar/Extension/QuickAdd.php b/library/Zend/Gdata/Calendar/Extension/QuickAdd.php index 0427f9d75..c21bf35c5 100644 --- a/library/Zend/Gdata/Calendar/Extension/QuickAdd.php +++ b/library/Zend/Gdata/Calendar/Extension/QuickAdd.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QuickAdd.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QuickAdd.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_QuickAdd extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/Selected.php b/library/Zend/Gdata/Calendar/Extension/Selected.php index 4bab2ea37..ea4e95857 100644 --- a/library/Zend/Gdata/Calendar/Extension/Selected.php +++ b/library/Zend/Gdata/Calendar/Extension/Selected.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Selected.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Selected.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Selected extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php b/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php index 90faef363..a4c449b7a 100644 --- a/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php +++ b/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendEventNotifications.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SendEventNotifications.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_SendEventNotifications extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/Timezone.php b/library/Zend/Gdata/Calendar/Extension/Timezone.php index 84fdabf64..5aa38b9de 100644 --- a/library/Zend/Gdata/Calendar/Extension/Timezone.php +++ b/library/Zend/Gdata/Calendar/Extension/Timezone.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Timezone.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Timezone.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Timezone extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Calendar/Extension/WebContent.php b/library/Zend/Gdata/Calendar/Extension/WebContent.php index 8b4a3a647..a7c095f95 100644 --- a/library/Zend/Gdata/Calendar/Extension/WebContent.php +++ b/library/Zend/Gdata/Calendar/Extension/WebContent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WebContent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WebContent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_WebContent extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/Calendar/ListEntry.php b/library/Zend/Gdata/Calendar/ListEntry.php index 266ced166..e06cb696a 100644 --- a/library/Zend/Gdata/Calendar/ListEntry.php +++ b/library/Zend/Gdata/Calendar/ListEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -69,7 +69,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_ListEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Calendar/ListFeed.php b/library/Zend/Gdata/Calendar/ListFeed.php index 708b37777..f5374015b 100644 --- a/library/Zend/Gdata/Calendar/ListFeed.php +++ b/library/Zend/Gdata/Calendar/ListFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_ListFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/ClientLogin.php b/library/Zend/Gdata/ClientLogin.php index 82d69ea46..4c2b867c2 100644 --- a/library/Zend/Gdata/ClientLogin.php +++ b/library/Zend/Gdata/ClientLogin.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ClientLogin.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ClientLogin.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_ClientLogin diff --git a/library/Zend/Gdata/Docs.php b/library/Zend/Gdata/Docs.php old mode 100644 new mode 100755 index daa453f09..67795b821 --- a/library/Zend/Gdata/Docs.php +++ b/library/Zend/Gdata/Docs.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docs.php 20112 2010-01-07 02:39:32Z tjohns $ + * @version $Id: Docs.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -53,14 +53,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs extends Zend_Gdata { - const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents/private/full'; - const DOCUMENTS_FOLDER_FEED_URI = 'http://docs.google.com/feeds/folders/private/full'; + const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents/private/full'; + const DOCUMENTS_FOLDER_FEED_URI = 'https://docs.google.com/feeds/folders/private/full'; const DOCUMENTS_CATEGORY_SCHEMA = 'http://schemas.google.com/g/2005#kind'; const DOCUMENTS_CATEGORY_TERM = 'http://schemas.google.com/docs/2007#folder'; const AUTH_SERVICE_NAME = 'writely'; @@ -162,7 +162,7 @@ public function getDocumentListEntry($location = null) * @return Zend_Gdata_Docs_DocumentListEntry */ public function getDoc($docId, $docType) { - $location = 'http://docs.google.com/feeds/documents/private/full/' . + $location = 'https://docs.google.com/feeds/documents/private/full/' . $docType . '%3A' . $docId; return $this->getDocumentListEntry($location); } @@ -215,7 +215,7 @@ public function getPresentation($id) { * which are enumerated in SUPPORTED_FILETYPES. * @param string $uri (optional) The URL to which the upload should be * made. - * Example: 'http://docs.google.com/feeds/documents/private/full'. + * Example: 'https://docs.google.com/feeds/documents/private/full'. * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly * created Google Document. */ @@ -265,7 +265,7 @@ public function uploadFile($fileLocation, $title=null, $mimeType=null, * the appropriate type doesn't exist yet. */ public function createFolder($folderName, $folderResourceId=null) { - $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, + $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, self::DOCUMENTS_CATEGORY_SCHEMA); $title = new Zend_Gdata_App_Extension_Title($folderName); $entry = new Zend_Gdata_Entry(); diff --git a/library/Zend/Gdata/Docs/DocumentListEntry.php b/library/Zend/Gdata/Docs/DocumentListEntry.php old mode 100644 new mode 100755 index c11fc382b..73b27ee31 --- a/library/Zend/Gdata/Docs/DocumentListEntry.php +++ b/library/Zend/Gdata/Docs/DocumentListEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentListEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_DocumentListEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Docs/DocumentListFeed.php b/library/Zend/Gdata/Docs/DocumentListFeed.php old mode 100644 new mode 100755 index 401f44529..a02047e9e --- a/library/Zend/Gdata/Docs/DocumentListFeed.php +++ b/library/Zend/Gdata/Docs/DocumentListFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentListFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_DocumentListFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Docs/Query.php b/library/Zend/Gdata/Docs/Query.php old mode 100644 new mode 100755 index 3e97986c4..d692a678e --- a/library/Zend/Gdata/Docs/Query.php +++ b/library/Zend/Gdata/Docs/Query.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query @@ -45,7 +45,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query * * @var string */ - const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents'; + const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/documents'; /** * The generic base URL used by some inherited methods diff --git a/library/Zend/Gdata/DublinCore.php b/library/Zend/Gdata/DublinCore.php old mode 100644 new mode 100755 index 58ca0fcaf..5860ddf76 --- a/library/Zend/Gdata/DublinCore.php +++ b/library/Zend/Gdata/DublinCore.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DublinCore.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DublinCore.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore extends Zend_Gdata diff --git a/library/Zend/Gdata/DublinCore/Extension/Creator.php b/library/Zend/Gdata/DublinCore/Extension/Creator.php index ab4ef49da..f92f6cf59 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Creator.php +++ b/library/Zend/Gdata/DublinCore/Extension/Creator.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Creator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Creator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Creator extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Date.php b/library/Zend/Gdata/DublinCore/Extension/Date.php index 88d6d73c4..c8a786ff4 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Date.php +++ b/library/Zend/Gdata/DublinCore/Extension/Date.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Date.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Date extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Description.php b/library/Zend/Gdata/DublinCore/Extension/Description.php index 1ef2fd12d..060f1b7b6 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Description.php +++ b/library/Zend/Gdata/DublinCore/Extension/Description.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Description.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Description extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Format.php b/library/Zend/Gdata/DublinCore/Extension/Format.php index 4aa3cba76..3e4eef1a7 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Format.php +++ b/library/Zend/Gdata/DublinCore/Extension/Format.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Format.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Format.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Format extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Identifier.php b/library/Zend/Gdata/DublinCore/Extension/Identifier.php index 3b5dd6347..55316e5c9 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Identifier.php +++ b/library/Zend/Gdata/DublinCore/Extension/Identifier.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identifier.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Identifier.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Identifier extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Language.php b/library/Zend/Gdata/DublinCore/Extension/Language.php index 38250a6b0..729f48700 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Language.php +++ b/library/Zend/Gdata/DublinCore/Extension/Language.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Language.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Language.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Language extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Publisher.php b/library/Zend/Gdata/DublinCore/Extension/Publisher.php index b068c62c9..54a7760fa 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Publisher.php +++ b/library/Zend/Gdata/DublinCore/Extension/Publisher.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Publisher.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Publisher.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Publisher extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Rights.php b/library/Zend/Gdata/DublinCore/Extension/Rights.php index b152d444f..df4c506b2 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Rights.php +++ b/library/Zend/Gdata/DublinCore/Extension/Rights.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rights.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rights.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Rights extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Subject.php b/library/Zend/Gdata/DublinCore/Extension/Subject.php index 9ae7aec9a..15a24320c 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Subject.php +++ b/library/Zend/Gdata/DublinCore/Extension/Subject.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subject.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Subject.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Subject extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/DublinCore/Extension/Title.php b/library/Zend/Gdata/DublinCore/Extension/Title.php index d8b123a74..29502355a 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Title.php +++ b/library/Zend/Gdata/DublinCore/Extension/Title.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Title.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Title.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Title extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Entry.php b/library/Zend/Gdata/Entry.php index 7aac7e71c..6c6d3d819 100644 --- a/library/Zend/Gdata/Entry.php +++ b/library/Zend/Gdata/Entry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry diff --git a/library/Zend/Gdata/Exif.php b/library/Zend/Gdata/Exif.php old mode 100644 new mode 100755 index 6fe569237..90e65b7d6 --- a/library/Zend/Gdata/Exif.php +++ b/library/Zend/Gdata/Exif.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exif.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exif.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif extends Zend_Gdata diff --git a/library/Zend/Gdata/Exif/Entry.php b/library/Zend/Gdata/Exif/Entry.php old mode 100644 new mode 100755 index 6ba5a4ca1..3a9ae8373 --- a/library/Zend/Gdata/Exif/Entry.php +++ b/library/Zend/Gdata/Exif/Entry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Entry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Exif/Extension/Distance.php b/library/Zend/Gdata/Exif/Extension/Distance.php old mode 100644 new mode 100755 index f018bd730..306da234f --- a/library/Zend/Gdata/Exif/Extension/Distance.php +++ b/library/Zend/Gdata/Exif/Extension/Distance.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Distance.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Distance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Distance extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Exposure.php b/library/Zend/Gdata/Exif/Extension/Exposure.php old mode 100644 new mode 100755 index 76fc4bbe6..1beb2ed0d --- a/library/Zend/Gdata/Exif/Extension/Exposure.php +++ b/library/Zend/Gdata/Exif/Extension/Exposure.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exposure.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exposure.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Exposure extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/FStop.php b/library/Zend/Gdata/Exif/Extension/FStop.php old mode 100644 new mode 100755 index 848695e2e..cf64485af --- a/library/Zend/Gdata/Exif/Extension/FStop.php +++ b/library/Zend/Gdata/Exif/Extension/FStop.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FStop.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FStop.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_FStop extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Flash.php b/library/Zend/Gdata/Exif/Extension/Flash.php old mode 100644 new mode 100755 index 2c0da31b8..7f722f87c --- a/library/Zend/Gdata/Exif/Extension/Flash.php +++ b/library/Zend/Gdata/Exif/Extension/Flash.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Flash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Flash.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Flash extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/FocalLength.php b/library/Zend/Gdata/Exif/Extension/FocalLength.php old mode 100644 new mode 100755 index 74d37a0f9..d5f87c897 --- a/library/Zend/Gdata/Exif/Extension/FocalLength.php +++ b/library/Zend/Gdata/Exif/Extension/FocalLength.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FocalLength.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FocalLength.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_FocalLength extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php b/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php old mode 100644 new mode 100755 index 74459f75d..cd5c02a99 --- a/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php +++ b/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageUniqueId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageUniqueId.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_ImageUniqueId extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Iso.php b/library/Zend/Gdata/Exif/Extension/Iso.php old mode 100644 new mode 100755 index 747775ff4..4cd757fd8 --- a/library/Zend/Gdata/Exif/Extension/Iso.php +++ b/library/Zend/Gdata/Exif/Extension/Iso.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iso.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Iso.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Iso extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Make.php b/library/Zend/Gdata/Exif/Extension/Make.php old mode 100644 new mode 100755 index ce332a8e6..9b5b95a2d --- a/library/Zend/Gdata/Exif/Extension/Make.php +++ b/library/Zend/Gdata/Exif/Extension/Make.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Make.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Make.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Make extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Model.php b/library/Zend/Gdata/Exif/Extension/Model.php old mode 100644 new mode 100755 index 31d080896..a7bf99604 --- a/library/Zend/Gdata/Exif/Extension/Model.php +++ b/library/Zend/Gdata/Exif/Extension/Model.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Model.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Model.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Model extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Tags.php b/library/Zend/Gdata/Exif/Extension/Tags.php old mode 100644 new mode 100755 index dface93a0..83e185f79 --- a/library/Zend/Gdata/Exif/Extension/Tags.php +++ b/library/Zend/Gdata/Exif/Extension/Tags.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tags.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tags.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -87,7 +87,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Tags extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Extension/Time.php b/library/Zend/Gdata/Exif/Extension/Time.php old mode 100644 new mode 100755 index 426be9077..62e035b80 --- a/library/Zend/Gdata/Exif/Extension/Time.php +++ b/library/Zend/Gdata/Exif/Extension/Time.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Time.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Time.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Time extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Exif/Feed.php b/library/Zend/Gdata/Exif/Feed.php old mode 100644 new mode 100755 index 5e372b3e9..308c4d53f --- a/library/Zend/Gdata/Exif/Feed.php +++ b/library/Zend/Gdata/Exif/Feed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Feed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Extension.php b/library/Zend/Gdata/Extension.php index 509e826c2..396278e42 100644 --- a/library/Zend/Gdata/Extension.php +++ b/library/Zend/Gdata/Extension.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/Extension/AttendeeStatus.php b/library/Zend/Gdata/Extension/AttendeeStatus.php index a69c53a76..3939a86f6 100644 --- a/library/Zend/Gdata/Extension/AttendeeStatus.php +++ b/library/Zend/Gdata/Extension/AttendeeStatus.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AttendeeStatus.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AttendeeStatus.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_AttendeeStatus extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/AttendeeType.php b/library/Zend/Gdata/Extension/AttendeeType.php index 3221e223f..2416aac81 100644 --- a/library/Zend/Gdata/Extension/AttendeeType.php +++ b/library/Zend/Gdata/Extension/AttendeeType.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AttendeeType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AttendeeType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_AttendeeType extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Comments.php b/library/Zend/Gdata/Extension/Comments.php index 8644dc989..f4a7e6921 100644 --- a/library/Zend/Gdata/Extension/Comments.php +++ b/library/Zend/Gdata/Extension/Comments.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Comments.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Comments.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Comments extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/EntryLink.php b/library/Zend/Gdata/Extension/EntryLink.php index 507966553..bd4b03e97 100644 --- a/library/Zend/Gdata/Extension/EntryLink.php +++ b/library/Zend/Gdata/Extension/EntryLink.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EntryLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EntryLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_EntryLink extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/EventStatus.php b/library/Zend/Gdata/Extension/EventStatus.php index a413e08a7..ee3283f25 100644 --- a/library/Zend/Gdata/Extension/EventStatus.php +++ b/library/Zend/Gdata/Extension/EventStatus.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventStatus.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventStatus.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_EventStatus extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/ExtendedProperty.php b/library/Zend/Gdata/Extension/ExtendedProperty.php index 8fe938f8d..674efa843 100644 --- a/library/Zend/Gdata/Extension/ExtendedProperty.php +++ b/library/Zend/Gdata/Extension/ExtendedProperty.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExtendedProperty.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ExtendedProperty.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_ExtendedProperty extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/FeedLink.php b/library/Zend/Gdata/Extension/FeedLink.php index d3b9b3664..0dcad2058 100644 --- a/library/Zend/Gdata/Extension/FeedLink.php +++ b/library/Zend/Gdata/Extension/FeedLink.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FeedLink.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FeedLink.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_FeedLink extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php b/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php index 35319b557..7e89f2416 100644 --- a/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php +++ b/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenSearchItemsPerPage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenSearchItemsPerPage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchItemsPerPage extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/OpenSearchStartIndex.php b/library/Zend/Gdata/Extension/OpenSearchStartIndex.php index 425c6a9e8..838927478 100644 --- a/library/Zend/Gdata/Extension/OpenSearchStartIndex.php +++ b/library/Zend/Gdata/Extension/OpenSearchStartIndex.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenSearchStartIndex.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenSearchStartIndex.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchStartIndex extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/OpenSearchTotalResults.php b/library/Zend/Gdata/Extension/OpenSearchTotalResults.php index 998547481..823e7527d 100644 --- a/library/Zend/Gdata/Extension/OpenSearchTotalResults.php +++ b/library/Zend/Gdata/Extension/OpenSearchTotalResults.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenSearchTotalResults.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenSearchTotalResults.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchTotalResults extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/OriginalEvent.php b/library/Zend/Gdata/Extension/OriginalEvent.php index 42fa18401..97fd39758 100644 --- a/library/Zend/Gdata/Extension/OriginalEvent.php +++ b/library/Zend/Gdata/Extension/OriginalEvent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OriginalEvent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OriginalEvent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OriginalEvent extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Rating.php b/library/Zend/Gdata/Extension/Rating.php index 9138fb13e..eaff45229 100644 --- a/library/Zend/Gdata/Extension/Rating.php +++ b/library/Zend/Gdata/Extension/Rating.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rating.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rating.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Rating extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Recurrence.php b/library/Zend/Gdata/Extension/Recurrence.php index 4915a43c7..57fb645a1 100644 --- a/library/Zend/Gdata/Extension/Recurrence.php +++ b/library/Zend/Gdata/Extension/Recurrence.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Recurrence.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Recurrence.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Recurrence extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/RecurrenceException.php b/library/Zend/Gdata/Extension/RecurrenceException.php index 9f1f8117e..4adeabacf 100644 --- a/library/Zend/Gdata/Extension/RecurrenceException.php +++ b/library/Zend/Gdata/Extension/RecurrenceException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecurrenceException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecurrenceException.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_RecurrenceException extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Reminder.php b/library/Zend/Gdata/Extension/Reminder.php index 5a4d0bec4..6b8aaa3b8 100644 --- a/library/Zend/Gdata/Extension/Reminder.php +++ b/library/Zend/Gdata/Extension/Reminder.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reminder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reminder.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Reminder extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Transparency.php b/library/Zend/Gdata/Extension/Transparency.php index b3650c4dd..2a7cabeb1 100644 --- a/library/Zend/Gdata/Extension/Transparency.php +++ b/library/Zend/Gdata/Extension/Transparency.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Transparency.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Transparency.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Transparency extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Visibility.php b/library/Zend/Gdata/Extension/Visibility.php index aa0031dde..43bea7ee4 100644 --- a/library/Zend/Gdata/Extension/Visibility.php +++ b/library/Zend/Gdata/Extension/Visibility.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Visibility.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Visibility.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Visibility extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/When.php b/library/Zend/Gdata/Extension/When.php index eec657cf9..ef7d1bdf6 100644 --- a/library/Zend/Gdata/Extension/When.php +++ b/library/Zend/Gdata/Extension/When.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: When.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: When.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_When extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Where.php b/library/Zend/Gdata/Extension/Where.php index 3c91d7bb7..1f0b8f9b1 100644 --- a/library/Zend/Gdata/Extension/Where.php +++ b/library/Zend/Gdata/Extension/Where.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Where.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Where.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Where extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Extension/Who.php b/library/Zend/Gdata/Extension/Who.php index c187326e5..8ac121d0b 100644 --- a/library/Zend/Gdata/Extension/Who.php +++ b/library/Zend/Gdata/Extension/Who.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Who.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Who.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Who extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Feed.php b/library/Zend/Gdata/Feed.php index 04a0c0476..e9ec634fd 100644 --- a/library/Zend/Gdata/Feed.php +++ b/library/Zend/Gdata/Feed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Feed extends Zend_Gdata_App_Feed diff --git a/library/Zend/Gdata/Gapps.php b/library/Zend/Gdata/Gapps.php index 13c6fe913..a5c5e06eb 100644 --- a/library/Zend/Gdata/Gapps.php +++ b/library/Zend/Gdata/Gapps.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gapps.php 22511 2010-07-01 01:41:46Z tjohns $ + * @version $Id: Gapps.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -76,7 +76,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps extends Zend_Gdata @@ -1178,7 +1178,7 @@ public function createGroup($groupId, $groupName, $description = null, $emailPer { $i = 0; $group = $this->newGroupEntry(); - + $properties[$i] = $this->newProperty(); $properties[$i]->name = 'groupId'; $properties[$i]->value = $groupId; @@ -1200,8 +1200,8 @@ public function createGroup($groupId, $groupName, $description = null, $emailPer $properties[$i]->name = 'emailPermission'; $properties[$i]->value = $emailPermission; $i++; - } - + } + $group->property = $properties; return $this->insertGroup($group); @@ -1240,7 +1240,7 @@ public function retrieveGroup($groupId) * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry objects * representing all groups apart of the domain. */ - public function retrieveAllGroups() + public function retrieveAllGroups() { return $this->retrieveAllEntriesForFeed($this->retrievePageOfGroups()); } @@ -1257,7 +1257,7 @@ public function deleteGroup($groupId) $this->delete($uri); } - + /** * Check to see if a member id or group id is a member of group * @@ -1269,7 +1269,7 @@ public function isMember($memberId, $groupId) { $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId . '/member/' . $memberId; - + //if the enitiy is not a member, an exception is thrown try { $results = $this->get($uri); @@ -1353,7 +1353,7 @@ public function addOwnerToGroup($email, $groupId) $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId . '/owner'; - + return $this->insertOwner($owner, $uri); } @@ -1383,9 +1383,9 @@ public function isOwner($email, $groupId) { $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId . '/owner/' . $email; - + //if the enitiy is not an owner of the group, an exception is thrown - try { + try { $results = $this->get($uri); } catch (Exception $e) { $results = false; @@ -1427,7 +1427,7 @@ public function updateGroup($groupId, $groupName = null, $description = null, { $i = 0; $group = $this->newGroupEntry(); - + $properties[$i] = $this->newProperty(); $properties[$i]->name = 'groupId'; $properties[$i]->value = $groupId; @@ -1453,20 +1453,20 @@ public function updateGroup($groupId, $groupName = null, $description = null, $properties[$i]->value = $emailPermission; $i++; } - + $group->property = $properties; $uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/'; $uri .= $this->getDomain() . '/' . $groupId; - return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry'); + return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry'); } /** * Retrieve all of the groups that a user is a member of * * @param string $memberId Member username - * @param bool $directOnly (Optional) If true, members with direct association + * @param bool $directOnly (Optional) If true, members with direct association * only will be considered * @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry * objects representing all groups member is apart of in the domain. diff --git a/library/Zend/Gdata/Gapps/EmailListEntry.php b/library/Zend/Gdata/Gapps/EmailListEntry.php index 2a980a498..ecb979620 100644 --- a/library/Zend/Gdata/Gapps/EmailListEntry.php +++ b/library/Zend/Gdata/Gapps/EmailListEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/EmailListFeed.php b/library/Zend/Gdata/Gapps/EmailListFeed.php index 1e61eef3f..90c5a13c2 100644 --- a/library/Zend/Gdata/Gapps/EmailListFeed.php +++ b/library/Zend/Gdata/Gapps/EmailListFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/EmailListQuery.php b/library/Zend/Gdata/Gapps/EmailListQuery.php index d2481164e..7199f9782 100644 --- a/library/Zend/Gdata/Gapps/EmailListQuery.php +++ b/library/Zend/Gdata/Gapps/EmailListQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php index c67b54c3e..e68a810c9 100644 --- a/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php +++ b/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListRecipientEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListRecipientEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php b/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php index e5d05529e..44da45d74 100644 --- a/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php +++ b/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListRecipientFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListRecipientFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php b/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php index e8fd5bea7..0baf8ca55 100644 --- a/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php +++ b/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailListRecipientQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailListRecipientQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query diff --git a/library/Zend/Gdata/Gapps/Error.php b/library/Zend/Gdata/Gapps/Error.php index 1103b7717..c315c2a29 100644 --- a/library/Zend/Gdata/Gapps/Error.php +++ b/library/Zend/Gdata/Gapps/Error.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Error.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base diff --git a/library/Zend/Gdata/Gapps/Extension/EmailList.php b/library/Zend/Gdata/Gapps/Extension/EmailList.php index 93d5c9076..e2c2ecbdb 100644 --- a/library/Zend/Gdata/Gapps/Extension/EmailList.php +++ b/library/Zend/Gdata/Gapps/Extension/EmailList.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EmailList.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_EmailList extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Gapps/Extension/Login.php b/library/Zend/Gdata/Gapps/Extension/Login.php index 936ac5983..9a29cd559 100644 --- a/library/Zend/Gdata/Gapps/Extension/Login.php +++ b/library/Zend/Gdata/Gapps/Extension/Login.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Login.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Gapps/Extension/Name.php b/library/Zend/Gdata/Gapps/Extension/Name.php index 2faed2ab3..057cc5f19 100644 --- a/library/Zend/Gdata/Gapps/Extension/Name.php +++ b/library/Zend/Gdata/Gapps/Extension/Name.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Name extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Gapps/Extension/Nickname.php b/library/Zend/Gdata/Gapps/Extension/Nickname.php index 4bc10e28e..6d502e3f9 100644 --- a/library/Zend/Gdata/Gapps/Extension/Nickname.php +++ b/library/Zend/Gdata/Gapps/Extension/Nickname.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nickname.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nickname.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Nickname extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Gapps/Extension/Property.php b/library/Zend/Gdata/Gapps/Extension/Property.php index 5c51b9ddb..77c9190b3 100644 --- a/library/Zend/Gdata/Gapps/Extension/Property.php +++ b/library/Zend/Gdata/Gapps/Extension/Property.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: EmailList.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Property extends Zend_Gdata_Extension @@ -177,4 +177,3 @@ public function __toString() "\nProperty Value: " . $this->getValue(); } } -?> \ No newline at end of file diff --git a/library/Zend/Gdata/Gapps/Extension/Quota.php b/library/Zend/Gdata/Gapps/Extension/Quota.php index 875d57afc..f13a53419 100644 --- a/library/Zend/Gdata/Gapps/Extension/Quota.php +++ b/library/Zend/Gdata/Gapps/Extension/Quota.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Quota.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Quota.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Quota extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Gapps/GroupEntry.php b/library/Zend/Gdata/Gapps/GroupEntry.php index 4811ac7ce..2610872b5 100644 --- a/library/Zend/Gdata/Gapps/GroupEntry.php +++ b/library/Zend/Gdata/Gapps/GroupEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_GroupEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/GroupFeed.php b/library/Zend/Gdata/Gapps/GroupFeed.php index ab21d151a..8d9af4070 100644 --- a/library/Zend/Gdata/Gapps/GroupFeed.php +++ b/library/Zend/Gdata/Gapps/GroupFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_GroupFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/GroupQuery.php b/library/Zend/Gdata/Gapps/GroupQuery.php index 5814ef99f..f34deb57e 100644 --- a/library/Zend/Gdata/Gapps/GroupQuery.php +++ b/library/Zend/Gdata/Gapps/GroupQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_GroupQuery extends Zend_Gdata_Gapps_Query @@ -55,7 +55,7 @@ class Zend_Gdata_Gapps_GroupQuery extends Zend_Gdata_Gapps_Query * Create a new instance. * * @param string $domain (optional) The Google Apps-hosted domain to use - * when constructing query URIs. + * when constructing query URIs. * @param string $groupId (optional) Value for the groupId property. * @param string $startGroupName (optional) Value for the * startGroupName property. @@ -210,15 +210,15 @@ public function getQueryUrl() $uri = Zend_Gdata_Gapps::APPS_BASE_FEED_URI; $uri .= Zend_Gdata_Gapps::APPS_GROUP_PATH; $uri .= '/' . $this->_domain; - + if ($this->_groupId !== null) { $uri .= '/' . $this->_groupId; } - + if(array_key_exists('member', $this->_params)) { $uri .= '/'; } - + $uri .= $this->getQueryString(); return $uri; } diff --git a/library/Zend/Gdata/Gapps/MemberEntry.php b/library/Zend/Gdata/Gapps/MemberEntry.php index 284211fed..7b675cf04 100644 --- a/library/Zend/Gdata/Gapps/MemberEntry.php +++ b/library/Zend/Gdata/Gapps/MemberEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_MemberEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/MemberFeed.php b/library/Zend/Gdata/Gapps/MemberFeed.php index 75944978b..efa06d882 100644 --- a/library/Zend/Gdata/Gapps/MemberFeed.php +++ b/library/Zend/Gdata/Gapps/MemberFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_MemberFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/MemberQuery.php b/library/Zend/Gdata/Gapps/MemberQuery.php index c96470cd4..80cfc85c1 100644 --- a/library/Zend/Gdata/Gapps/MemberQuery.php +++ b/library/Zend/Gdata/Gapps/MemberQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_MemberQuery extends Zend_Gdata_Gapps_Query diff --git a/library/Zend/Gdata/Gapps/NicknameEntry.php b/library/Zend/Gdata/Gapps/NicknameEntry.php index 86d3f2f0f..7d644d016 100644 --- a/library/Zend/Gdata/Gapps/NicknameEntry.php +++ b/library/Zend/Gdata/Gapps/NicknameEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NicknameEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NicknameEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/NicknameFeed.php b/library/Zend/Gdata/Gapps/NicknameFeed.php index a845e1906..19bae8693 100644 --- a/library/Zend/Gdata/Gapps/NicknameFeed.php +++ b/library/Zend/Gdata/Gapps/NicknameFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NicknameFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NicknameFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/NicknameQuery.php b/library/Zend/Gdata/Gapps/NicknameQuery.php index ba526317a..5e7be0892 100644 --- a/library/Zend/Gdata/Gapps/NicknameQuery.php +++ b/library/Zend/Gdata/Gapps/NicknameQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NicknameQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NicknameQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query diff --git a/library/Zend/Gdata/Gapps/OwnerEntry.php b/library/Zend/Gdata/Gapps/OwnerEntry.php index 067148ce7..68f780a09 100644 --- a/library/Zend/Gdata/Gapps/OwnerEntry.php +++ b/library/Zend/Gdata/Gapps/OwnerEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_OwnerEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/OwnerFeed.php b/library/Zend/Gdata/Gapps/OwnerFeed.php index 4e54aab6d..dfd0ef7f2 100644 --- a/library/Zend/Gdata/Gapps/OwnerFeed.php +++ b/library/Zend/Gdata/Gapps/OwnerFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_OwnerFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/OwnerQuery.php b/library/Zend/Gdata/Gapps/OwnerQuery.php index 091653681..c37e8a244 100644 --- a/library/Zend/Gdata/Gapps/OwnerQuery.php +++ b/library/Zend/Gdata/Gapps/OwnerQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id:$ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_OwnerQuery extends Zend_Gdata_Gapps_Query @@ -76,7 +76,7 @@ public function __construct($domain = null, $groupId = null, $ownerEmail = null) * Set the group id to query for. * * @see getGroupId - * @param string $value + * @param string $value */ public function setGroupId($value) { @@ -133,9 +133,9 @@ public function getQueryUrl() throw new Zend_Gdata_App_InvalidArgumentException( 'groupId must not be null'); } - + $uri .= '/owner'; - + if ($this->_ownerEmail !== null) { $uri .= '/' . $this->_ownerEmail; } diff --git a/library/Zend/Gdata/Gapps/Query.php b/library/Zend/Gdata/Gapps/Query.php index 96e6401ac..58fa378e8 100644 --- a/library/Zend/Gdata/Gapps/Query.php +++ b/library/Zend/Gdata/Gapps/Query.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query diff --git a/library/Zend/Gdata/Gapps/ServiceException.php b/library/Zend/Gdata/Gapps/ServiceException.php index 0cfef6ff7..927679d32 100644 --- a/library/Zend/Gdata/Gapps/ServiceException.php +++ b/library/Zend/Gdata/Gapps/ServiceException.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServiceException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ServiceException.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception diff --git a/library/Zend/Gdata/Gapps/UserEntry.php b/library/Zend/Gdata/Gapps/UserEntry.php index 3c509579a..9c6a1af6f 100644 --- a/library/Zend/Gdata/Gapps/UserEntry.php +++ b/library/Zend/Gdata/Gapps/UserEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -61,7 +61,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gapps/UserFeed.php b/library/Zend/Gdata/Gapps/UserFeed.php index 70aa777b8..8b5997d93 100644 --- a/library/Zend/Gdata/Gapps/UserFeed.php +++ b/library/Zend/Gdata/Gapps/UserFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gapps/UserQuery.php b/library/Zend/Gdata/Gapps/UserQuery.php index 8d8229690..963b289de 100644 --- a/library/Zend/Gdata/Gapps/UserQuery.php +++ b/library/Zend/Gdata/Gapps/UserQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query diff --git a/library/Zend/Gdata/Gbase.php b/library/Zend/Gdata/Gbase.php index 621fcdf83..37a845887 100644 --- a/library/Zend/Gdata/Gbase.php +++ b/library/Zend/Gdata/Gbase.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gbase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gbase.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase extends Zend_Gdata @@ -63,12 +63,12 @@ class Zend_Gdata_Gbase extends Zend_Gdata /** * Path to the customer items feeds on the Google Base server. */ - const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items'; + const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items'; /** * Path to the snippets feeds on the Google Base server. */ - const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets'; + const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets'; /** * Authentication service name for Google Base diff --git a/library/Zend/Gdata/Gbase/Entry.php b/library/Zend/Gdata/Gbase/Entry.php index ef3a59594..e6347c8ee 100644 --- a/library/Zend/Gdata/Gbase/Entry.php +++ b/library/Zend/Gdata/Gbase/Entry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Entry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php index 227bc01f8..d9047eb93 100644 --- a/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php +++ b/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseAttribute.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BaseAttribute.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Extension_BaseAttribute extends Zend_Gdata_App_Extension_Element diff --git a/library/Zend/Gdata/Gbase/Feed.php b/library/Zend/Gdata/Gbase/Feed.php index b5c0bcf07..9b8bbe9ca 100644 --- a/library/Zend/Gdata/Gbase/Feed.php +++ b/library/Zend/Gdata/Gbase/Feed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Feed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gbase/ItemEntry.php b/library/Zend/Gdata/Gbase/ItemEntry.php index 1a87a2cfa..83cde03ce 100644 --- a/library/Zend/Gdata/Gbase/ItemEntry.php +++ b/library/Zend/Gdata/Gbase/ItemEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry diff --git a/library/Zend/Gdata/Gbase/ItemFeed.php b/library/Zend/Gdata/Gbase/ItemFeed.php index 1c5a15a9f..a7851ff2b 100644 --- a/library/Zend/Gdata/Gbase/ItemFeed.php +++ b/library/Zend/Gdata/Gbase/ItemFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gbase/ItemQuery.php b/library/Zend/Gdata/Gbase/ItemQuery.php index d4e3c020b..8e482bef1 100644 --- a/library/Zend/Gdata/Gbase/ItemQuery.php +++ b/library/Zend/Gdata/Gbase/ItemQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query @@ -48,7 +48,7 @@ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query /** * Path to the customer items feeds on the Google Base server. */ - const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items'; + const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items'; /** * The default URI for POST methods diff --git a/library/Zend/Gdata/Gbase/Query.php b/library/Zend/Gdata/Gbase/Query.php index 26db8763e..d683b14a0 100644 --- a/library/Zend/Gdata/Gbase/Query.php +++ b/library/Zend/Gdata/Gbase/Query.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query @@ -43,12 +43,12 @@ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query /** * Path to the customer items feeds on the Google Base server. */ - const GBASE_ITEM_FEED_URI = 'http://www.google.com/base/feeds/items'; + const GBASE_ITEM_FEED_URI = 'https://www.google.com/base/feeds/items'; /** * Path to the snippets feeds on the Google Base server. */ - const GBASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets'; + const GBASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets'; /** * The default URI for POST methods diff --git a/library/Zend/Gdata/Gbase/SnippetEntry.php b/library/Zend/Gdata/Gbase/SnippetEntry.php index 67f7aa9c2..fc359e4dc 100644 --- a/library/Zend/Gdata/Gbase/SnippetEntry.php +++ b/library/Zend/Gdata/Gbase/SnippetEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SnippetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SnippetEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetEntry extends Zend_Gdata_Gbase_Entry diff --git a/library/Zend/Gdata/Gbase/SnippetFeed.php b/library/Zend/Gdata/Gbase/SnippetFeed.php index b8e9c56c1..7a2f08962 100644 --- a/library/Zend/Gdata/Gbase/SnippetFeed.php +++ b/library/Zend/Gdata/Gbase/SnippetFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SnippetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SnippetFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Gbase/SnippetQuery.php b/library/Zend/Gdata/Gbase/SnippetQuery.php index af90640bd..8ea005773 100644 --- a/library/Zend/Gdata/Gbase/SnippetQuery.php +++ b/library/Zend/Gdata/Gbase/SnippetQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SnippetQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SnippetQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query @@ -47,7 +47,7 @@ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query /** * Path to the snippets feeds on the Google Base server. */ - const BASE_SNIPPET_FEED_URI = 'http://www.google.com/base/feeds/snippets'; + const BASE_SNIPPET_FEED_URI = 'https://www.google.com/base/feeds/snippets'; /** * The default URI for POST methods diff --git a/library/Zend/Gdata/Geo.php b/library/Zend/Gdata/Geo.php old mode 100644 new mode 100755 index 3a9aaa447..45e8834dd --- a/library/Zend/Gdata/Geo.php +++ b/library/Zend/Gdata/Geo.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Geo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Geo.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo extends Zend_Gdata diff --git a/library/Zend/Gdata/Geo/Entry.php b/library/Zend/Gdata/Geo/Entry.php old mode 100644 new mode 100755 index a9bad0b7e..7eac0afae --- a/library/Zend/Gdata/Geo/Entry.php +++ b/library/Zend/Gdata/Geo/Entry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Entry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php old mode 100644 new mode 100755 index 291c4ec56..8a978402d --- a/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php +++ b/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GeoRssWhere.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GeoRssWhere.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GeoRssWhere extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Geo/Extension/GmlPoint.php b/library/Zend/Gdata/Geo/Extension/GmlPoint.php old mode 100644 new mode 100755 index 65d707beb..32f0af785 --- a/library/Zend/Gdata/Geo/Extension/GmlPoint.php +++ b/library/Zend/Gdata/Geo/Extension/GmlPoint.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GmlPoint.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GmlPoint.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GmlPoint extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Geo/Extension/GmlPos.php b/library/Zend/Gdata/Geo/Extension/GmlPos.php old mode 100644 new mode 100755 index 1089e84d3..5ec311b94 --- a/library/Zend/Gdata/Geo/Extension/GmlPos.php +++ b/library/Zend/Gdata/Geo/Extension/GmlPos.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GmlPos.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GmlPos.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GmlPos extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Geo/Feed.php b/library/Zend/Gdata/Geo/Feed.php old mode 100644 new mode 100755 index 36fa7d158..bae39f52b --- a/library/Zend/Gdata/Geo/Feed.php +++ b/library/Zend/Gdata/Geo/Feed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Feed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Health.php b/library/Zend/Gdata/Health.php old mode 100644 new mode 100755 index 26228c775..0f6f751a6 --- a/library/Zend/Gdata/Health.php +++ b/library/Zend/Gdata/Health.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Health.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Health.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health extends Zend_Gdata diff --git a/library/Zend/Gdata/Health/Extension/Ccr.php b/library/Zend/Gdata/Health/Extension/Ccr.php old mode 100644 new mode 100755 index a04f290f2..fa77637f2 --- a/library/Zend/Gdata/Health/Extension/Ccr.php +++ b/library/Zend/Gdata/Health/Extension/Ccr.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ccr.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ccr.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element diff --git a/library/Zend/Gdata/Health/ProfileEntry.php b/library/Zend/Gdata/Health/ProfileEntry.php old mode 100644 new mode 100755 index 6204a3e4b..b36ec02c7 --- a/library/Zend/Gdata/Health/ProfileEntry.php +++ b/library/Zend/Gdata/Health/ProfileEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Health/ProfileFeed.php b/library/Zend/Gdata/Health/ProfileFeed.php old mode 100644 new mode 100755 index f7afd0b46..6fc1af973 --- a/library/Zend/Gdata/Health/ProfileFeed.php +++ b/library/Zend/Gdata/Health/ProfileFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Health/ProfileListEntry.php b/library/Zend/Gdata/Health/ProfileListEntry.php old mode 100644 new mode 100755 index a9a73cef6..50c8a6006 --- a/library/Zend/Gdata/Health/ProfileListEntry.php +++ b/library/Zend/Gdata/Health/ProfileListEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileListEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileListEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Health/ProfileListFeed.php b/library/Zend/Gdata/Health/ProfileListFeed.php old mode 100644 new mode 100755 index da33d9b79..88fa97fe0 --- a/library/Zend/Gdata/Health/ProfileListFeed.php +++ b/library/Zend/Gdata/Health/ProfileListFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProfileListFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileListFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Health/Query.php b/library/Zend/Gdata/Health/Query.php old mode 100644 new mode 100755 index 9161645bb..25a89f50c --- a/library/Zend/Gdata/Health/Query.php +++ b/library/Zend/Gdata/Health/Query.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_Query extends Zend_Gdata_Query diff --git a/library/Zend/Gdata/HttpAdapterStreamingProxy.php b/library/Zend/Gdata/HttpAdapterStreamingProxy.php index 06b4b89df..b3bff8cd6 100644 --- a/library/Zend/Gdata/HttpAdapterStreamingProxy.php +++ b/library/Zend/Gdata/HttpAdapterStreamingProxy.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpAdapterStreamingProxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpAdapterStreamingProxy.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Proxy diff --git a/library/Zend/Gdata/HttpAdapterStreamingSocket.php b/library/Zend/Gdata/HttpAdapterStreamingSocket.php index 0a54d9cc6..165eaada1 100644 --- a/library/Zend/Gdata/HttpAdapterStreamingSocket.php +++ b/library/Zend/Gdata/HttpAdapterStreamingSocket.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpAdapterStreamingSocket.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpAdapterStreamingSocket.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Socket diff --git a/library/Zend/Gdata/HttpClient.php b/library/Zend/Gdata/HttpClient.php index b8d962386..59682b329 100644 --- a/library/Zend/Gdata/HttpClient.php +++ b/library/Zend/Gdata/HttpClient.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpClient.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpClient.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpClient extends Zend_Http_Client diff --git a/library/Zend/Gdata/Kind/EventEntry.php b/library/Zend/Gdata/Kind/EventEntry.php index 83145787f..e2ccb22a5 100644 --- a/library/Zend/Gdata/Kind/EventEntry.php +++ b/library/Zend/Gdata/Kind/EventEntry.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EventEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EventEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -92,7 +92,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Kind_EventEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Media.php b/library/Zend/Gdata/Media.php old mode 100644 new mode 100755 index bd736b294..0ed983090 --- a/library/Zend/Gdata/Media.php +++ b/library/Zend/Gdata/Media.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Media.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Media.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media extends Zend_Gdata diff --git a/library/Zend/Gdata/Media/Entry.php b/library/Zend/Gdata/Media/Entry.php old mode 100644 new mode 100755 index 1c251a6e9..a91af69ef --- a/library/Zend/Gdata/Media/Entry.php +++ b/library/Zend/Gdata/Media/Entry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Entry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Entry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Entry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Media/Extension/MediaCategory.php b/library/Zend/Gdata/Media/Extension/MediaCategory.php old mode 100644 new mode 100755 index c096d6227..91ed47f9a --- a/library/Zend/Gdata/Media/Extension/MediaCategory.php +++ b/library/Zend/Gdata/Media/Extension/MediaCategory.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCategory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCategory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCategory extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaContent.php b/library/Zend/Gdata/Media/Extension/MediaContent.php old mode 100644 new mode 100755 index c93f75894..c1f8609f0 --- a/library/Zend/Gdata/Media/Extension/MediaContent.php +++ b/library/Zend/Gdata/Media/Extension/MediaContent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaContent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaContent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaContent extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaCopyright.php b/library/Zend/Gdata/Media/Extension/MediaCopyright.php old mode 100644 new mode 100755 index 5ac2283d2..5c0631810 --- a/library/Zend/Gdata/Media/Extension/MediaCopyright.php +++ b/library/Zend/Gdata/Media/Extension/MediaCopyright.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCopyright.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCopyright.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCopyright extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaCredit.php b/library/Zend/Gdata/Media/Extension/MediaCredit.php old mode 100644 new mode 100755 index 9b6934f61..c4abe7b55 --- a/library/Zend/Gdata/Media/Extension/MediaCredit.php +++ b/library/Zend/Gdata/Media/Extension/MediaCredit.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCredit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCredit.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCredit extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaDescription.php b/library/Zend/Gdata/Media/Extension/MediaDescription.php old mode 100644 new mode 100755 index 2eb0a9654..24e9cb49f --- a/library/Zend/Gdata/Media/Extension/MediaDescription.php +++ b/library/Zend/Gdata/Media/Extension/MediaDescription.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaDescription.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaDescription.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaDescription extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaGroup.php b/library/Zend/Gdata/Media/Extension/MediaGroup.php old mode 100644 new mode 100755 index ef48ce633..ddf4085fb --- a/library/Zend/Gdata/Media/Extension/MediaGroup.php +++ b/library/Zend/Gdata/Media/Extension/MediaGroup.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaGroup.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaGroup.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -106,7 +106,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaGroup extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaHash.php b/library/Zend/Gdata/Media/Extension/MediaHash.php old mode 100644 new mode 100755 index 66a830f11..e7b1cd98b --- a/library/Zend/Gdata/Media/Extension/MediaHash.php +++ b/library/Zend/Gdata/Media/Extension/MediaHash.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaHash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaHash.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaHash extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaKeywords.php b/library/Zend/Gdata/Media/Extension/MediaKeywords.php old mode 100644 new mode 100755 index c4c8e05d4..b4a61d8ad --- a/library/Zend/Gdata/Media/Extension/MediaKeywords.php +++ b/library/Zend/Gdata/Media/Extension/MediaKeywords.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaKeywords.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaKeywords.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaKeywords extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaPlayer.php b/library/Zend/Gdata/Media/Extension/MediaPlayer.php old mode 100644 new mode 100755 index 7b68c9b1c..a7424fdb1 --- a/library/Zend/Gdata/Media/Extension/MediaPlayer.php +++ b/library/Zend/Gdata/Media/Extension/MediaPlayer.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaPlayer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaPlayer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaPlayer extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaRating.php b/library/Zend/Gdata/Media/Extension/MediaRating.php old mode 100644 new mode 100755 index 2fce53de9..447db13a1 --- a/library/Zend/Gdata/Media/Extension/MediaRating.php +++ b/library/Zend/Gdata/Media/Extension/MediaRating.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaRating.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaRating.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaRating extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaRestriction.php b/library/Zend/Gdata/Media/Extension/MediaRestriction.php old mode 100644 new mode 100755 index 499c49786..1f8af7380 --- a/library/Zend/Gdata/Media/Extension/MediaRestriction.php +++ b/library/Zend/Gdata/Media/Extension/MediaRestriction.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaRestriction.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaRestriction.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaRestriction extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaText.php b/library/Zend/Gdata/Media/Extension/MediaText.php old mode 100644 new mode 100755 index f12a5f84b..26a2c9a9b --- a/library/Zend/Gdata/Media/Extension/MediaText.php +++ b/library/Zend/Gdata/Media/Extension/MediaText.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaText.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaText.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension @@ -64,11 +64,11 @@ class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension /** * Constructs a new MediaText element * - * @param $text string - * @param $type string - * @param $lang string - * @param $start string - * @param $end string + * @param string $text + * @param string $type + * @param string $lang + * @param string $start + * @param string $end */ public function __construct($text = null, $type = null, $lang = null, $start = null, $end = null) diff --git a/library/Zend/Gdata/Media/Extension/MediaThumbnail.php b/library/Zend/Gdata/Media/Extension/MediaThumbnail.php old mode 100644 new mode 100755 index 86ffd4ac4..bc9a169a9 --- a/library/Zend/Gdata/Media/Extension/MediaThumbnail.php +++ b/library/Zend/Gdata/Media/Extension/MediaThumbnail.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaThumbnail.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaThumbnail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaThumbnail extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Extension/MediaTitle.php b/library/Zend/Gdata/Media/Extension/MediaTitle.php old mode 100644 new mode 100755 index 10c6b2d6a..9ba14240b --- a/library/Zend/Gdata/Media/Extension/MediaTitle.php +++ b/library/Zend/Gdata/Media/Extension/MediaTitle.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaTitle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaTitle.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaTitle extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Media/Feed.php b/library/Zend/Gdata/Media/Feed.php old mode 100644 new mode 100755 index bbf1ad698..23cf260d4 --- a/library/Zend/Gdata/Media/Feed.php +++ b/library/Zend/Gdata/Media/Feed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Feed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Feed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/MediaMimeStream.php b/library/Zend/Gdata/MediaMimeStream.php index 4ef7a4b90..6f65707be 100644 --- a/library/Zend/Gdata/MediaMimeStream.php +++ b/library/Zend/Gdata/MediaMimeStream.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaMimeStream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaMimeStream.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MediaMimeStream diff --git a/library/Zend/Gdata/MimeBodyString.php b/library/Zend/Gdata/MimeBodyString.php index 24466a510..c0f13aa53 100644 --- a/library/Zend/Gdata/MimeBodyString.php +++ b/library/Zend/Gdata/MimeBodyString.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeBodyString.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MimeBodyString.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MimeBodyString diff --git a/library/Zend/Gdata/MimeFile.php b/library/Zend/Gdata/MimeFile.php index 9ccdc1ab1..2dd7d2b9d 100644 --- a/library/Zend/Gdata/MimeFile.php +++ b/library/Zend/Gdata/MimeFile.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MimeFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MimeFile diff --git a/library/Zend/Gdata/Photos.php b/library/Zend/Gdata/Photos.php old mode 100644 new mode 100755 index 289b0c79d..399783639 --- a/library/Zend/Gdata/Photos.php +++ b/library/Zend/Gdata/Photos.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Photos.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Photos.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -52,14 +52,14 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos extends Zend_Gdata { - const PICASA_BASE_URI = 'http://picasaweb.google.com/data'; - const PICASA_BASE_FEED_URI = 'http://picasaweb.google.com/data/feed'; + const PICASA_BASE_URI = 'https://picasaweb.google.com/data'; + const PICASA_BASE_FEED_URI = 'https://picasaweb.google.com/data/feed'; const AUTH_SERVICE_NAME = 'lh2'; /** diff --git a/library/Zend/Gdata/Photos/AlbumEntry.php b/library/Zend/Gdata/Photos/AlbumEntry.php old mode 100644 new mode 100755 index e6b7aaf7d..ff8124e6d --- a/library/Zend/Gdata/Photos/AlbumEntry.php +++ b/library/Zend/Gdata/Photos/AlbumEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -98,7 +98,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Photos/AlbumFeed.php b/library/Zend/Gdata/Photos/AlbumFeed.php old mode 100644 new mode 100755 index acc30f674..f4e287e7d --- a/library/Zend/Gdata/Photos/AlbumFeed.php +++ b/library/Zend/Gdata/Photos/AlbumFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Photos/AlbumQuery.php b/library/Zend/Gdata/Photos/AlbumQuery.php old mode 100644 new mode 100755 index 6669ce649..37beea7c9 --- a/library/Zend/Gdata/Photos/AlbumQuery.php +++ b/library/Zend/Gdata/Photos/AlbumQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery diff --git a/library/Zend/Gdata/Photos/CommentEntry.php b/library/Zend/Gdata/Photos/CommentEntry.php old mode 100644 new mode 100755 index cd9835576..187f0333b --- a/library/Zend/Gdata/Photos/CommentEntry.php +++ b/library/Zend/Gdata/Photos/CommentEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -58,7 +58,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_CommentEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Photos/Extension/Access.php b/library/Zend/Gdata/Photos/Extension/Access.php old mode 100644 new mode 100755 index 84244291d..90d314eb2 --- a/library/Zend/Gdata/Photos/Extension/Access.php +++ b/library/Zend/Gdata/Photos/Extension/Access.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Access.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Access.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Access extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/AlbumId.php b/library/Zend/Gdata/Photos/Extension/AlbumId.php old mode 100644 new mode 100755 index 35aae8431..72239a727 --- a/library/Zend/Gdata/Photos/Extension/AlbumId.php +++ b/library/Zend/Gdata/Photos/Extension/AlbumId.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlbumId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlbumId.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_AlbumId extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/BytesUsed.php b/library/Zend/Gdata/Photos/Extension/BytesUsed.php old mode 100644 new mode 100755 index cdf2fe311..b725de3a9 --- a/library/Zend/Gdata/Photos/Extension/BytesUsed.php +++ b/library/Zend/Gdata/Photos/Extension/BytesUsed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BytesUsed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BytesUsed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_BytesUsed extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Checksum.php b/library/Zend/Gdata/Photos/Extension/Checksum.php old mode 100644 new mode 100755 index fcdf98701..ed1bac28b --- a/library/Zend/Gdata/Photos/Extension/Checksum.php +++ b/library/Zend/Gdata/Photos/Extension/Checksum.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Checksum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Checksum.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Checksum extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Client.php b/library/Zend/Gdata/Photos/Extension/Client.php old mode 100644 new mode 100755 index 672d8b2a1..f33dacafa --- a/library/Zend/Gdata/Photos/Extension/Client.php +++ b/library/Zend/Gdata/Photos/Extension/Client.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Client extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/CommentCount.php b/library/Zend/Gdata/Photos/Extension/CommentCount.php old mode 100644 new mode 100755 index ff60e26da..af60325cd --- a/library/Zend/Gdata/Photos/Extension/CommentCount.php +++ b/library/Zend/Gdata/Photos/Extension/CommentCount.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentCount.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentCount.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_CommentCount extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php b/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php old mode 100644 new mode 100755 index 12d289bed..8d8ece8c7 --- a/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php +++ b/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentingEnabled.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentingEnabled.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_CommentingEnabled extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Height.php b/library/Zend/Gdata/Photos/Extension/Height.php old mode 100644 new mode 100755 index 23b69764a..8bf043a39 --- a/library/Zend/Gdata/Photos/Extension/Height.php +++ b/library/Zend/Gdata/Photos/Extension/Height.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Height.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Height.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Height extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Id.php b/library/Zend/Gdata/Photos/Extension/Id.php old mode 100644 new mode 100755 index 9737ca02e..acba1082f --- a/library/Zend/Gdata/Photos/Extension/Id.php +++ b/library/Zend/Gdata/Photos/Extension/Id.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Id.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Id.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Id extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Location.php b/library/Zend/Gdata/Photos/Extension/Location.php old mode 100644 new mode 100755 index b3cd9371a..8323870c1 --- a/library/Zend/Gdata/Photos/Extension/Location.php +++ b/library/Zend/Gdata/Photos/Extension/Location.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Location.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Location.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Location extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php b/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php old mode 100644 new mode 100755 index fb23ccd20..42581448c --- a/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php +++ b/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MaxPhotosPerAlbum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MaxPhotosPerAlbum.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Name.php b/library/Zend/Gdata/Photos/Extension/Name.php old mode 100644 new mode 100755 index 47c79d637..04aa35aac --- a/library/Zend/Gdata/Photos/Extension/Name.php +++ b/library/Zend/Gdata/Photos/Extension/Name.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Name extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Nickname.php b/library/Zend/Gdata/Photos/Extension/Nickname.php old mode 100644 new mode 100755 index 8536a56e2..e1cd47543 --- a/library/Zend/Gdata/Photos/Extension/Nickname.php +++ b/library/Zend/Gdata/Photos/Extension/Nickname.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nickname.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nickname.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Nickname extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/NumPhotos.php b/library/Zend/Gdata/Photos/Extension/NumPhotos.php old mode 100644 new mode 100755 index a29d54819..264629d7e --- a/library/Zend/Gdata/Photos/Extension/NumPhotos.php +++ b/library/Zend/Gdata/Photos/Extension/NumPhotos.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumPhotos.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumPhotos.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_NumPhotos extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php b/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php old mode 100644 new mode 100755 index 2cd30d45e..fb1637a18 --- a/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php +++ b/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumPhotosRemaining.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NumPhotosRemaining.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_NumPhotosRemaining extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/PhotoId.php b/library/Zend/Gdata/Photos/Extension/PhotoId.php old mode 100644 new mode 100755 index 2303cc26e..53b572bd9 --- a/library/Zend/Gdata/Photos/Extension/PhotoId.php +++ b/library/Zend/Gdata/Photos/Extension/PhotoId.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoId.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_PhotoId extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Position.php b/library/Zend/Gdata/Photos/Extension/Position.php old mode 100644 new mode 100755 index 9cd4a91ea..bdf6f7d76 --- a/library/Zend/Gdata/Photos/Extension/Position.php +++ b/library/Zend/Gdata/Photos/Extension/Position.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Position.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Position.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Position extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php b/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php old mode 100644 new mode 100755 index c4a349868..ade8c0aa9 --- a/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php +++ b/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QuotaCurrent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QuotaCurrent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_QuotaCurrent extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/QuotaLimit.php b/library/Zend/Gdata/Photos/Extension/QuotaLimit.php old mode 100644 new mode 100755 index 5d6e9b220..513b9d739 --- a/library/Zend/Gdata/Photos/Extension/QuotaLimit.php +++ b/library/Zend/Gdata/Photos/Extension/QuotaLimit.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QuotaLimit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QuotaLimit.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_QuotaLimit extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Rotation.php b/library/Zend/Gdata/Photos/Extension/Rotation.php old mode 100644 new mode 100755 index 0812fa49f..1ea425703 --- a/library/Zend/Gdata/Photos/Extension/Rotation.php +++ b/library/Zend/Gdata/Photos/Extension/Rotation.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rotation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rotation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Rotation extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Size.php b/library/Zend/Gdata/Photos/Extension/Size.php old mode 100644 new mode 100755 index 61b86238f..7bfca84b8 --- a/library/Zend/Gdata/Photos/Extension/Size.php +++ b/library/Zend/Gdata/Photos/Extension/Size.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Size.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Size.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Size extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Thumbnail.php b/library/Zend/Gdata/Photos/Extension/Thumbnail.php old mode 100644 new mode 100755 index 6ce3a1a7a..76ba761d8 --- a/library/Zend/Gdata/Photos/Extension/Thumbnail.php +++ b/library/Zend/Gdata/Photos/Extension/Thumbnail.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Thumbnail.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Thumbnail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Thumbnail extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Timestamp.php b/library/Zend/Gdata/Photos/Extension/Timestamp.php old mode 100644 new mode 100755 index 655d4291c..e14c04c77 --- a/library/Zend/Gdata/Photos/Extension/Timestamp.php +++ b/library/Zend/Gdata/Photos/Extension/Timestamp.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Timestamp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Timestamp.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Timestamp extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/User.php b/library/Zend/Gdata/Photos/Extension/User.php old mode 100644 new mode 100755 index 0cc5c07cc..9da6c88e9 --- a/library/Zend/Gdata/Photos/Extension/User.php +++ b/library/Zend/Gdata/Photos/Extension/User.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: User.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: User.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_User extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Version.php b/library/Zend/Gdata/Photos/Extension/Version.php old mode 100644 new mode 100755 index 280231cf6..a76021e37 --- a/library/Zend/Gdata/Photos/Extension/Version.php +++ b/library/Zend/Gdata/Photos/Extension/Version.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Version.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Version.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Version extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Weight.php b/library/Zend/Gdata/Photos/Extension/Weight.php old mode 100644 new mode 100755 index 4288043a8..248148567 --- a/library/Zend/Gdata/Photos/Extension/Weight.php +++ b/library/Zend/Gdata/Photos/Extension/Weight.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Weight extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/Extension/Width.php b/library/Zend/Gdata/Photos/Extension/Width.php old mode 100644 new mode 100755 index bdfb1803f..4d0f985ab --- a/library/Zend/Gdata/Photos/Extension/Width.php +++ b/library/Zend/Gdata/Photos/Extension/Width.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Width.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Width.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Width extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Photos/PhotoEntry.php b/library/Zend/Gdata/Photos/PhotoEntry.php old mode 100644 new mode 100755 index f02c2f57e..849d6542c --- a/library/Zend/Gdata/Photos/PhotoEntry.php +++ b/library/Zend/Gdata/Photos/PhotoEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -113,7 +113,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoEntry extends Zend_Gdata_Media_Entry diff --git a/library/Zend/Gdata/Photos/PhotoFeed.php b/library/Zend/Gdata/Photos/PhotoFeed.php old mode 100644 new mode 100755 index c1d3bca8b..94e86ade3 --- a/library/Zend/Gdata/Photos/PhotoFeed.php +++ b/library/Zend/Gdata/Photos/PhotoFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Photos/PhotoQuery.php b/library/Zend/Gdata/Photos/PhotoQuery.php old mode 100644 new mode 100755 index 833d177a2..2e6af4f64 --- a/library/Zend/Gdata/Photos/PhotoQuery.php +++ b/library/Zend/Gdata/Photos/PhotoQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhotoQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhotoQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoQuery extends Zend_Gdata_Photos_AlbumQuery diff --git a/library/Zend/Gdata/Photos/TagEntry.php b/library/Zend/Gdata/Photos/TagEntry.php old mode 100644 new mode 100755 index 42713c2e6..bf5231026 --- a/library/Zend/Gdata/Photos/TagEntry.php +++ b/library/Zend/Gdata/Photos/TagEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -48,7 +48,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_TagEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Photos/UserEntry.php b/library/Zend/Gdata/Photos/UserEntry.php old mode 100644 new mode 100755 index 31a6a9426..3c409eb18 --- a/library/Zend/Gdata/Photos/UserEntry.php +++ b/library/Zend/Gdata/Photos/UserEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -78,7 +78,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Photos/UserFeed.php b/library/Zend/Gdata/Photos/UserFeed.php old mode 100644 new mode 100755 index 6fe4e3f4b..c6bed4453 --- a/library/Zend/Gdata/Photos/UserFeed.php +++ b/library/Zend/Gdata/Photos/UserFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -66,7 +66,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Photos/UserQuery.php b/library/Zend/Gdata/Photos/UserQuery.php old mode 100644 new mode 100755 index 89de3a8c2..3a84b980b --- a/library/Zend/Gdata/Photos/UserQuery.php +++ b/library/Zend/Gdata/Photos/UserQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query diff --git a/library/Zend/Gdata/Query.php b/library/Zend/Gdata/Query.php index 8b7bb95e9..a957b776e 100644 --- a/library/Zend/Gdata/Query.php +++ b/library/Zend/Gdata/Query.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Query diff --git a/library/Zend/Gdata/Spreadsheets.php b/library/Zend/Gdata/Spreadsheets.php index 8c6c9d53b..b2ef62cf4 100644 --- a/library/Zend/Gdata/Spreadsheets.php +++ b/library/Zend/Gdata/Spreadsheets.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Spreadsheets.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Spreadsheets.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -89,13 +89,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets extends Zend_Gdata { - const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds/spreadsheets'; - const SPREADSHEETS_POST_URI = 'http://spreadsheets.google.com/feeds/spreadsheets/private/full'; + const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds/spreadsheets'; + const SPREADSHEETS_POST_URI = 'https://spreadsheets.google.com/feeds/spreadsheets/private/full'; const WORKSHEETS_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#worksheetsfeed'; const LIST_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#listfeed'; const CELL_FEED_LINK_URI = 'http://schemas.google.com/spreadsheets/2006#cellsfeed'; diff --git a/library/Zend/Gdata/Spreadsheets/CellEntry.php b/library/Zend/Gdata/Spreadsheets/CellEntry.php index 4d389e947..aceecbb43 100644 --- a/library/Zend/Gdata/Spreadsheets/CellEntry.php +++ b/library/Zend/Gdata/Spreadsheets/CellEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CellEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CellEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellEntry extends Zend_Gdata_Entry @@ -92,7 +92,8 @@ public function getCell() /** * Sets the Cell element of this Cell Entry. - * @param $cell Zend_Gdata_Spreadsheets_Extension_Cell $cell + * @param Zend_Gdata_Spreadsheets_Extension_Cell $cell + * @return Zend_Gdata_Spreadsheets_CellEntry */ public function setCell($cell) { diff --git a/library/Zend/Gdata/Spreadsheets/CellFeed.php b/library/Zend/Gdata/Spreadsheets/CellFeed.php index 8b7444977..baa59bd25 100644 --- a/library/Zend/Gdata/Spreadsheets/CellFeed.php +++ b/library/Zend/Gdata/Spreadsheets/CellFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CellFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CellFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Spreadsheets/CellQuery.php b/library/Zend/Gdata/Spreadsheets/CellQuery.php index 8e0e53362..ab573288b 100644 --- a/library/Zend/Gdata/Spreadsheets/CellQuery.php +++ b/library/Zend/Gdata/Spreadsheets/CellQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CellQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CellQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query { - const SPREADSHEETS_CELL_FEED_URI = 'http://spreadsheets.google.com/feeds/cells'; + const SPREADSHEETS_CELL_FEED_URI = 'https://spreadsheets.google.com/feeds/cells'; protected $_defaultFeedUri = self::SPREADSHEETS_CELL_FEED_URI; protected $_visibility = 'private'; diff --git a/library/Zend/Gdata/Spreadsheets/DocumentQuery.php b/library/Zend/Gdata/Spreadsheets/DocumentQuery.php index da8a5164f..ccf7579c2 100644 --- a/library/Zend/Gdata/Spreadsheets/DocumentQuery.php +++ b/library/Zend/Gdata/Spreadsheets/DocumentQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query { - const SPREADSHEETS_FEED_URI = 'http://spreadsheets.google.com/feeds'; + const SPREADSHEETS_FEED_URI = 'https://spreadsheets.google.com/feeds'; protected $_defaultFeedUri = self::SPREADSHEETS_FEED_URI; protected $_documentType; diff --git a/library/Zend/Gdata/Spreadsheets/Extension/Cell.php b/library/Zend/Gdata/Spreadsheets/Extension/Cell.php index c1eb26cec..4bb680509 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/Cell.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/Cell.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cell.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cell.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_Cell extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php b/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php index 92f3eb6aa..5270e6ec1 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ColCount.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ColCount.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_ColCount extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Spreadsheets/Extension/Custom.php b/library/Zend/Gdata/Spreadsheets/Extension/Custom.php index 45e572e02..c80800d93 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/Custom.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/Custom.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Custom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Custom.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_Custom extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php b/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php index 45c943a68..b5d61d7d4 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RowCount.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RowCount.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_RowCount extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/Spreadsheets/ListEntry.php b/library/Zend/Gdata/Spreadsheets/ListEntry.php index 8fe3e87fa..ea802f8ca 100644 --- a/library/Zend/Gdata/Spreadsheets/ListEntry.php +++ b/library/Zend/Gdata/Spreadsheets/ListEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Spreadsheets/ListFeed.php b/library/Zend/Gdata/Spreadsheets/ListFeed.php index c228f6743..738edc9e3 100644 --- a/library/Zend/Gdata/Spreadsheets/ListFeed.php +++ b/library/Zend/Gdata/Spreadsheets/ListFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Spreadsheets/ListQuery.php b/library/Zend/Gdata/Spreadsheets/ListQuery.php index 6be19746a..e10daa62a 100644 --- a/library/Zend/Gdata/Spreadsheets/ListQuery.php +++ b/library/Zend/Gdata/Spreadsheets/ListQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,13 +39,13 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query { - const SPREADSHEETS_LIST_FEED_URI = 'http://spreadsheets.google.com/feeds/list'; + const SPREADSHEETS_LIST_FEED_URI = 'https://spreadsheets.google.com/feeds/list'; protected $_defaultFeedUri = self::SPREADSHEETS_LIST_FEED_URI; protected $_visibility = 'private'; diff --git a/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php b/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php index a46c4ab83..d0409ecae 100644 --- a/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php +++ b/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SpreadsheetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SpreadsheetEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_SpreadsheetEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php b/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php index ff9c97217..cb5b3e7f0 100644 --- a/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php +++ b/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SpreadsheetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SpreadsheetFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_SpreadsheetFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php b/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php index 1fe45c927..8cc98774a 100644 --- a/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php +++ b/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WorksheetEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WorksheetEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_WorksheetEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php b/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php index e1f8af358..eca9c1564 100644 --- a/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php +++ b/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WorksheetFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WorksheetFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_WorksheetFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/YouTube.php b/library/Zend/Gdata/YouTube.php index 1f56b0a67..133532fc5 100644 --- a/library/Zend/Gdata/YouTube.php +++ b/library/Zend/Gdata/YouTube.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: YouTube.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: YouTube.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -79,7 +79,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube extends Zend_Gdata_Media @@ -88,22 +88,22 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media const AUTH_SERVICE_NAME = 'youtube'; const CLIENTLOGIN_URL = 'https://www.google.com/youtube/accounts/ClientLogin'; - const STANDARD_TOP_RATED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; - const STANDARD_MOST_VIEWED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; - const STANDARD_RECENTLY_FEATURED_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; - const STANDARD_WATCH_ON_MOBILE_URI = 'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; + const STANDARD_TOP_RATED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; + const STANDARD_MOST_VIEWED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; + const STANDARD_RECENTLY_FEATURED_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; + const STANDARD_WATCH_ON_MOBILE_URI = 'https://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; const STANDARD_TOP_RATED_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/top_rated'; const STANDARD_MOST_VIEWED_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/most_viewed'; const STANDARD_RECENTLY_FEATURED_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/recently_featured'; const STANDARD_WATCH_ON_MOBILE_URI_V2 = - 'http://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; + 'https://gdata.youtube.com/feeds/api/standardfeeds/watch_on_mobile'; - const USER_URI = 'http://gdata.youtube.com/feeds/api/users'; - const VIDEO_URI = 'http://gdata.youtube.com/feeds/api/videos'; + const USER_URI = 'https://gdata.youtube.com/feeds/api/users'; + const VIDEO_URI = 'https://gdata.youtube.com/feeds/api/videos'; const PLAYLIST_REL = 'http://gdata.youtube.com/schemas/2007#playlist'; const USER_UPLOADS_REL = 'http://gdata.youtube.com/schemas/2007#user.uploads'; const USER_PLAYLISTS_REL = 'http://gdata.youtube.com/schemas/2007#user.playlists'; @@ -113,9 +113,9 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media const VIDEO_RESPONSES_REL = 'http://gdata.youtube.com/schemas/2007#video.responses'; const VIDEO_RATINGS_REL = 'http://gdata.youtube.com/schemas/2007#video.ratings'; const VIDEO_COMPLAINTS_REL = 'http://gdata.youtube.com/schemas/2007#video.complaints'; - const ACTIVITY_FEED_URI = 'http://gdata.youtube.com/feeds/api/events'; + const ACTIVITY_FEED_URI = 'https://gdata.youtube.com/feeds/api/events'; const FRIEND_ACTIVITY_FEED_URI = - 'http://gdata.youtube.com/feeds/api/users/default/friendsactivity'; + 'https://gdata.youtube.com/feeds/api/users/default/friendsactivity'; /** * The URI of the in-reply-to schema for comments in reply to @@ -132,7 +132,7 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media * @var string */ const INBOX_FEED_URI = - 'http://gdata.youtube.com/feeds/api/users/default/inbox'; + 'https://gdata.youtube.com/feeds/api/users/default/inbox'; /** * The maximum number of users for which activity can be requested for, @@ -697,7 +697,7 @@ public static function parseFormUploadTokenResponse($response) * @return array An array containing a token and URL */ public function getFormUploadToken($videoEntry, - $url='http://gdata.youtube.com/action/GetUploadToken') + $url='https://gdata.youtube.com/action/GetUploadToken') { if ($url != null && is_string($url)) { // $response is a Zend_Http_response object @@ -834,7 +834,7 @@ public function sendVideoMessage($body, $videoEntry = null, $messageEntry->setSummary($this->newSummary($body)); } - $insertUrl = 'http://gdata.youtube.com/feeds/api/users/' . + $insertUrl = 'https://gdata.youtube.com/feeds/api/users/' . $recipientUserName . '/inbox'; $response = $this->insertEntry($messageEntry, $insertUrl, 'Zend_Gdata_YouTube_InboxEntry'); @@ -844,11 +844,11 @@ public function sendVideoMessage($body, $videoEntry = null, /** * Post a comment in reply to an existing comment * - * @param $commentEntry Zend_Gdata_YouTube_CommentEntry The comment entry - * to reply to - * @param $commentText string The text of the comment to post - * @return A Zend_Gdata_YouTube_CommentEntry representing the posted - * comment + * @param Zend_Gdata_YouTube_CommentEntry $commentEntry The comment entry + * to reply to + * @param string $commentText The text of the + * comment to post + * @return Zend_Gdata_YouTube_CommentEntry the posted comment */ public function replyToCommentEntry($commentEntry, $commentText) { diff --git a/library/Zend/Gdata/YouTube/ActivityEntry.php b/library/Zend/Gdata/YouTube/ActivityEntry.php index da4a40176..bf0a583b3 100644 --- a/library/Zend/Gdata/YouTube/ActivityEntry.php +++ b/library/Zend/Gdata/YouTube/ActivityEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActivityEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActivityEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ActivityEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/YouTube/ActivityFeed.php b/library/Zend/Gdata/YouTube/ActivityFeed.php index 742edc994..f0cd3b572 100644 --- a/library/Zend/Gdata/YouTube/ActivityFeed.php +++ b/library/Zend/Gdata/YouTube/ActivityFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActivityFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActivityFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ActivityFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/YouTube/CommentEntry.php b/library/Zend/Gdata/YouTube/CommentEntry.php index 32c7635e0..9c7eef16a 100644 --- a/library/Zend/Gdata/YouTube/CommentEntry.php +++ b/library/Zend/Gdata/YouTube/CommentEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_CommentEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/YouTube/CommentFeed.php b/library/Zend/Gdata/YouTube/CommentFeed.php index ef3a86909..db0875ee3 100644 --- a/library/Zend/Gdata/YouTube/CommentFeed.php +++ b/library/Zend/Gdata/YouTube/CommentFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommentFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CommentFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_CommentFeed extends Zend_Gdata_Feed diff --git a/library/Zend/Gdata/YouTube/ContactEntry.php b/library/Zend/Gdata/YouTube/ContactEntry.php index a90319a23..5839af9e6 100644 --- a/library/Zend/Gdata/YouTube/ContactEntry.php +++ b/library/Zend/Gdata/YouTube/ContactEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContactEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContactEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ContactEntry extends Zend_Gdata_YouTube_UserProfileEntry diff --git a/library/Zend/Gdata/YouTube/ContactFeed.php b/library/Zend/Gdata/YouTube/ContactFeed.php index 3bf901209..563097856 100644 --- a/library/Zend/Gdata/YouTube/ContactFeed.php +++ b/library/Zend/Gdata/YouTube/ContactFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContactFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContactFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ContactFeed extends Zend_Gdata_Media_Feed diff --git a/library/Zend/Gdata/YouTube/Extension/AboutMe.php b/library/Zend/Gdata/YouTube/Extension/AboutMe.php index 166f8d7bf..cf042effa 100644 --- a/library/Zend/Gdata/YouTube/Extension/AboutMe.php +++ b/library/Zend/Gdata/YouTube/Extension/AboutMe.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AboutMe.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AboutMe.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_AboutMe extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Age.php b/library/Zend/Gdata/YouTube/Extension/Age.php index 90e309e87..1042a42cc 100644 --- a/library/Zend/Gdata/YouTube/Extension/Age.php +++ b/library/Zend/Gdata/YouTube/Extension/Age.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Age.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Age.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Age extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Books.php b/library/Zend/Gdata/YouTube/Extension/Books.php index 1fb81996c..c31a24fd5 100644 --- a/library/Zend/Gdata/YouTube/Extension/Books.php +++ b/library/Zend/Gdata/YouTube/Extension/Books.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Books.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Books.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Books extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Company.php b/library/Zend/Gdata/YouTube/Extension/Company.php index caa378be1..f6ffaa92d 100644 --- a/library/Zend/Gdata/YouTube/Extension/Company.php +++ b/library/Zend/Gdata/YouTube/Extension/Company.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Company.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Company.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Company extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Control.php b/library/Zend/Gdata/YouTube/Extension/Control.php old mode 100644 new mode 100755 index 38c630c3b..631920b34 --- a/library/Zend/Gdata/YouTube/Extension/Control.php +++ b/library/Zend/Gdata/YouTube/Extension/Control.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Control.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Control.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Control extends Zend_Gdata_App_Extension_Control diff --git a/library/Zend/Gdata/YouTube/Extension/CountHint.php b/library/Zend/Gdata/YouTube/Extension/CountHint.php old mode 100644 new mode 100755 index a90e67f1f..15b4e58eb --- a/library/Zend/Gdata/YouTube/Extension/CountHint.php +++ b/library/Zend/Gdata/YouTube/Extension/CountHint.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CountHint.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CountHint.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_CountHint extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Description.php b/library/Zend/Gdata/YouTube/Extension/Description.php index 7b5f3c548..6861f1644 100644 --- a/library/Zend/Gdata/YouTube/Extension/Description.php +++ b/library/Zend/Gdata/YouTube/Extension/Description.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Description.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Description.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Description extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Duration.php b/library/Zend/Gdata/YouTube/Extension/Duration.php index 2833e0c22..e50fba8f8 100644 --- a/library/Zend/Gdata/YouTube/Extension/Duration.php +++ b/library/Zend/Gdata/YouTube/Extension/Duration.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Duration.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Duration.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Duration extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/FirstName.php b/library/Zend/Gdata/YouTube/Extension/FirstName.php index a3c2dc24d..a1c3f6ebb 100644 --- a/library/Zend/Gdata/YouTube/Extension/FirstName.php +++ b/library/Zend/Gdata/YouTube/Extension/FirstName.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FirstName.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FirstName.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_FirstName extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Gender.php b/library/Zend/Gdata/YouTube/Extension/Gender.php index 6becb1e51..af7041a66 100644 --- a/library/Zend/Gdata/YouTube/Extension/Gender.php +++ b/library/Zend/Gdata/YouTube/Extension/Gender.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gender.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Gender.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Gender extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Hobbies.php b/library/Zend/Gdata/YouTube/Extension/Hobbies.php index fddaf2e8c..7d967d1eb 100644 --- a/library/Zend/Gdata/YouTube/Extension/Hobbies.php +++ b/library/Zend/Gdata/YouTube/Extension/Hobbies.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hobbies.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hobbies.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Hobbies extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Hometown.php b/library/Zend/Gdata/YouTube/Extension/Hometown.php index ea3b16197..b6d59728b 100644 --- a/library/Zend/Gdata/YouTube/Extension/Hometown.php +++ b/library/Zend/Gdata/YouTube/Extension/Hometown.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hometown.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hometown.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Hometown extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/LastName.php b/library/Zend/Gdata/YouTube/Extension/LastName.php index f903042ec..b130f7c33 100644 --- a/library/Zend/Gdata/YouTube/Extension/LastName.php +++ b/library/Zend/Gdata/YouTube/Extension/LastName.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LastName.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LastName.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_LastName extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Link.php b/library/Zend/Gdata/YouTube/Extension/Link.php old mode 100644 new mode 100755 index 6205da5e1..b4234e7b9 --- a/library/Zend/Gdata/YouTube/Extension/Link.php +++ b/library/Zend/Gdata/YouTube/Extension/Link.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Link extends Zend_Gdata_App_Extension_Link diff --git a/library/Zend/Gdata/YouTube/Extension/Location.php b/library/Zend/Gdata/YouTube/Extension/Location.php index db5cb9d26..5dbf3203e 100644 --- a/library/Zend/Gdata/YouTube/Extension/Location.php +++ b/library/Zend/Gdata/YouTube/Extension/Location.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Location.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Location.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Location extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/MediaContent.php b/library/Zend/Gdata/YouTube/Extension/MediaContent.php old mode 100644 new mode 100755 index b5e4e671e..7edd5c419 --- a/library/Zend/Gdata/YouTube/Extension/MediaContent.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaContent.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaContent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaContent.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaContent extends Zend_Gdata_Media_Extension_MediaContent diff --git a/library/Zend/Gdata/YouTube/Extension/MediaCredit.php b/library/Zend/Gdata/YouTube/Extension/MediaCredit.php index 7d7da9d85..efec37e3d 100644 --- a/library/Zend/Gdata/YouTube/Extension/MediaCredit.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaCredit.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaCredit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaCredit.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaCredit extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/MediaGroup.php b/library/Zend/Gdata/YouTube/Extension/MediaGroup.php old mode 100644 new mode 100755 index 7a312383c..0ebc31ebb --- a/library/Zend/Gdata/YouTube/Extension/MediaGroup.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaGroup.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaGroup.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaGroup.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -70,7 +70,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaGroup extends Zend_Gdata_Media_Extension_MediaGroup diff --git a/library/Zend/Gdata/YouTube/Extension/MediaRating.php b/library/Zend/Gdata/YouTube/Extension/MediaRating.php old mode 100644 new mode 100755 index 8c3290eb4..102e01bec --- a/library/Zend/Gdata/YouTube/Extension/MediaRating.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaRating.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaRating.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaRating.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaRating extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Movies.php b/library/Zend/Gdata/YouTube/Extension/Movies.php index f943c6b13..f99f665d0 100644 --- a/library/Zend/Gdata/YouTube/Extension/Movies.php +++ b/library/Zend/Gdata/YouTube/Extension/Movies.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Movies.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Movies.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Movies extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Music.php b/library/Zend/Gdata/YouTube/Extension/Music.php index 49cdaad6c..141e25bbd 100644 --- a/library/Zend/Gdata/YouTube/Extension/Music.php +++ b/library/Zend/Gdata/YouTube/Extension/Music.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Music.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Music.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Music extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/NoEmbed.php b/library/Zend/Gdata/YouTube/Extension/NoEmbed.php index 72477d061..551455008 100644 --- a/library/Zend/Gdata/YouTube/Extension/NoEmbed.php +++ b/library/Zend/Gdata/YouTube/Extension/NoEmbed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NoEmbed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NoEmbed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_NoEmbed extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Occupation.php b/library/Zend/Gdata/YouTube/Extension/Occupation.php index c7e7a6de6..aa37fd5c9 100644 --- a/library/Zend/Gdata/YouTube/Extension/Occupation.php +++ b/library/Zend/Gdata/YouTube/Extension/Occupation.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Occupation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Occupation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Occupation extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/PlaylistId.php b/library/Zend/Gdata/YouTube/Extension/PlaylistId.php index ba0d22cec..e2380ddc9 100644 --- a/library/Zend/Gdata/YouTube/Extension/PlaylistId.php +++ b/library/Zend/Gdata/YouTube/Extension/PlaylistId.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistId.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_PlaylistId extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php b/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php index d712ebd33..8638a664c 100644 --- a/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php +++ b/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistTitle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistTitle.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_PlaylistTitle extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Position.php b/library/Zend/Gdata/YouTube/Extension/Position.php index 4c1466e25..0262f8aee 100644 --- a/library/Zend/Gdata/YouTube/Extension/Position.php +++ b/library/Zend/Gdata/YouTube/Extension/Position.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Position.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Position.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Position extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Private.php b/library/Zend/Gdata/YouTube/Extension/Private.php old mode 100644 new mode 100755 index 4a75442de..64d9e0d42 --- a/library/Zend/Gdata/YouTube/Extension/Private.php +++ b/library/Zend/Gdata/YouTube/Extension/Private.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Private.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Private.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Private extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/QueryString.php b/library/Zend/Gdata/YouTube/Extension/QueryString.php index 6ee841314..6daf3e567 100644 --- a/library/Zend/Gdata/YouTube/Extension/QueryString.php +++ b/library/Zend/Gdata/YouTube/Extension/QueryString.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryString.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryString.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_QueryString extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Racy.php b/library/Zend/Gdata/YouTube/Extension/Racy.php index 70df0d987..10de9a07c 100644 --- a/library/Zend/Gdata/YouTube/Extension/Racy.php +++ b/library/Zend/Gdata/YouTube/Extension/Racy.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Racy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Racy.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Racy extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Recorded.php b/library/Zend/Gdata/YouTube/Extension/Recorded.php index 04fd94677..7cd6c0d84 100644 --- a/library/Zend/Gdata/YouTube/Extension/Recorded.php +++ b/library/Zend/Gdata/YouTube/Extension/Recorded.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Recorded.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Recorded.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Recorded extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Relationship.php b/library/Zend/Gdata/YouTube/Extension/Relationship.php index 27d73d2d0..6b12b6366 100644 --- a/library/Zend/Gdata/YouTube/Extension/Relationship.php +++ b/library/Zend/Gdata/YouTube/Extension/Relationship.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Relationship.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Relationship.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Relationship extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php b/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php index e7a7e37d4..1b07fb3bc 100644 --- a/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php +++ b/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReleaseDate.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReleaseDate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_ReleaseDate extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/School.php b/library/Zend/Gdata/YouTube/Extension/School.php index 69a2e1cdc..f22117929 100644 --- a/library/Zend/Gdata/YouTube/Extension/School.php +++ b/library/Zend/Gdata/YouTube/Extension/School.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: School.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: School.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_School extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/State.php b/library/Zend/Gdata/YouTube/Extension/State.php index d97161304..8505cc45b 100644 --- a/library/Zend/Gdata/YouTube/Extension/State.php +++ b/library/Zend/Gdata/YouTube/Extension/State.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: State.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: State.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_State extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Statistics.php b/library/Zend/Gdata/YouTube/Extension/Statistics.php index 1a911fab9..e6a677a3d 100644 --- a/library/Zend/Gdata/YouTube/Extension/Statistics.php +++ b/library/Zend/Gdata/YouTube/Extension/Statistics.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Statistics.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Statistics.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Status.php b/library/Zend/Gdata/YouTube/Extension/Status.php index 0c61f2a0c..719d0c74d 100644 --- a/library/Zend/Gdata/YouTube/Extension/Status.php +++ b/library/Zend/Gdata/YouTube/Extension/Status.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Status.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Status.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Status extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Token.php b/library/Zend/Gdata/YouTube/Extension/Token.php old mode 100644 new mode 100755 index 7e062c265..90c2cbaf6 --- a/library/Zend/Gdata/YouTube/Extension/Token.php +++ b/library/Zend/Gdata/YouTube/Extension/Token.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Token.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Token extends Zend_Gdata_App_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Uploaded.php b/library/Zend/Gdata/YouTube/Extension/Uploaded.php index 640040d64..ae61e5353 100644 --- a/library/Zend/Gdata/YouTube/Extension/Uploaded.php +++ b/library/Zend/Gdata/YouTube/Extension/Uploaded.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uploaded.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Uploaded.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Uploaded extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/Username.php b/library/Zend/Gdata/YouTube/Extension/Username.php index b7592237f..ae627afba 100644 --- a/library/Zend/Gdata/YouTube/Extension/Username.php +++ b/library/Zend/Gdata/YouTube/Extension/Username.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Username.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Username.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Username extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/Extension/VideoId.php b/library/Zend/Gdata/YouTube/Extension/VideoId.php index d8cf0305c..b234cb7bf 100644 --- a/library/Zend/Gdata/YouTube/Extension/VideoId.php +++ b/library/Zend/Gdata/YouTube/Extension/VideoId.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoId.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoId.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_VideoId extends Zend_Gdata_Extension diff --git a/library/Zend/Gdata/YouTube/InboxEntry.php b/library/Zend/Gdata/YouTube/InboxEntry.php index 29c1b0de8..5e32a2bcb 100644 --- a/library/Zend/Gdata/YouTube/InboxEntry.php +++ b/library/Zend/Gdata/YouTube/InboxEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InboxEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InboxEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry diff --git a/library/Zend/Gdata/YouTube/InboxFeed.php b/library/Zend/Gdata/YouTube/InboxFeed.php index 812c560f5..b32ec8b37 100644 --- a/library/Zend/Gdata/YouTube/InboxFeed.php +++ b/library/Zend/Gdata/YouTube/InboxFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InboxFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InboxFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_InboxFeed extends Zend_Gdata_Media_Feed diff --git a/library/Zend/Gdata/YouTube/MediaEntry.php b/library/Zend/Gdata/YouTube/MediaEntry.php old mode 100644 new mode 100755 index c2c07e1ab..7e2af8117 --- a/library/Zend/Gdata/YouTube/MediaEntry.php +++ b/library/Zend/Gdata/YouTube/MediaEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MediaEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MediaEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_MediaEntry extends Zend_Gdata_Media_Entry diff --git a/library/Zend/Gdata/YouTube/PlaylistListEntry.php b/library/Zend/Gdata/YouTube/PlaylistListEntry.php index 3807c1368..1f0a472e5 100644 --- a/library/Zend/Gdata/YouTube/PlaylistListEntry.php +++ b/library/Zend/Gdata/YouTube/PlaylistListEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistListEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistListEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/YouTube/PlaylistListFeed.php b/library/Zend/Gdata/YouTube/PlaylistListFeed.php index 2dd654b26..2d8ce9cf8 100644 --- a/library/Zend/Gdata/YouTube/PlaylistListFeed.php +++ b/library/Zend/Gdata/YouTube/PlaylistListFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistListFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistListFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistListFeed extends Zend_Gdata_Media_Feed diff --git a/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php b/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php index 1136b75e2..4dee1f8e4 100644 --- a/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php +++ b/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistVideoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistVideoEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistVideoEntry extends Zend_Gdata_YouTube_VideoEntry diff --git a/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php b/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php index 664108975..f9bab7db1 100644 --- a/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php +++ b/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlaylistVideoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlaylistVideoFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistVideoFeed extends Zend_Gdata_Media_Feed diff --git a/library/Zend/Gdata/YouTube/SubscriptionEntry.php b/library/Zend/Gdata/YouTube/SubscriptionEntry.php index 2e24cf65e..18a31f834 100644 --- a/library/Zend/Gdata/YouTube/SubscriptionEntry.php +++ b/library/Zend/Gdata/YouTube/SubscriptionEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubscriptionEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubscriptionEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -72,7 +72,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/YouTube/SubscriptionFeed.php b/library/Zend/Gdata/YouTube/SubscriptionFeed.php index b2a908d06..0a4c22a07 100644 --- a/library/Zend/Gdata/YouTube/SubscriptionFeed.php +++ b/library/Zend/Gdata/YouTube/SubscriptionFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubscriptionFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubscriptionFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_SubscriptionFeed extends Zend_Gdata_Media_Feed diff --git a/library/Zend/Gdata/YouTube/UserProfileEntry.php b/library/Zend/Gdata/YouTube/UserProfileEntry.php index dd81df7a4..883740b9c 100644 --- a/library/Zend/Gdata/YouTube/UserProfileEntry.php +++ b/library/Zend/Gdata/YouTube/UserProfileEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserProfileEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UserProfileEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -132,7 +132,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry diff --git a/library/Zend/Gdata/YouTube/VideoEntry.php b/library/Zend/Gdata/YouTube/VideoEntry.php index 54bd2df39..046443d1c 100644 --- a/library/Zend/Gdata/YouTube/VideoEntry.php +++ b/library/Zend/Gdata/YouTube/VideoEntry.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -92,7 +92,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry diff --git a/library/Zend/Gdata/YouTube/VideoFeed.php b/library/Zend/Gdata/YouTube/VideoFeed.php index 59e798f9d..73cd0985c 100644 --- a/library/Zend/Gdata/YouTube/VideoFeed.php +++ b/library/Zend/Gdata/YouTube/VideoFeed.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoFeed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoFeed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoFeed extends Zend_Gdata_Media_Feed diff --git a/library/Zend/Gdata/YouTube/VideoQuery.php b/library/Zend/Gdata/YouTube/VideoQuery.php index cb148a220..c87f49f83 100644 --- a/library/Zend/Gdata/YouTube/VideoQuery.php +++ b/library/Zend/Gdata/YouTube/VideoQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoQuery.php 20097 2010-01-06 15:40:27Z bate $ + * @version $Id: VideoQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php index d7b22e0e2..8343c0433 100644 --- a/library/Zend/Http/Client.php +++ b/library/Zend/Http/Client.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @version $Id: Client.php 23443 2010-11-24 11:53:13Z shahar $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -60,7 +60,7 @@ * @package Zend_Http * @subpackage Client * @throws Zend_Http_Client_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client @@ -101,6 +101,12 @@ class Zend_Http_Client */ const ENC_URLENCODED = 'application/x-www-form-urlencoded'; const ENC_FORMDATA = 'multipart/form-data'; + + /** + * Value types for Body key/value pairs + */ + const VTYPE_SCALAR = 'SCALAR'; + const VTYPE_FILE = 'FILE'; /** * Configuration array, set using the constructor or using ::setConfig() @@ -201,6 +207,16 @@ class Zend_Http_Client * @var array */ protected $files = array(); + + /** + * Ordered list of keys from key/value pair data to include in body + * + * An associative array, where each element is of the format: + * '' => VTYPE_SCALAR | VTYPE_FILE + * + * @var array + */ + protected $body_field_order = array(); /** * The client's cookie jar @@ -230,6 +246,20 @@ class Zend_Http_Client */ protected $redirectCounter = 0; + /** + * Status for unmasking GET array params + * + * @var boolean + */ + protected $_unmaskStatus = false; + + /** + * Status if the http_build_query function escapes brackets + * + * @var boolean + */ + protected $_queryBracketsEscaped = true; + /** * Fileinfo magic database resource * @@ -255,6 +285,8 @@ public function __construct($uri = null, $config = null) if ($config !== null) { $this->setConfig($config); } + + $this->_queryBracketsEscaped = version_compare(phpversion(), '5.1.3', '>='); } /** @@ -266,7 +298,10 @@ public function __construct($uri = null, $config = null) */ public function setUri($uri) { - if (is_string($uri)) { + if ($uri instanceof Zend_Uri_Http) { + // clone the URI in order to keep the passed parameter constant + $uri = clone $uri; + } elseif (is_string($uri)) { $uri = Zend_Uri::factory($uri); } @@ -355,7 +390,7 @@ public function setMethod($method = self::GET) throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method."); } - if ($method == self::POST && $this->enctype === null) { + if (($method == self::POST || $method == self::PUT || $method == self::DELETE) && $this->enctype === null) { $this->setEncType(self::ENC_URLENCODED); } @@ -501,6 +536,12 @@ protected function _setParameter($type, $name, $value) break; case 'post': $parray = &$this->paramsPost; + if ( $value === null ) { + if (isset($this->body_field_order[$name])) + unset($this->body_field_order[$name]); + } else { + $this->body_field_order[$name] = self::VTYPE_SCALAR; + } break; } @@ -718,6 +759,8 @@ public function setFileUpload($filename, $formname, $data = null, $ctype = null) 'ctype' => $ctype, 'data' => $data ); + + $this->body_field_order[$formname] = self::VTYPE_FILE; return $this; } @@ -763,6 +806,35 @@ public function setRawData($data, $enctype = null) return $this; } + /** + * Set the unmask feature for GET parameters as array + * + * Example: + * foo%5B0%5D=a&foo%5B1%5D=b + * becomes + * foo=a&foo=b + * + * This is usefull for some services + * + * @param boolean $status + * @return Zend_Http_Client + */ + public function setUnmaskStatus($status = true) + { + $this->_unmaskStatus = (BOOL)$status; + return $this; + } + + /** + * Returns the currently configured unmask status + * + * @return boolean + */ + public function getUnmaskStatus() + { + return $this->_unmaskStatus; + } + /** * Clear all GET and POST parameters * @@ -782,7 +854,8 @@ public function resetParameters($clearAll = false) $this->paramsPost = array(); $this->files = array(); $this->raw_post_data = null; - + $this->enctype = null; + if($clearAll) { $this->headers = array(); $this->last_request = null; @@ -866,6 +939,10 @@ public function setAdapter($adapter) */ public function getAdapter() { + if (null === $this->adapter) { + $this->setAdapter($this->config['adapter']); + } + return $this->adapter; } @@ -911,10 +988,10 @@ protected function _openTempStream() // require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Could not open temp file {$this->_stream_name}"); } - + return $fp; } - + /** * Send the HTTP request and return an HTTP response object * @@ -955,6 +1032,15 @@ public function request($method = null) $query = str_replace('+', '%20', $query); } + // @see ZF-11671 to unmask for some services to foo=val1&foo=val2 + if ($this->getUnmaskStatus()) { + if ($this->_queryBracketsEscaped) { + $query = preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $query); + } else { + $query = preg_replace('/\\[(?:[0-9]|[1-9][0-9]+)\\]=/', '=', $query); + } + } + $uri->setQuery($query); } @@ -994,7 +1080,10 @@ public function request($method = null) } if($this->config['output_stream']) { - rewind($stream); + $streamMetaData = stream_get_meta_data($stream); + if ($streamMetaData['seekable']) { + rewind($stream); + } // cleanup the adapter $this->adapter->setOutputStream(null); $response = Zend_Http_Response_Stream::fromStream($response, $stream); @@ -1019,6 +1108,10 @@ public function request($method = null) // If we got redirected, look for the Location header if ($response->isRedirect() && ($location = $response->getHeader('location'))) { + // Avoid problems with buggy servers that add whitespace at the + // end of some headers (See ZF-11283) + $location = trim($location); + // Check whether we send the exact same request again, or drop the parameters // and send a GET request if ($response->getStatus() == 303 || @@ -1030,7 +1123,7 @@ public function request($method = null) } // If we got a well formed absolute URI - if (Zend_Uri_Http::check($location)) { + if (($scheme = substr($location, 0, 6)) && ($scheme == 'http:/' || $scheme == 'https:')) { $this->setHeaders('host', null); $this->setUri($location); @@ -1197,17 +1290,31 @@ protected function _prepareBody() // Encode body as multipart/form-data $boundary = '---ZENDHTTPCLIENT-' . md5(microtime()); $this->setHeaders(self::CONTENT_TYPE, self::ENC_FORMDATA . "; boundary={$boundary}"); - - // Get POST parameters and encode them - $params = self::_flattenParametersArray($this->paramsPost); - foreach ($params as $pp) { - $body .= self::encodeFormData($boundary, $pp[0], $pp[1]); - } - - // Encode files - foreach ($this->files as $file) { - $fhead = array(self::CONTENT_TYPE => $file['ctype']); - $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead); + + // Encode all files and POST vars in the order they were given + foreach ($this->body_field_order as $fieldName=>$fieldType) { + switch ($fieldType) { + case self::VTYPE_FILE: + foreach ($this->files as $file) { + if ($file['formname']===$fieldName) { + $fhead = array(self::CONTENT_TYPE => $file['ctype']); + $body .= self::encodeFormData($boundary, $file['formname'], $file['data'], $file['filename'], $fhead); + } + } + break; + case self::VTYPE_SCALAR: + if (isset($this->paramsPost[$fieldName])) { + if (is_array($this->paramsPost[$fieldName])) { + $flattened = self::_flattenParametersArray($this->paramsPost[$fieldName], $fieldName); + foreach ($flattened as $pp) { + $body .= self::encodeFormData($boundary, $pp[0], $pp[1]); + } + } else { + $body .= self::encodeFormData($boundary, $fieldName, $this->paramsPost[$fieldName]); + } + } + break; + } } $body .= "--{$boundary}--\r\n"; diff --git a/library/Zend/Http/Client/Adapter/Curl.php b/library/Zend/Http/Client/Adapter/Curl.php index 343f75d44..7e95b964b 100644 --- a/library/Zend/Http/Client/Adapter/Curl.php +++ b/library/Zend/Http/Client/Adapter/Curl.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Curl.php 22216 2010-05-20 21:12:05Z dragonbe $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Curl.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream @@ -334,7 +334,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo $curlMethod = CURLOPT_CUSTOMREQUEST; $curlValue = "TRACE"; break; - + case Zend_Http_Client::HEAD: $curlMethod = CURLOPT_CUSTOMREQUEST; $curlValue = "HEAD"; @@ -393,6 +393,9 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo } elseif ($method == Zend_Http_Client::PUT) { // This is a PUT by a setRawData string, not by file-handle curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body); + } elseif ($method == Zend_Http_Client::DELETE) { + // This is a DELETE by a setRawData string + curl_setopt($this->_curl, CURLOPT_POSTFIELDS, $body); } // set additional curl options diff --git a/library/Zend/Http/Client/Adapter/Exception.php b/library/Zend/Http/Client/Adapter/Exception.php index 082c8af30..f41548826 100644 --- a/library/Zend/Http/Client/Adapter/Exception.php +++ b/library/Zend/Http/Client/Adapter/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter_Exception - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Exception extends Zend_Http_Client_Exception diff --git a/library/Zend/Http/Client/Adapter/Interface.php b/library/Zend/Http/Client/Adapter/Interface.php index be9d18794..6b0e93ff3 100644 --- a/library/Zend/Http/Client/Adapter/Interface.php +++ b/library/Zend/Http/Client/Adapter/Interface.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Interface diff --git a/library/Zend/Http/Client/Adapter/Proxy.php b/library/Zend/Http/Client/Adapter/Proxy.php index fd2011ec4..cd1380185 100644 --- a/library/Zend/Http/Client/Adapter/Proxy.php +++ b/library/Zend/Http/Client/Adapter/Proxy.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Proxy.php 21792 2010-04-08 00:27:06Z stas $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Proxy.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket @@ -92,10 +92,10 @@ public function connect($host, $port = 80, $secure = false) if (! $this->config['proxy_host']) { return parent::connect($host, $port, $secure); } - + /* Url might require stream context even if proxy connection doesn't */ if ($secure) { - $this->config['sslusecontext'] = true; + $this->config['sslusecontext'] = true; } // Connect (a non-secure connection) to the proxy server @@ -174,20 +174,20 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod // Add the request body $request .= "\r\n" . $body; } - + // Send the request if (! @fwrite($this->socket, $request)) { // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server"); } - + if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } } - + return $request; } diff --git a/library/Zend/Http/Client/Adapter/Socket.php b/library/Zend/Http/Client/Adapter/Socket.php index a68435e84..96ab125fc 100644 --- a/library/Zend/Http/Client/Adapter/Socket.php +++ b/library/Zend/Http/Client/Adapter/Socket.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Socket.php 22576 2010-07-16 15:49:24Z dragonbe $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Socket.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream @@ -62,11 +62,11 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf /** * Stream for storing output - * + * * @var resource */ protected $out_stream = null; - + /** * Parameters array * @@ -124,17 +124,17 @@ public function setConfig($config = array()) } } - /** - * Retrieve the array of all configuration options - * - * @return array - */ - public function getConfig() - { - return $this->config; - } - - /** + /** + * Retrieve the array of all configuration options + * + * @return array + */ + public function getConfig() + { + return $this->config; + } + + /** * Set the stream context for the TCP connection to the server * * Can accept either a pre-existing stream context resource, or an array @@ -290,13 +290,13 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod // Add the request body $request .= "\r\n" . $body; } - + // Send the request if (! @fwrite($this->socket, $request)) { // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } - + if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { // require_once 'Zend/Http/Client/Adapter/Exception.php'; @@ -317,7 +317,6 @@ public function read() // First, read headers only $response = ''; $gotStatus = false; - $stream = !empty($this->config['stream']); while (($line = @fgets($this->socket)) !== false) { $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false); @@ -326,7 +325,7 @@ public function read() if (rtrim($line) === '') break; } } - + $this->_checkSocketReadTimeout(); $statusCode = Zend_Http_Response::extractCode($response); @@ -353,7 +352,7 @@ public function read() // If we got a 'transfer-encoding: chunked' header if (isset($headers['transfer-encoding'])) { - + if (strtolower($headers['transfer-encoding']) == 'chunked') { do { @@ -384,7 +383,7 @@ public function read() if($this->out_stream) { if(stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) { $this->_checkSocketReadTimeout(); - break; + break; } } else { $line = @fread($this->socket, $read_to - $current_pos); @@ -405,11 +404,11 @@ public function read() } while ($chunksize > 0); } else { $this->close(); - // require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' . $headers['transfer-encoding'] . '" transfer encoding'); } - + // We automatically decode chunked-messages when writing to a stream // this means we have to disallow the Zend_Http_Response to do it again if ($this->out_stream) { @@ -421,11 +420,11 @@ public function read() // If we got more than one Content-Length header (see ZF-9404) use // the last value sent if (is_array($headers['content-length'])) { - $contentLength = $headers['content-length'][count($headers['content-length']) - 1]; + $contentLength = $headers['content-length'][count($headers['content-length']) - 1]; } else { $contentLength = $headers['content-length']; } - + $current_pos = ftell($this->socket); $chunk = ''; @@ -436,7 +435,7 @@ public function read() if($this->out_stream) { if(@stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) { $this->_checkSocketReadTimeout(); - break; + break; } } else { $chunk = @fread($this->socket, $read_to - $current_pos); @@ -459,7 +458,7 @@ public function read() if($this->out_stream) { if(@stream_copy_to_stream($this->socket, $this->out_stream) == 0) { $this->_checkSocketReadTimeout(); - break; + break; } } else { $buff = @fread($this->socket, 8192); @@ -516,19 +515,19 @@ protected function _checkSocketReadTimeout() } } } - + /** * Set output stream for the response - * + * * @param resource $stream * @return Zend_Http_Client_Adapter_Socket */ - public function setOutputStream($stream) + public function setOutputStream($stream) { $this->out_stream = $stream; return $this; } - + /** * Destructor: make sure the socket is disconnected * diff --git a/library/Zend/Http/Client/Adapter/Stream.php b/library/Zend/Http/Client/Adapter/Stream.php old mode 100644 new mode 100755 index e776e1040..a869cf77a --- a/library/Zend/Http/Client/Adapter/Stream.php +++ b/library/Zend/Http/Client/Adapter/Stream.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Stream.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,18 +29,18 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Stream { /** * Set output stream - * + * * This function sets output stream where the result will be stored. - * + * * @param resource $stream Stream to write the output to - * + * */ - function setOutputStream($stream); + public function setOutputStream($stream); } diff --git a/library/Zend/Http/Client/Adapter/Test.php b/library/Zend/Http/Client/Adapter/Test.php index f97440086..eb711aa1d 100644 --- a/library/Zend/Http/Client/Adapter/Test.php +++ b/library/Zend/Http/Client/Adapter/Test.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @version $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Test.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interface @@ -235,4 +235,14 @@ public function setResponseIndex($index) } $this->responseIndex = $index; } + + /** + * Retrieve the array of all configuration options + * + * @return array + */ + public function getConfig() + { + return $this->config; + } } diff --git a/library/Zend/Http/Client/Exception.php b/library/Zend/Http/Client/Exception.php index dc35e3a0e..42323161a 100644 --- a/library/Zend/Http/Client/Exception.php +++ b/library/Zend/Http/Client/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Client_Exception - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Exception extends Zend_Http_Exception diff --git a/library/Zend/Http/Cookie.php b/library/Zend/Http/Cookie.php index 790a99c20..b8145fa86 100644 --- a/library/Zend/Http/Cookie.php +++ b/library/Zend/Http/Cookie.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Cookie - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Cookie.php 23443 2010-11-24 11:53:13Z shahar $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Cookie.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ * * @category Zend * @package Zend_Http - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Cookie diff --git a/library/Zend/Http/CookieJar.php b/library/Zend/Http/CookieJar.php index 1de99ee48..8cd0d0211 100644 --- a/library/Zend/Http/CookieJar.php +++ b/library/Zend/Http/CookieJar.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage CookieJar - * @version $Id: CookieJar.php 23443 2010-11-24 11:53:13Z shahar $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: CookieJar.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Http * @subpackage CookieJar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_CookieJar implements Countable, IteratorAggregate diff --git a/library/Zend/Http/Exception.php b/library/Zend/Http/Exception.php index 230c9c0a7..2715ddbb2 100644 --- a/library/Zend/Http/Exception.php +++ b/library/Zend/Http/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Http * @subpackage Exception - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Exception extends Zend_Exception diff --git a/library/Zend/Http/Response.php b/library/Zend/Http/Response.php index 934fc42dd..6d1fe3f1e 100644 --- a/library/Zend/Http/Response.php +++ b/library/Zend/Http/Response.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Response - * @version $Id: Response.php 22810 2010-08-08 10:29:09Z shahar $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Response.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response @@ -165,7 +165,7 @@ public function __construct($code, array $headers, $body = null, $version = '1.1 // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("'{$value}' is not a valid HTTP header"); } - + $name = trim($header[0]); $value = trim($header[1]); } diff --git a/library/Zend/Http/Response/Stream.php b/library/Zend/Http/Response/Stream.php old mode 100644 new mode 100755 index 288b65752..25fa0b9cf --- a/library/Zend/Http/Response/Stream.php +++ b/library/Zend/Http/Response/Stream.php @@ -16,8 +16,8 @@ * @category Zend * @package Zend_Http * @subpackage Response - * @version $Id: Stream.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response_Stream extends Zend_Http_Response @@ -90,7 +90,7 @@ public function getCleanup() { /** * Set the cleanup trigger * - * @param $cleanup Set cleanup trigger + * @param bool $cleanup Set cleanup trigger */ public function setCleanup($cleanup = true) { $this->_cleanup = $cleanup; diff --git a/library/Zend/Http/UserAgent.php b/library/Zend/Http/UserAgent.php index 38a455a76..b0754725d 100644 --- a/library/Zend/Http/UserAgent.php +++ b/library/Zend/Http/UserAgent.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http_UserAgent * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Http_UserAgent * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent implements Serializable @@ -52,17 +52,17 @@ class Zend_Http_UserAgent implements Serializable const DEFAULT_BROWSER_TYPE = 'desktop'; /** - * Default User Agent chain to prevent empty value + * Default User Agent chain to prevent empty value */ const DEFAULT_HTTP_USER_AGENT = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)'; /** - * Default Http Accept param to prevent empty value + * Default Http Accept param to prevent empty value */ const DEFAULT_HTTP_ACCEPT = "application/xhtml+xml"; /** - * Default markup language + * Default markup language */ const DEFAULT_MARKUP_LANGUAGE = "xhtml"; @@ -85,9 +85,9 @@ class Zend_Http_UserAgent implements Serializable /** * Array to store config * - * Default values are provided to ensure specific keys are present at + * Default values are provided to ensure specific keys are present at * instantiation. - * + * * @var array */ protected $_config = array( @@ -113,7 +113,7 @@ class Zend_Http_UserAgent implements Serializable * - User-Agent (defined in $_server) * - HTTP Accept value (defined in $_server) * - $_storage - * + * * @var bool */ protected $_immutable = false; @@ -139,7 +139,7 @@ class Zend_Http_UserAgent implements Serializable /** * Server variable - * + * * @var array */ protected $_server; @@ -153,8 +153,8 @@ class Zend_Http_UserAgent implements Serializable /** * Constructor - * - * @param null|array|Zend_Config|ArrayAccess $options + * + * @param null|array|Zend_Config|ArrayAccess $options * @return void */ public function __construct($options = null) @@ -166,16 +166,17 @@ public function __construct($options = null) /** * Serialized representation of the object - * + * * @return string */ public function serialize() { + $device = $this->getDevice(); $spec = array( 'browser_type' => $this->_browserType, 'config' => $this->_config, - 'device_class' => get_class($this->_device), - 'device' => $this->_device->serialize(), + 'device_class' => get_class($device), + 'device' => $device->serialize(), 'user_agent' => $this->getServerValue('http_user_agent'), 'http_accept' => $this->getServerValue('http_accept'), ); @@ -184,7 +185,7 @@ public function serialize() /** * Unserialize a previous representation of the object - * + * * @param string $serialized * @return void */ @@ -209,8 +210,8 @@ public function unserialize($serialized) /** * Configure instance - * - * @param array|Zend_Config|ArrayAccess $options + * + * @param array|Zend_Config|ArrayAccess $options * @return Zend_Http_UserAgent */ public function setOptions($options) @@ -219,8 +220,8 @@ public function setOptions($options) $options = $options->toArray(); } - if (!is_array($options) - && !$options instanceof ArrayAccess + if (!is_array($options) + && !$options instanceof ArrayAccess && !$options instanceof Traversable ) { // require_once 'Zend/Http/UserAgent/Exception.php'; @@ -273,7 +274,7 @@ public function setOptions($options) /** * Comparison of the UserAgent chain and browser signatures. - * + * * The comparison is case-insensitive : the browser signatures must be in lower * case * @@ -295,8 +296,8 @@ protected function _match($deviceClass) // Call match method on device class return call_user_func( - array($deviceClass, 'match'), - $userAgent, + array($deviceClass, 'match'), + $userAgent, $this->getServer() ); } @@ -315,7 +316,7 @@ protected function _getUserAgentDevice($browserType) return $this->_browserTypeClass[$browserType]; } - if (isset($this->_config[$browserType]) + if (isset($this->_config[$browserType]) && isset($this->_config[$browserType]['device']) ) { $deviceConfig = $this->_config[$browserType]['device']; @@ -410,9 +411,9 @@ public function setHttpAccept($httpAccept) /** * Returns the persistent storage handler * - * Session storage is used by default unless a different storage adapter - * has been set via the "persistent_storage_adapter" key. That key should - * contain either a fully qualified class name, or a short name that + * Session storage is used by default unless a different storage adapter + * has been set via the "persistent_storage_adapter" key. That key should + * contain either a fully qualified class name, or a short name that * resolves via the plugin loader. * * @param string $browser Browser identifier (User Agent chain) @@ -482,20 +483,20 @@ public function getConfig() /** * Config parameters is an Array or a Zend_Config object - * + * * The allowed parameters are : * - the identification sequence (can be empty) => desktop browser type is the * default browser type returned * $config['identification_sequence'] : ',' separated browser types - * - the persistent storage adapter + * - the persistent storage adapter * $config['persistent_storage_adapter'] = "Session" or "NonPersistent" - * - to add or replace a browser type device + * - to add or replace a browser type device * $config[(type)]['device']['path'] * $config[(type)]['device']['classname'] - * - to add or replace a browser type features adapter + * - to add or replace a browser type features adapter * $config[(type)]['features']['path'] * $config[(type)]['features']['classname'] - * + * * @param mixed $config (option) Config array * @return Zend_Http_UserAgent */ @@ -504,7 +505,7 @@ public function setConfig($config = array()) if ($config instanceof Zend_Config) { $config = $config->toArray(); } - + // Verify that Config parameters are in an array. if (!is_array($config) && !$config instanceof Traversable) { // require_once 'Zend/Http/UserAgent/Exception.php'; @@ -528,7 +529,12 @@ public function setConfig($config = array()) } /** - * @return the $device + * Returns the device object + * + * This is the object that will contain the various discovered device + * capabilities. + * + * @return Zend_Http_UserAgent_Device $device */ public function getDevice() { @@ -540,9 +546,9 @@ public function getDevice() // search an existing identification in the session $storage = $this->getStorage($userAgent); - + if (!$storage->isEmpty()) { - // If the user agent and features are already existing, the + // If the user agent and features are already existing, the // Zend_Http_UserAgent object is serialized in the session $object = $storage->read(); $this->unserialize($object); @@ -551,7 +557,7 @@ public function getDevice() // Find the browser type: $this->setBrowserType($this->_matchUserAgent()); $this->_createDevice(); - + // put the result in storage: $this->getStorage($userAgent) ->write($this->serialize()); @@ -596,10 +602,10 @@ public function setBrowserType($browserType) /** * Retrieve the "$_SERVER" array * - * Basically, the $_SERVER array or an equivalent container storing the + * Basically, the $_SERVER array or an equivalent container storing the * data that will be introspected. * - * If the value has not been previously set, it sets itself from the + * If the value has not been previously set, it sets itself from the * $_SERVER superglobal. * * @return array @@ -613,9 +619,9 @@ public function getServer() } /** - * Retrieve the "$_SERVER" array + * Set the "$_SERVER" array * - * Basically, the $_SERVER array or an equivalent container storing the + * Basically, the $_SERVER array or an equivalent container storing the * data that will be introspected. * * @param array|ArrayAccess $server @@ -660,7 +666,7 @@ public function setServer($server) /** * Retrieve a server value - * + * * @param string $key * @return mixed */ @@ -700,9 +706,9 @@ public function setServerValue($key, $value) /** * Set plugin loader - * + * * @param string $type Type of plugin loader; one of 'storage', (?) - * @param string|Zend_Loader_PluginLoader $loader + * @param string|Zend_Loader_PluginLoader $loader * @return Zend_Http_UserAgent */ public function setPluginLoader($type, $loader) @@ -749,7 +755,7 @@ public function setPluginLoader($type, $loader) /** * Get a plugin loader - * + * * @param string $type A valid plugin loader type; see {@link $_loaderTypes} * @return Zend_Loader_PluginLoader */ @@ -766,10 +772,10 @@ public function getPluginLoader($type) /** * Validate a plugin loader type * - * Verifies that it is in {@link $_loaderTypes}, and returns a normalized + * Verifies that it is in {@link $_loaderTypes}, and returns a normalized * version of the type. - * - * @param string $type + * + * @param string $type * @return string * @throws Zend_Http_UserAgent_Exception on invalid type */ diff --git a/library/Zend/Http/UserAgent/AbstractDevice.php b/library/Zend/Http/UserAgent/AbstractDevice.php index 88fbcd794..3c877a483 100644 --- a/library/Zend/Http/UserAgent/AbstractDevice.php +++ b/library/Zend/Http/UserAgent/AbstractDevice.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Http_UserAgent_AbstractDevice @@ -49,7 +49,7 @@ abstract class Zend_Http_UserAgent_AbstractDevice /** * Configuration - * + * * @var array */ protected $_config; @@ -63,22 +63,22 @@ abstract class Zend_Http_UserAgent_AbstractDevice /** * Server variable - * + * * @var array */ protected $_server; /** * Image types - * + * * @var array */ protected $_images = array( - 'jpeg', - 'gif', - 'png', - 'pjpeg', - 'x-png', + 'jpeg', + 'gif', + 'png', + 'pjpeg', + 'x-png', 'bmp', ); @@ -100,8 +100,8 @@ abstract class Zend_Http_UserAgent_AbstractDevice * Constructor * * @param null|string|array $userAgent If array, restores from serialized version - * @param array $server - * @param array $config + * @param array $server + * @param array $config * @return void */ public function __construct($userAgent = null, array $server = array(), array $config = array()) @@ -121,7 +121,7 @@ public function __construct($userAgent = null, array $server = array(), array $c /** * Serialize object - * + * * @return string */ public function serialize() @@ -139,8 +139,8 @@ public function serialize() /** * Unserialize - * - * @param string $serialized + * + * @param string $serialized * @return void */ public function unserialize($serialized) @@ -151,8 +151,8 @@ public function unserialize($serialized) /** * Restore object state from array - * - * @param array $spec + * + * @param array $spec * @return void */ protected function _restoreFromArray(array $spec) @@ -176,7 +176,7 @@ protected function _defineFeatures() if (is_array($features)) { $this->_aFeatures = array_merge($this->_aFeatures, $features); } - + return $this->_aFeatures; } @@ -286,16 +286,16 @@ public function getAllGroups() protected function _getDefaultFeatures() { $server = array(); - - // gets info from user agent chain + + // gets info from user agent chain $uaExtract = $this->extractFromUserAgent($this->getUserAgent()); - + if (is_array($uaExtract)) { foreach ($uaExtract as $key => $info) { $this->setFeature($key, $info, 'product_info'); } } - + if (isset($uaExtract['browser_name'])) { $this->_browser = $uaExtract['browser_name']; } @@ -305,7 +305,7 @@ protected function _getDefaultFeatures() if (isset($uaExtract['device_os'])) { $this->device_os = $uaExtract['device_os_name']; } - + /* browser & device info */ $this->setFeature('is_wireless_device', false, 'product_info'); $this->setFeature('is_mobile', false, 'product_info'); @@ -315,9 +315,9 @@ protected function _getDefaultFeatures() $this->setFeature('is_email', false, 'product_info'); $this->setFeature('is_text', false, 'product_info'); $this->setFeature('device_claims_web_support', false, 'product_info'); - + $this->setFeature('is_' . strtolower($this->getType()), true, 'product_info'); - + /* sets the browser name */ if (isset($this->list) && empty($this->_browser)) { $lowerUserAgent = strtolower($this->getUserAgent()); @@ -328,7 +328,7 @@ protected function _getDefaultFeatures() } } } - + /* sets the client IP */ if (isset($this->_server['remote_addr'])) { $this->setFeature('client_ip', $this->_server['remote_addr'], 'product_info'); @@ -337,7 +337,7 @@ protected function _getDefaultFeatures() } elseif (isset($this->_server['http_client_ip'])) { $this->setFeature('client_ip', $this->_server['http_client_ip'], 'product_info'); } - + /* sets the server infos */ if (isset($this->_server['server_software'])) { if (strpos($this->_server['server_software'], 'Apache') !== false || strpos($this->_server['server_software'], 'LiteSpeed') !== false) { @@ -347,11 +347,11 @@ protected function _getDefaultFeatures() } $server['server'] = 'apache'; } - + if (strpos($this->_server['server_software'], 'Microsoft-IIS') !== false) { $server['server'] = 'iis'; } - + if (strpos($this->_server['server_software'], 'Unix') !== false) { $server['os'] = 'unix'; if (isset($_ENV['MACHTYPE'])) { @@ -362,7 +362,7 @@ protected function _getDefaultFeatures() } elseif (strpos($this->_server['server_software'], 'Win') !== false) { $server['os'] = 'windows'; } - + if (preg_match('/Apache\/([0-9\.]*)/', $this->_server['server_software'], $arr)) { if ($arr[1]) { $server['version'] = $arr[1]; @@ -370,7 +370,7 @@ protected function _getDefaultFeatures() } } } - + $this->setFeature('php_version', phpversion(), 'server_info'); if (isset($server['server'])) { $this->setFeature('server_os', $server['server'], 'server_info'); @@ -401,7 +401,7 @@ protected function _getDefaultFeatures() public static function extractFromUserAgent($userAgent) { $userAgent = trim($userAgent); - + /** * @see http://www.texsoft.it/index.php?c=software&m=sw.php.useragent&l=it */ @@ -412,13 +412,13 @@ public static function extractFromUserAgent($userAgent) if (isset($match[7])) { $comment = explode(';', $match[7]); } - + // second part if exists $end = substr($userAgent, strlen($match[0])); if (!empty($end)) { $result['others']['full'] = $end; } - + $match2 = array(); if (isset($result['others'])) { preg_match_all('/(([^\/\s]*)(\/)?([^\/\(\)\s]*)?)(\s\((([^\)]*)*)\))?/i', $result['others']['full'], $match2); @@ -451,18 +451,18 @@ public static function extractFromUserAgent($userAgent) for ($i = 0; $i < $max; $i ++) { if (!empty($match2[0][$i])) { $result['others']['detail'][] = array( - $match2[0][$i], - $match2[2][$i], + $match2[0][$i], + $match2[2][$i], $match2[4][$i], ); } } } - + /** Security level */ $security = array( - 'N' => 'no security', - 'U' => 'strong security', + 'N' => 'no security', + 'U' => 'strong security', 'I' => 'weak security', ); if (!empty($result['browser_token'])) { @@ -471,9 +471,9 @@ public static function extractFromUserAgent($userAgent) unset($result['browser_token']); } } - + $product = strtolower($result['browser_name']); - + // Mozilla : true && false $compatibleOrIe = false; if (isset($result['compatibility_flag']) && isset($result['comment'])) { @@ -492,26 +492,28 @@ public static function extractFromUserAgent($userAgent) $real[1][0] = "Internet Explorer"; $temp = explode(' ', trim($v)); $real[3][0] = $temp[1]; - + } if (strpos($v, 'Win') !== false) { $result['device_os_token'] = trim($v); } } } - + if (!empty($real[0])) { $result['browser_name'] = $real[1][0]; $result['browser_version'] = $real[3][0]; } else { - $result['browser_name'] = $result['browser_token']; + if(isset($result['browser_token'])) { + $result['browser_name'] = $result['browser_token']; + } $result['browser_version'] = '??'; } } elseif ($product == 'mozilla' && $result['browser_version'] < 5.0) { // handles the real Mozilla (or old Netscape if version < 5.0) $result['browser_name'] = 'Netscape'; } - + /** windows */ if ($result['browser_name'] == 'MSIE') { $result['browser_engine'] = 'MSIE'; @@ -519,21 +521,21 @@ public static function extractFromUserAgent($userAgent) } if (isset($result['device_os_token'])) { if (strpos($result['device_os_token'], 'Win') !== false) { - + $windows = array( - 'Windows NT 6.1' => 'Windows 7', - 'Windows NT 6.0' => 'Windows Vista', - 'Windows NT 5.2' => 'Windows Server 2003', - 'Windows NT 5.1' => 'Windows XP', - 'Windows NT 5.01' => 'Windows 2000 SP1', - 'Windows NT 5.0' => 'Windows 2000', - 'Windows NT 4.0' => 'Microsoft Windows NT 4.0', - 'WinNT' => 'Microsoft Windows NT 4.0', - 'Windows 98; Win 9x 4.90' => 'Windows Me', - 'Windows 98' => 'Windows 98', - 'Win98' => 'Windows 98', - 'Windows 95' => 'Windows 95', - 'Win95' => 'Windows 95', + 'Windows NT 6.1' => 'Windows 7', + 'Windows NT 6.0' => 'Windows Vista', + 'Windows NT 5.2' => 'Windows Server 2003', + 'Windows NT 5.1' => 'Windows XP', + 'Windows NT 5.01' => 'Windows 2000 SP1', + 'Windows NT 5.0' => 'Windows 2000', + 'Windows NT 4.0' => 'Microsoft Windows NT 4.0', + 'WinNT' => 'Microsoft Windows NT 4.0', + 'Windows 98; Win 9x 4.90' => 'Windows Me', + 'Windows 98' => 'Windows 98', + 'Win98' => 'Windows 98', + 'Windows 95' => 'Windows 95', + 'Win95' => 'Windows 95', 'Windows CE' => 'Windows CE', ); if (isset($windows[$result['device_os_token']])) { @@ -543,19 +545,25 @@ public static function extractFromUserAgent($userAgent) } } } - - // iphone + + // iphone $apple_device = array( - 'iPhone', - 'iPod', + 'iPhone', + 'iPod', 'iPad', ); if (isset($result['compatibility_flag'])) { if (in_array($result['compatibility_flag'], $apple_device)) { $result['device'] = strtolower($result['compatibility_flag']); $result['device_os_token'] = 'iPhone OS'; - $result['browser_language'] = trim($comment[3]); - $result['browser_version'] = $result['others']['detail'][1][2]; + if (isset($comment[3])) { + $result['browser_language'] = trim($comment[3]); + } + if (isset($result['others']['detail'][1])) { + $result['browser_version'] = $result['others']['detail'][1][2]; + } elseif (isset($result['others']['detail']) && count($result['others']['detail'])) { + $result['browser_version'] = $result['others']['detail'][0][2]; + } if (!empty($result['others']['detail'][2])) { $result['firmware'] = $result['others']['detail'][2][2]; } @@ -565,12 +573,12 @@ public static function extractFromUserAgent($userAgent) } } } - + // Safari if (isset($result['others'])) { if ($result['others']['detail'][0][1] == 'AppleWebKit') { $result['browser_engine'] = 'AppleWebKit'; - if ($result['others']['detail'][1][1] == 'Version') { + if (isset($result['others']['detail'][1]) && $result['others']['detail'][1][1] == 'Version') { $result['browser_version'] = $result['others']['detail'][1][2]; } else { $result['browser_version'] = $result['others']['detail'][count($result['others']['detail']) - 1][2]; @@ -578,16 +586,21 @@ public static function extractFromUserAgent($userAgent) if (isset($comment[3])) { $result['browser_language'] = trim($comment[3]); } - + $last = $result['others']['detail'][count($result['others']['detail']) - 1][1]; - + if (empty($result['others']['detail'][2][1]) || $result['others']['detail'][2][1] == 'Safari') { - $result['browser_name'] = ($result['others']['detail'][1][1] && $result['others']['detail'][1][1] != 'Version' ? $result['others']['detail'][1][1] : 'Safari'); - $result['browser_version'] = ($result['others']['detail'][1][2] ? $result['others']['detail'][1][2] : $result['others']['detail'][0][2]); + if (isset($result['others']['detail'][1])) { + $result['browser_name'] = ($result['others']['detail'][1][1] && $result['others']['detail'][1][1] != 'Version' ? $result['others']['detail'][1][1] : 'Safari'); + $result['browser_version'] = ($result['others']['detail'][1][2] ? $result['others']['detail'][1][2] : $result['others']['detail'][0][2]); + } else { + $result['browser_name'] = ($result['others']['detail'][0][1] && $result['others']['detail'][0][1] != 'Version' ? $result['others']['detail'][0][1] : 'Safari'); + $result['browser_version'] = $result['others']['detail'][0][2]; + } } else { $result['browser_name'] = $result['others']['detail'][2][1]; $result['browser_version'] = $result['others']['detail'][2][2]; - + // mobile version if ($result['browser_name'] == 'Mobile') { $result['browser_name'] = 'Safari ' . $result['browser_name']; @@ -596,18 +609,18 @@ public static function extractFromUserAgent($userAgent) } } } - + // For Safari < 2.2, AppleWebKit version gives the Safari version if (strpos($result['browser_version'], '.') > 2 || (int) $result['browser_version'] > 20) { $temp = explode('.', $result['browser_version']); $build = (int) $temp[0]; $awkVersion = array( - 48 => '0.8', - 73 => '0.9', - 85 => '1.0', - 103 => '1.1', - 124 => '1.2', - 300 => '1.3', + 48 => '0.8', + 73 => '0.9', + 85 => '1.0', + 103 => '1.1', + 124 => '1.2', + 300 => '1.3', 400 => '2.0', ); foreach ($awkVersion as $k => $v) { @@ -617,28 +630,28 @@ public static function extractFromUserAgent($userAgent) } } } - + // Gecko (Firefox or compatible) if ($result['others']['detail'][0][1] == 'Gecko') { $searchRV = true; if (!empty($result['others']['detail'][1][1]) && !empty($result['others']['detail'][count($result['others']['detail']) - 1][2]) || strpos(strtolower($result['others']['full']), 'opera') !== false) { $searchRV = false; $result['browser_engine'] = $result['others']['detail'][0][1]; - - // the name of the application is at the end indepenently + + // the name of the application is at the end indepenently // of quantity of information in $result['others']['detail'] $last = count($result['others']['detail']) - 1; - - // exception : if the version of the last information is + + // exception : if the version of the last information is // empty we take the previous one if (empty($result['others']['detail'][$last][2])) { $last --; } - - // exception : if the last one is 'Red Hat' or 'Debian' => + + // exception : if the last one is 'Red Hat' or 'Debian' => // use rv: to find browser_version */ if (in_array($result['others']['detail'][$last][1], array( - 'Debian', + 'Debian', 'Hat', ))) { $searchRV = true; @@ -648,8 +661,10 @@ public static function extractFromUserAgent($userAgent) if (isset($comment[4])) { $result['browser_build'] = trim($comment[4]); } - $result['browser_language'] = trim($comment[3]); - + if (isset($comment[3])) { + $result['browser_language'] = trim($comment[3]); + } + // Netscape if ($result['browser_name'] == 'Navigator' || $result['browser_name'] == 'Netscape6') { $result['browser_name'] = 'Netscape'; @@ -667,14 +682,14 @@ public static function extractFromUserAgent($userAgent) } } } - + // Netscape if ($result['others']['detail'][0][1] == 'Netscape') { $result['browser_name'] = 'Netscape'; $result['browser_version'] = $result['others']['detail'][0][2]; } - - // Opera + + // Opera // Opera: engine Presto if ($result['others']['detail'][0][1] == 'Presto') { $result['browser_engine'] = 'Presto'; @@ -682,40 +697,46 @@ public static function extractFromUserAgent($userAgent) $result['browser_version'] = $result['others']['detail'][1][2]; } } - - // UA ends with 'Opera X.XX' + + // UA ends with 'Opera X.XX' or 'Opera/X.XX' if ($result['others']['detail'][0][1] == 'Opera') { $result['browser_name'] = $result['others']['detail'][0][1]; - $result['browser_version'] = $result['others']['detail'][1][1]; + // Opera X.XX + if (isset($result['others']['detail'][1][1])) { + $result['browser_version'] = $result['others']['detail'][1][1]; + // Opera/X.XX + } elseif (isset($result['others']['detail'][0][2])) { + $result['browser_version'] = $result['others']['detail'][0][2]; + } } - + // Opera Mini if (isset($result["browser_token"])) { if (strpos($result["browser_token"], 'Opera Mini') !== false) { $result['browser_name'] = 'Opera Mini'; } } - + // Symbian if ($result['others']['detail'][0][1] == 'SymbianOS') { $result['device_os_token'] = 'SymbianOS'; } } - + // UA ends with 'Opera X.XX' if (isset($result['browser_name']) && isset($result['browser_engine'])) { if ($result['browser_name'] == 'Opera' && $result['browser_engine'] == 'Gecko' && empty($result['browser_version'])) { $result['browser_version'] = $result['others']['detail'][count($result['others']['detail']) - 1][1]; } } - + // cleanup if (isset($result['browser_version']) && isset($result['browser_build'])) { if ($result['browser_version'] == $result['browser_build']) { unset($result['browser_build']); } } - + // compatibility $compatibility['AppleWebKit'] = 'Safari'; $compatibility['Gecko'] = 'Firefox'; @@ -726,7 +747,7 @@ public static function extractFromUserAgent($userAgent) $result['browser_compatibility'] = $compatibility[$result['browser_engine']]; } } - + ksort($result); return $result; } @@ -760,13 +781,13 @@ protected function _loadFeaturesAdapter() // require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "path" config parameter defined'); } - + if (false === include_once ($path)) { // require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter path that does not exist'); } } - + return call_user_func(array($className, 'getFromRequest'), $this->_server, $this->_config); } @@ -953,9 +974,9 @@ public function setImages($_images) /** * Match a user agent string against a list of signatures - * - * @param string $userAgent - * @param array $signatures + * + * @param string $userAgent + * @param array $signatures * @return bool */ protected static function _matchAgentAgainstSignatures($userAgent, $signatures) diff --git a/library/Zend/Http/UserAgent/Bot.php b/library/Zend/Http/UserAgent/Bot.php index a54c8d4bd..66d16339e 100644 --- a/library/Zend/Http/UserAgent/Bot.php +++ b/library/Zend/Http/UserAgent/Bot.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ // require_once 'Zend/Http/UserAgent/AbstractDevice.php'; @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -40,67 +40,68 @@ class Zend_Http_UserAgent_Bot extends Zend_Http_UserAgent_AbstractDevice */ protected static $_uaSignatures = array( // The most common ones. - 'googlebot', - 'msnbot', - 'slurp', + 'googlebot', + 'msnbot', + 'slurp', 'yahoo', // The rest, alphabetically. - 'alexa', - 'appie', - 'archiver', - 'ask jeeves', - 'baiduspider', - 'bot', - 'crawl', - 'crawler', - 'curl', - 'eventbox', - 'facebookexternal', - 'fast', - 'feedfetcher-google', - 'firefly', - 'froogle', - 'gigabot', - 'girafabot', - 'google', - 'infoseek', - 'inktomi', - 'java', + 'alexa', + 'appie', + 'archiver', + 'ask jeeves', + 'baiduspider', + 'bot', + 'crawl', + 'crawler', + 'curl', + 'eventbox', + 'facebookexternal', + 'fast', + 'feedfetcher-google', + 'firefly', + 'froogle', + 'gigabot', + 'girafabot', + 'google', + 'htdig', + 'infoseek', + 'inktomi', + 'java', 'larbin', - 'looksmart', - 'mechanize', - 'mediapartners-google', - 'monitor', - 'nambu', - 'nationaldirectory', - 'novarra', - 'pear', - 'perl', - 'python', - 'rabaz', - 'radian', - 'rankivabot', - 'scooter', - 'sogou web spider', - 'spade', - 'sphere', - 'spider', - 'technoratisnoop', - 'tecnoseek', - 'teoma', - 'toolbar', - 'transcoder', - 'twitt', - 'url_spider_sql', - 'webalta crawler', - 'webbug', - 'webfindbot', - 'wordpress', - 'www.galaxy.com', - 'yahoo! searchmonkey', - 'yahoo! slurp', - 'yandex', + 'looksmart', + 'mechanize', + 'mediapartners-google', + 'monitor', + 'nambu', + 'nationaldirectory', + 'novarra', + 'pear', + 'perl', + 'python', + 'rabaz', + 'radian', + 'rankivabot', + 'scooter', + 'sogou web spider', + 'spade', + 'sphere', + 'spider', + 'technoratisnoop', + 'tecnoseek', + 'teoma', + 'toolbar', + 'transcoder', + 'twitt', + 'url_spider_sql', + 'webalta crawler', + 'webbug', + 'webfindbot', + 'wordpress', + 'www.galaxy.com', + 'yahoo! searchmonkey', + 'yahoo! slurp', + 'yandex', 'zyborg', ); diff --git a/library/Zend/Http/UserAgent/Checker.php b/library/Zend/Http/UserAgent/Checker.php index e7ddc925f..f509964ae 100644 --- a/library/Zend/Http/UserAgent/Checker.php +++ b/library/Zend/Http/UserAgent/Checker.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ // require_once 'Zend/Http/UserAgent/Desktop.php'; @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -40,15 +40,15 @@ class Zend_Http_UserAgent_Checker extends Zend_Http_UserAgent_Desktop */ protected static $_uaSignatures = array( 'abilogic', - 'checklink', - 'checker', - 'linksmanager', - 'mojoo', - 'notifixious', - 'ploetz', - 'zeller', - 'sitebar', - 'xenu', + 'checklink', + 'checker', + 'linksmanager', + 'mojoo', + 'notifixious', + 'ploetz', + 'zeller', + 'sitebar', + 'xenu', 'sleuth', ); diff --git a/library/Zend/Http/UserAgent/Console.php b/library/Zend/Http/UserAgent/Console.php index a0d503261..4fd158610 100644 --- a/library/Zend/Http/UserAgent/Console.php +++ b/library/Zend/Http/UserAgent/Console.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Console extends Zend_Http_UserAgent_Desktop @@ -38,8 +38,8 @@ class Zend_Http_UserAgent_Console extends Zend_Http_UserAgent_Desktop * @var array */ protected static $_uaSignatures = array( - 'playstation', - 'wii', + 'playstation', + 'wii', 'libnup', ); diff --git a/library/Zend/Http/UserAgent/Desktop.php b/library/Zend/Http/UserAgent/Desktop.php index 422b1bc78..f378206bb 100644 --- a/library/Zend/Http/UserAgent/Desktop.php +++ b/library/Zend/Http/UserAgent/Desktop.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Browser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Desktop extends Zend_Http_UserAgent_AbstractDevice diff --git a/library/Zend/Http/UserAgent/Device.php b/library/Zend/Http/UserAgent/Device.php index 7b7bc3373..5d30b5a22 100644 --- a/library/Zend/Http/UserAgent/Device.php +++ b/library/Zend/Http/UserAgent/Device.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_UserAgent_Device extends Serializable @@ -33,13 +33,13 @@ interface Zend_Http_UserAgent_Device extends Serializable /** * Constructor * - * Allows injecting user agent, server array, and/or config array. If an + * Allows injecting user agent, server array, and/or config array. If an * array is provided for the first argument, the assumption should be that * the device object is being seeded with cached values from serialization. - * - * @param null|string|array $userAgent - * @param array $server - * @param array $config + * + * @param null|string|array $userAgent + * @param array $server + * @param array $config * @return void */ public function __construct($userAgent = null, array $server = array(), array $config = array()); @@ -48,145 +48,145 @@ public function __construct($userAgent = null, array $server = array(), array $c * Attempt to match the user agent * * Return either an array of browser signature strings, or a boolean. - * - * @param string $userAgent - * @param array $server + * + * @param string $userAgent + * @param array $server * @return bool|array */ public static function match($userAgent, $server); /** * Get all browser/device features - * + * * @return array */ public function getAllFeatures(); /** * Get all of the browser/device's features' groups - * + * * @return void */ public function getAllGroups(); /** * Whether or not the device has a given feature - * - * @param string $feature + * + * @param string $feature * @return bool */ public function hasFeature($feature); /** * Get the value of a specific device feature - * - * @param string $feature + * + * @param string $feature * @return mixed */ public function getFeature($feature); /** * Get the browser type - * + * * @return string */ public function getBrowser(); /** * Retrurn the browser version - * + * * @return string */ public function getBrowserVersion(); /** * Get an array of features associated with a group - * - * @param string $group + * + * @param string $group * @return array */ public function getGroup($group); /** * Retrieve image format support - * + * * @return array */ public function getImageFormatSupport(); /** * Get image types - * + * * @return array */ public function getImages(); /** * Get the maximum image height supported by this device - * + * * @return int */ public function getMaxImageHeight(); /** * Get the maximum image width supported by this device - * + * * @return int */ public function getMaxImageWidth(); /** * Get the physical screen height of this device - * + * * @return int */ public function getPhysicalScreenHeight(); /** * Get the physical screen width of this device - * + * * @return int */ public function getPhysicalScreenWidth(); /** * Get the preferred markup type - * + * * @return string */ public function getPreferredMarkup(); /** * Get the user agent string - * + * * @return string */ public function getUserAgent(); /** * Get supported X/HTML version - * + * * @return int */ public function getXhtmlSupportLevel(); /** * Does the device support Flash? - * + * * @return bool */ public function hasFlashSupport(); /** * Does the device support PDF? - * + * * @return bool */ public function hasPdfSupport(); /** * Does the device have a phone number associated with it? - * + * * @return bool */ public function hasPhoneNumber(); diff --git a/library/Zend/Http/UserAgent/Email.php b/library/Zend/Http/UserAgent/Email.php index 28ba15955..79dc4a0e6 100644 --- a/library/Zend/Http/UserAgent/Email.php +++ b/library/Zend/Http/UserAgent/Email.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Email extends Zend_Http_UserAgent_Desktop diff --git a/library/Zend/Http/UserAgent/Exception.php b/library/Zend/Http/UserAgent/Exception.php index 7e6b303d7..c72b32c64 100644 --- a/library/Zend/Http/UserAgent/Exception.php +++ b/library/Zend/Http/UserAgent/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Exception extends Zend_Exception diff --git a/library/Zend/Http/UserAgent/Features/Adapter.php b/library/Zend/Http/UserAgent/Features/Adapter.php index d6d46142a..85acb70cf 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter.php +++ b/library/Zend/Http/UserAgent/Features/Adapter.php @@ -15,17 +15,17 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ /** - * The interface required by all Zend_Browser_Features Adapter classes to implement. + * The interface required by all Zend_Browser_Features Adapter classes to implement. * * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_UserAgent_Features_Adapter diff --git a/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php b/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php index 033644925..2b9959f1a 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php +++ b/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,12 +26,12 @@ /** * Features adapter build with the Tera Wurfl Api - * See installation instruction here : http://deviceatlas.com/licences + * See installation instruction here : http://deviceatlas.com/licences * Download : http://deviceatlas.com/getAPI/php * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Adapter_DeviceAtlas implements Zend_Http_UserAgent_Features_Adapter @@ -50,9 +50,9 @@ public static function getFromRequest($request, array $config) throw new Zend_Http_UserAgent_Features_Exception('"DeviceAtlas" configuration is not defined'); } } - + $config = $config['deviceatlas']; - + if (!class_exists('Mobi_Mtld_DA_Api')) { if (empty($config['deviceatlas_lib_dir'])) { // require_once 'Zend/Http/UserAgent/Features/Exception.php'; @@ -62,17 +62,17 @@ public static function getFromRequest($request, array $config) // Include the Device Atlas file from the specified lib_dir // require_once ($config['deviceatlas_lib_dir'] . '/Mobi/Mtld/DA/Api.php'); } - + if (empty($config['deviceatlas_data'])) { // require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_data" parameter is not defined'); } - + //load the device data-tree : e.g. 'json/DeviceAtlas.json $tree = Mobi_Mtld_DA_Api::getTreeFromFile($config['deviceatlas_data']); - + $properties = Mobi_Mtld_DA_Api::getProperties($tree, $request['http_user_agent']); - + return $properties; } } diff --git a/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php b/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php index 224e9b2bd..ca272d68c 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php +++ b/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,12 +26,12 @@ /** * Features adapter build with the Tera Wurfl Api - * See installation instruction here : http://www.tera-wurfl.com/wiki/index.php/Installation + * See installation instruction here : http://www.tera-wurfl.com/wiki/index.php/Installation * Download : http://www.tera-wurfl.com/wiki/index.php/Downloads * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Adapter_TeraWurfl implements Zend_Http_UserAgent_Features_Adapter @@ -45,7 +45,7 @@ class Zend_Http_UserAgent_Features_Adapter_TeraWurfl implements Zend_Http_UserAg public static function getFromRequest($request, array $config) { if (!class_exists('TeraWurfl')) { - // If TeraWurfl class not found, see if we can load it from + // If TeraWurfl class not found, see if we can load it from // configuration // if (!isset($config['terawurfl'])) { @@ -53,7 +53,7 @@ public static function getFromRequest($request, array $config) // require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('"TeraWurfl" configuration is not defined'); } - + $config = $config['terawurfl']; if (empty($config['terawurfl_lib_dir'])) { @@ -65,25 +65,25 @@ public static function getFromRequest($request, array $config) // Include the Tera-WURFL file // require_once ($config['terawurfl_lib_dir'] . '/TeraWurfl.php'); } - - + + // instantiate the Tera-WURFL object $wurflObj = new TeraWurfl(); - + // Get the capabilities of the current client. $matched = $wurflObj->getDeviceCapabilitiesFromRequest(array_change_key_case($request, CASE_UPPER)); - + return self::getAllCapabilities($wurflObj); } /*** * Builds an array with all capabilities - * + * * @param TeraWurfl $wurflObj TeraWurfl object */ public static function getAllCapabilities(TeraWurfl $wurflObj) { - + foreach ($wurflObj->capabilities as $group) { if (!is_array($group)) { continue; diff --git a/library/Zend/Http/UserAgent/Features/Adapter/WurflApi.php b/library/Zend/Http/UserAgent/Features/Adapter/WurflApi.php index 691460b4d..3bd4b21e5 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter/WurflApi.php +++ b/library/Zend/Http/UserAgent/Features/Adapter/WurflApi.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,16 +26,16 @@ /** * Features adapter build with the official WURFL PHP API - * See installation instruction here : http://wurfl.sourceforge.net/nphp/ + * See installation instruction here : http://wurfl.sourceforge.net/nphp/ * Download : http://sourceforge.net/projects/wurfl/files/WURFL PHP/1.1/wurfl-php-1.1.tar.gz/download * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Adapter_WurflApi - implements Zend_Http_UserAgent_Features_Adapter + implements Zend_Http_UserAgent_Features_Adapter { const DEFAULT_API_VERSION = '1.1'; @@ -53,7 +53,7 @@ public static function getFromRequest($request, array $config) } $config = $config['wurflapi']; - + if (empty($config['wurfl_lib_dir'])) { // require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "wurfl_lib_dir" parameter is not defined'); @@ -62,11 +62,11 @@ public static function getFromRequest($request, array $config) // require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "wurfl_config_file" parameter is not defined'); } - + if (empty($config['wurfl_api_version'])) { $config['wurfl_api_version'] = self::DEFAULT_API_VERSION; } - + switch ($config['wurfl_api_version']) { case '1.0': // Zend_Http_UserAgent::$config['wurfl_config_file'] must be an XML file @@ -84,14 +84,14 @@ public static function getFromRequest($request, array $config) ->wurflPatch($c['wurfl']['patches']) ->persistence($c['persistence']['provider'], $c['persistence']['dir']); } - + $wurflManagerFactory = new WURFL_WURFLManagerFactory($wurflConfig); $wurflManager = $wurflManagerFactory->create(); break; default: // require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception(sprintf( - 'Unknown API version "%s"', + 'Unknown API version "%s"', $config['wurfl_api_version'] )); } diff --git a/library/Zend/Http/UserAgent/Features/Exception.php b/library/Zend/Http/UserAgent/Features/Exception.php index 8462eeb18..beaaa1433 100644 --- a/library/Zend/Http/UserAgent/Features/Exception.php +++ b/library/Zend/Http/UserAgent/Features/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Features_Exception extends Zend_Http_UserAgent_Exception diff --git a/library/Zend/Http/UserAgent/Feed.php b/library/Zend/Http/UserAgent/Feed.php index 40bbbfa8b..a6931f814 100644 --- a/library/Zend/Http/UserAgent/Feed.php +++ b/library/Zend/Http/UserAgent/Feed.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Feed extends Zend_Http_UserAgent_AbstractDevice @@ -38,9 +38,9 @@ class Zend_Http_UserAgent_Feed extends Zend_Http_UserAgent_AbstractDevice * @var array */ protected static $_uaSignatures = array( - 'bloglines', - 'everyfeed', - 'feedfetcher', + 'bloglines', + 'everyfeed', + 'feedfetcher', 'gregarius', ); diff --git a/library/Zend/Http/UserAgent/Mobile.php b/library/Zend/Http/UserAgent/Mobile.php index f262f9e61..8d4e51f8d 100644 --- a/library/Zend/Http/UserAgent/Mobile.php +++ b/library/Zend/Http/UserAgent/Mobile.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Mobile extends Zend_Http_UserAgent_AbstractDevice @@ -43,119 +43,118 @@ class Zend_Http_UserAgent_Mobile extends Zend_Http_UserAgent_AbstractDevice * @var array */ protected static $_uaSignatures = array( - 'iphone', - 'ipod', - 'ipad', - 'android', - 'blackberry', - 'opera mini', - 'opera mobi', - 'palm', - 'palmos', - 'elaine', - 'windows ce', - ' ppc', - '_mms', - 'ahong', - 'archos', - 'armv', - 'astel', - 'avantgo', - 'benq', - 'blazer', - 'brew', - 'com2', - 'compal', - 'danger', - 'pocket', - 'docomo', - 'epoc', - 'ericsson', - 'eudoraweb', - 'hiptop', - 'htc-', - 'htc_', - 'iemobile', - 'ipad', - 'iris', - 'j-phone', - 'kddi', - 'kindle', - 'lg ', - 'lg-', - 'lg/', - 'lg;lx', - 'lge vx', - 'lge', - 'lge-', - 'lge-cx', - 'lge-lx', - 'lge-mx', - 'linux armv', - 'maemo', - 'midp', - 'mini 9.5', - 'minimo', - 'mob-x', - 'mobi', - 'mobile', - 'mobilephone', - 'mot 24', - 'mot-', - 'motorola', - 'n410', - 'netfront', - 'nintendo wii', - 'nintendo', - 'nitro', - 'nokia', - 'novarra-vision', - 'nuvifone', - 'openweb', - 'opwv', - 'palmsource', - 'pdxgw', - 'phone', - 'playstation', - 'polaris', - 'portalmmm', - 'qt embedded', - 'reqwirelessweb', - 'sagem', - 'sam-r', - 'samsu', - 'samsung', - 'sec-', - 'sec-sgh', - 'semc-browser', - 'series60', - 'series70', - 'series80', - 'series90', - 'sharp', - 'sie-m', - 'sie-s', - 'smartphone', - 'sony cmd', - 'sonyericsson', - 'sprint', - 'spv', - 'symbian os', - 'symbian', - 'symbianos', - 'telco', - 'teleca', - 'treo', - 'up.browser', - 'up.link', - 'vodafone', - 'vodaphone', - 'webos', - 'webpro', - 'windows phone os 7', - 'wireless', - 'wm5 pie', - 'wms pie', + 'iphone', + 'ipod', + 'ipad', + 'android', + 'blackberry', + 'opera mini', + 'opera mobi', + 'palm', + 'palmos', + 'elaine', + 'windows ce', + 'icab', + '_mms', + 'ahong', + 'archos', + 'armv', + 'astel', + 'avantgo', + 'benq', + 'blazer', + 'brew', + 'com2', + 'compal', + 'danger', + 'pocket', + 'docomo', + 'epoc', + 'ericsson', + 'eudoraweb', + 'hiptop', + 'htc-', + 'htc_', + 'iemobile', + 'iris', + 'j-phone', + 'kddi', + 'kindle', + 'lg ', + 'lg-', + 'lg/', + 'lg;lx', + 'lge vx', + 'lge', + 'lge-', + 'lge-cx', + 'lge-lx', + 'lge-mx', + 'linux armv', + 'maemo', + 'midp', + 'mini 9.5', + 'minimo', + 'mob-x', + 'mobi', + 'mobile', + 'mobilephone', + 'mot 24', + 'mot-', + 'motorola', + 'n410', + 'netfront', + 'nintendo wii', + 'nintendo', + 'nitro', + 'nokia', + 'novarra-vision', + 'nuvifone', + 'openweb', + 'opwv', + 'palmsource', + 'pdxgw', + 'phone', + 'playstation', + 'polaris', + 'portalmmm', + 'qt embedded', + 'reqwirelessweb', + 'sagem', + 'sam-r', + 'samsu', + 'samsung', + 'sec-', + 'sec-sgh', + 'semc-browser', + 'series60', + 'series70', + 'series80', + 'series90', + 'sharp', + 'sie-m', + 'sie-s', + 'smartphone', + 'sony cmd', + 'sonyericsson', + 'sprint', + 'spv', + 'symbian os', + 'symbian', + 'symbianos', + 'telco', + 'teleca', + 'treo', + 'up.browser', + 'up.link', + 'vodafone', + 'vodaphone', + 'webos', + 'wml', + 'windows phone os 7', + 'wireless', + 'wm5 pie', + 'wms pie', 'xiino', 'wap', 'up/', @@ -169,103 +168,103 @@ class Zend_Http_UserAgent_Mobile extends Zend_Http_UserAgent_AbstractDevice * @var array */ protected static $_haTerms = array( - 'midp', - 'wml', - 'vnd.rim', + 'midp', + 'wml', + 'vnd.rim', 'vnd.wap', + 'j2me', ); /** * first 4 letters of mobile User Agent chains - * + * * @var array */ protected static $_uaBegin = array( - 'w3c ', - 'acs-', - 'alav', - 'alca', - 'amoi', - 'audi', - 'avan', - 'benq', - 'bird', - 'blac', - 'blaz', - 'brew', - 'cell', - 'cldc', - 'cmd-', - 'dang', - 'doco', - 'eric', - 'hipt', - 'inno', - 'ipaq', - 'java', - 'jigs', - 'kddi', - 'keji', - 'leno', - 'lg-c', - 'lg-d', - 'lg-g', - 'lge-', - 'maui', - 'maxo', - 'midp', - 'mits', - 'mmef', - 'mobi', - 'mot-', - 'moto', - 'mwbp', - 'nec-', - 'newt', - 'noki', - 'oper', - 'palm', - 'pana', - 'pant', - 'phil', - 'play', - 'port', - 'prox', - 'qwap', - 'sage', - 'sams', - 'sany', - 'sch-', - 'sec-', - 'send', - 'seri', - 'sgh-', - 'shar', - 'sie-', - 'siem', - 'smal', - 'smar', - 'sony', - 'sph-', - 'symb', - 't-mo', - 'teli', - 'tim-', - 'tosh', - 'tsm-', - 'upg1', - 'upsi', - 'vk-v', - 'voda', - 'wap-', - 'wapa', - 'wapi', - 'wapp', - 'wapr', - 'webc', - 'winw', - 'winw', - 'xda', + 'w3c ', + 'acs-', + 'alav', + 'alca', + 'amoi', + 'audi', + 'avan', + 'benq', + 'bird', + 'blac', + 'blaz', + 'brew', + 'cell', + 'cldc', + 'cmd-', + 'dang', + 'doco', + 'eric', + 'hipt', + 'inno', + 'ipaq', + 'java', + 'jigs', + 'kddi', + 'keji', + 'leno', + 'lg-c', + 'lg-d', + 'lg-g', + 'lge-', + 'maui', + 'maxo', + 'midp', + 'mits', + 'mmef', + 'mobi', + 'mot-', + 'moto', + 'mwbp', + 'nec-', + 'newt', + 'noki', + 'palm', + 'pana', + 'pant', + 'phil', + 'play', + 'port', + 'prox', + 'qwap', + 'sage', + 'sams', + 'sany', + 'sch-', + 'sec-', + 'send', + 'seri', + 'sgh-', + 'shar', + 'sie-', + 'siem', + 'smal', + 'smar', + 'sony', + 'sph-', + 'symb', + 't-mo', + 'teli', + 'tim-', + 'tosh', + 'tsm-', + 'upg1', + 'upsi', + 'vk-v', + 'voda', + 'wap-', + 'wapa', + 'wapi', + 'wapp', + 'wapr', + 'webc', + 'winw', + 'winw', + 'xda', 'xda-', ); @@ -285,12 +284,15 @@ public static function match($userAgent, $server) return true; } } + if (isset($server['http_x_wap_profile']) || isset($server['http_profile'])) { return true; } - if (self::_matchAgentAgainstSignatures($userAgent, self::$_haTerms)) { - return true; + if (isset($server['http_accept'])) { + if (self::_matchAgentAgainstSignatures($server['http_accept'], self::$_haTerms)) { + return true; + } } if (self::userAgentStart($userAgent)) { @@ -306,15 +308,15 @@ public static function match($userAgent, $server) /** * Retrieve beginning clause of user agent - * + * * @param string $userAgent * @return string */ public static function userAgentStart($userAgent) { - + $mobile_ua = strtolower(substr($userAgent, 0, 4)); - + return (in_array($mobile_ua, self::$_uaBegin)); } @@ -351,9 +353,9 @@ public function getType() protected function _defineFeatures() { $this->setFeature('is_wireless_device', false, 'product_info'); - + parent::_defineFeatures(); - + if (isset($this->_aFeatures["mobile_browser"])) { $this->setFeature("browser_name", $this->_aFeatures["mobile_browser"]); $this->_browser = $this->_aFeatures["mobile_browser"]; @@ -362,19 +364,19 @@ protected function _defineFeatures() $this->setFeature("browser_version", $this->_aFeatures["mobile_browser_version"]); $this->_browserVersion = $this->_aFeatures["mobile_browser_version"]; } - + // markup - if ($this->getFeature('device_os') == 'iPhone OS' + if ($this->getFeature('device_os') == 'iPhone OS' || $this->getFeature('device_os_token') == 'iPhone OS' ) { $this->setFeature('markup', 'iphone'); } else { $this->setFeature('markup', $this->getMarkupLanguage($this->getFeature('preferred_markup'))); } - + // image format $this->_images = array(); - + if ($this->getFeature('png')) { $this->_images[] = 'png'; } @@ -387,7 +389,7 @@ protected function _defineFeatures() if ($this->getFeature('wbmp')) { $this->_images[] = 'wbmp'; } - + return $this->_aFeatures; } diff --git a/library/Zend/Http/UserAgent/Offline.php b/library/Zend/Http/UserAgent/Offline.php index e14c281c5..1690235bd 100644 --- a/library/Zend/Http/UserAgent/Offline.php +++ b/library/Zend/Http/UserAgent/Offline.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Offline extends Zend_Http_UserAgent_Desktop @@ -38,11 +38,11 @@ class Zend_Http_UserAgent_Offline extends Zend_Http_UserAgent_Desktop * @var array */ protected static $_uaSignatures = array( - 'wget', - 'webzip', - 'webcopier', - 'downloader', - 'superbot', + 'wget', + 'webzip', + 'webcopier', + 'downloader', + 'superbot', 'offline', ); diff --git a/library/Zend/Http/UserAgent/Probe.php b/library/Zend/Http/UserAgent/Probe.php index 80b5ea6c0..ed11fa87a 100644 --- a/library/Zend/Http/UserAgent/Probe.php +++ b/library/Zend/Http/UserAgent/Probe.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Probe extends Zend_Http_UserAgent_AbstractDevice @@ -38,10 +38,10 @@ class Zend_Http_UserAgent_Probe extends Zend_Http_UserAgent_AbstractDevice * @var array */ protected static $_uaSignatures = array( - 'witbe', + 'witbe', 'netvigie', ); - + /** * Comparison of the UserAgent chain and User Agent signatures * @@ -54,7 +54,7 @@ public static function match($userAgent, $server) return self::_matchAgentAgainstSignatures($userAgent, self::$_uaSignatures); } - + /** * Gives the current browser type * diff --git a/library/Zend/Http/UserAgent/Spam.php b/library/Zend/Http/UserAgent/Spam.php index 6f9ebacff..f53521e65 100644 --- a/library/Zend/Http/UserAgent/Spam.php +++ b/library/Zend/Http/UserAgent/Spam.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Spam extends Zend_Http_UserAgent_AbstractDevice diff --git a/library/Zend/Http/UserAgent/Storage.php b/library/Zend/Http/UserAgent/Storage.php index 59daec440..858f9bd4c 100644 --- a/library/Zend/Http/UserAgent/Storage.php +++ b/library/Zend/Http/UserAgent/Storage.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_UserAgent_Storage diff --git a/library/Zend/Http/UserAgent/Storage/Exception.php b/library/Zend/Http/UserAgent/Storage/Exception.php index 86f8ac905..15e1c8601 100644 --- a/library/Zend/Http/UserAgent/Storage/Exception.php +++ b/library/Zend/Http/UserAgent/Storage/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Storage_Exception extends Zend_Http_UserAgent_Exception diff --git a/library/Zend/Http/UserAgent/Storage/NonPersistent.php b/library/Zend/Http/UserAgent/Storage/NonPersistent.php index 60d71b8db..70a8720fb 100644 --- a/library/Zend/Http/UserAgent/Storage/NonPersistent.php +++ b/library/Zend/Http/UserAgent/Storage/NonPersistent.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: NonPersistent.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -36,10 +36,10 @@ * * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Http_UserAgent_Storage_NonPersistent +class Zend_Http_UserAgent_Storage_NonPersistent implements Zend_Http_UserAgent_Storage { /** diff --git a/library/Zend/Http/UserAgent/Storage/Session.php b/library/Zend/Http/UserAgent/Storage/Session.php index a759ad37c..51ce3e7e4 100644 --- a/library/Zend/Http/UserAgent/Storage/Session.php +++ b/library/Zend/Http/UserAgent/Storage/Session.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,42 +32,42 @@ /** * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage +class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage { /** * Default session namespace */ const NAMESPACE_DEFAULT = 'Zend_Http_UserAgent'; - + /** * Default session object member name */ const MEMBER_DEFAULT = 'storage'; - + /** * Object to proxy $_SESSION storage * * @var Zend_Session_Namespace */ protected $_session; - + /** * Session namespace * * @var mixed */ protected $_namespace; - + /** * Session object member * * @var mixed */ protected $_member; - + /** * Sets session storage options and initializes session namespace object * @@ -79,7 +79,7 @@ class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage * @return void * @throws Zend_Http_UserAgent_Storage_Exception on invalid $options argument */ - public function __construct($options = null) + public function __construct($options = null) { if (is_object($options) && method_exists($options, 'toArray')) { $options = $options->toArray(); @@ -95,71 +95,71 @@ public function __construct($options = null) } // add '.' to prevent the message ''Session namespace must not start with a number' - $this->_namespace = '.' - . (isset($options['browser_type']) - ? $options['browser_type'] + $this->_namespace = '.' + . (isset($options['browser_type']) + ? $options['browser_type'] : self::NAMESPACE_DEFAULT); $this->_member = isset($options['member']) ? $options['member'] : self::MEMBER_DEFAULT; $this->_session = new Zend_Session_Namespace($this->_namespace); } - + /** * Returns the session namespace name * * @return string */ - public function getNamespace() + public function getNamespace() { return $this->_namespace; } - + /** * Returns the name of the session object member * * @return string */ - public function getMember() + public function getMember() { return $this->_member; } - + /** * Defined by Zend_Http_UserAgent_Storage * * @return boolean */ - public function isEmpty() + public function isEmpty() { return empty($this->_session->{$this->_member}); } - + /** * Defined by Zend_Http_UserAgent_Storage * * @return mixed */ - public function read() + public function read() { return $this->_session->{$this->_member}; } - + /** * Defined by Zend_Http_UserAgent_Storage * * @param mixed $contents * @return void */ - public function write($content) + public function write($content) { $this->_session->{$this->_member} = $content; } - + /** * Defined by Zend_Http_UserAgent_Storage * * @return void */ - public function clear() + public function clear() { unset($this->_session->{$this->_member}); } diff --git a/library/Zend/Http/UserAgent/Text.php b/library/Zend/Http/UserAgent/Text.php index 209948f52..25516b364 100644 --- a/library/Zend/Http/UserAgent/Text.php +++ b/library/Zend/Http/UserAgent/Text.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Text extends Zend_Http_UserAgent_AbstractDevice @@ -38,8 +38,8 @@ class Zend_Http_UserAgent_Text extends Zend_Http_UserAgent_AbstractDevice * @var array */ protected static $_uaSignatures = array( - 'lynx', - 'retawq', + 'lynx', + 'retawq', 'w3m', ); diff --git a/library/Zend/Http/UserAgent/Validator.php b/library/Zend/Http/UserAgent/Validator.php index 121db5df6..a5271a054 100644 --- a/library/Zend/Http/UserAgent/Validator.php +++ b/library/Zend/Http/UserAgent/Validator.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Http * @subpackage UserAgent - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_UserAgent_Validator extends Zend_Http_UserAgent_Desktop @@ -38,14 +38,14 @@ class Zend_Http_UserAgent_Validator extends Zend_Http_UserAgent_Desktop * @var array */ protected static $_uaSignatures = array( - 'htmlvalidator', - 'csscheck', - 'cynthia', - 'htmlparser', - 'validator', - 'jfouffa', - 'jigsaw', - 'w3c_validator', + 'htmlvalidator', + 'csscheck', + 'cynthia', + 'htmlparser', + 'validator', + 'jfouffa', + 'jigsaw', + 'w3c_validator', 'wdg_validator', ); diff --git a/library/Zend/InfoCard.php b/library/Zend/InfoCard.php index cd1aa6a97..249adeaca 100644 --- a/library/Zend/InfoCard.php +++ b/library/Zend/InfoCard.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InfoCard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InfoCard.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -52,7 +52,7 @@ /** * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard diff --git a/library/Zend/InfoCard/Adapter/Default.php b/library/Zend/InfoCard/Adapter/Default.php index c0e9d4357..80f85762c 100644 --- a/library/Zend/InfoCard/Adapter/Default.php +++ b/library/Zend/InfoCard/Adapter/Default.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Adapter_Default implements Zend_InfoCard_Adapter_Interface diff --git a/library/Zend/InfoCard/Adapter/Exception.php b/library/Zend/InfoCard/Adapter/Exception.php index c48e1b7d7..eaadd51bf 100644 --- a/library/Zend/InfoCard/Adapter/Exception.php +++ b/library/Zend/InfoCard/Adapter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Adapter_Exception extends Zend_InfoCard_Exception diff --git a/library/Zend/InfoCard/Adapter/Interface.php b/library/Zend/InfoCard/Adapter/Interface.php index d19d66082..277a2cc0c 100644 --- a/library/Zend/InfoCard/Adapter/Interface.php +++ b/library/Zend/InfoCard/Adapter/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Adapter_Interface diff --git a/library/Zend/InfoCard/Cipher.php b/library/Zend/InfoCard/Cipher.php index da7cbfb1a..9f551bb93 100644 --- a/library/Zend/InfoCard/Cipher.php +++ b/library/Zend/InfoCard/Cipher.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cipher.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cipher.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher diff --git a/library/Zend/InfoCard/Cipher/Exception.php b/library/Zend/InfoCard/Cipher/Exception.php index 5d0fdf29c..f783345a6 100644 --- a/library/Zend/InfoCard/Cipher/Exception.php +++ b/library/Zend/InfoCard/Cipher/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Exception extends Zend_InfoCard_Exception diff --git a/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php b/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php index 6bc689353..e10c35eca 100644 --- a/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php +++ b/library/Zend/InfoCard/Cipher/Pki/Adapter/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Cipher_Pki_Adapter_Abstract implements Zend_InfoCard_Cipher_Pki_Interface diff --git a/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php b/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php index be819ac3c..7c840eba9 100644 --- a/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php +++ b/library/Zend/InfoCard/Cipher/Pki/Adapter/Rsa.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rsa.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Pki_Adapter_Rsa diff --git a/library/Zend/InfoCard/Cipher/Pki/Interface.php b/library/Zend/InfoCard/Cipher/Pki/Interface.php index 757ac92fa..f4ef08bf4 100644 --- a/library/Zend/InfoCard/Cipher/Pki/Interface.php +++ b/library/Zend/InfoCard/Cipher/Pki/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Pki_Interface diff --git a/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php b/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php index 9c900d46f..d8b82256c 100644 --- a/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php +++ b/library/Zend/InfoCard/Cipher/Pki/Rsa/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Pki_Rsa_Interface diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php index f02b419ba..56278a431 100644 --- a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php +++ b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Cipher_Symmetric_Adapter_Abstract diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php index 3df38b486..33db9249e 100644 --- a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php +++ b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes128cbc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Aes128cbc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Aes128cbc.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Symmetric_Adapter_Aes128cbc diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php index c30328b08..271a19363 100644 --- a/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php +++ b/library/Zend/InfoCard/Cipher/Symmetric/Adapter/Aes256cbc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Aes256cbc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Aes256cbc.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Cipher_Symmetric_Adapter_Aes256cbc diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php b/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php index 57c7a3373..4315007a9 100644 --- a/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php +++ b/library/Zend/InfoCard/Cipher/Symmetric/Aes128cbc/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Symmetric_Aes128cbc_Interface diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php b/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php index 0c1b6452c..1ce6e05e8 100644 --- a/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php +++ b/library/Zend/InfoCard/Cipher/Symmetric/Aes256cbc/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Symmetric_Aes256cbc_Interface diff --git a/library/Zend/InfoCard/Cipher/Symmetric/Interface.php b/library/Zend/InfoCard/Cipher/Symmetric/Interface.php index 72da65d0f..8189a3402 100644 --- a/library/Zend/InfoCard/Cipher/Symmetric/Interface.php +++ b/library/Zend/InfoCard/Cipher/Symmetric/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Cipher - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Cipher_Symmetric_Interface diff --git a/library/Zend/InfoCard/Claims.php b/library/Zend/InfoCard/Claims.php index 5713361e2..fe3801fc4 100644 --- a/library/Zend/InfoCard/Claims.php +++ b/library/Zend/InfoCard/Claims.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Claims.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Claims.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Claims diff --git a/library/Zend/InfoCard/Exception.php b/library/Zend/InfoCard/Exception.php index e185be5e3..414d54a6d 100644 --- a/library/Zend/InfoCard/Exception.php +++ b/library/Zend/InfoCard/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ if (class_exists("Zend_Exception")) { @@ -35,7 +35,7 @@ abstract class Zend_InfoCard_Exception_Abstract extends Exception * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Exception extends Zend_InfoCard_Exception_Abstract diff --git a/library/Zend/InfoCard/Xml/Assertion.php b/library/Zend/InfoCard/Xml/Assertion.php index 8c63194c6..ffaaafaee 100644 --- a/library/Zend/InfoCard/Xml/Assertion.php +++ b/library/Zend/InfoCard/Xml/Assertion.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Assertion.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Assertion.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_InfoCard_Xml_Assertion diff --git a/library/Zend/InfoCard/Xml/Assertion/Interface.php b/library/Zend/InfoCard/Xml/Assertion/Interface.php index 0677f4270..f1f0abb72 100644 --- a/library/Zend/InfoCard/Xml/Assertion/Interface.php +++ b/library/Zend/InfoCard/Xml/Assertion/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_Assertion_Interface diff --git a/library/Zend/InfoCard/Xml/Assertion/Saml.php b/library/Zend/InfoCard/Xml/Assertion/Saml.php index cb08b5f46..d91d59398 100644 --- a/library/Zend/InfoCard/Xml/Assertion/Saml.php +++ b/library/Zend/InfoCard/Xml/Assertion/Saml.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Saml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Saml.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Assertion_Saml diff --git a/library/Zend/InfoCard/Xml/Element.php b/library/Zend/InfoCard/Xml/Element.php index 84007e0e1..214f08e3c 100644 --- a/library/Zend/InfoCard/Xml/Element.php +++ b/library/Zend/InfoCard/Xml/Element.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Element.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Xml_Element diff --git a/library/Zend/InfoCard/Xml/Element/Interface.php b/library/Zend/InfoCard/Xml/Element/Interface.php index 66c600442..e0a53bf40 100644 --- a/library/Zend/InfoCard/Xml/Element/Interface.php +++ b/library/Zend/InfoCard/Xml/Element/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_Element_Interface diff --git a/library/Zend/InfoCard/Xml/EncryptedData.php b/library/Zend/InfoCard/Xml/EncryptedData.php index 0f7282beb..4ea9ef5e9 100644 --- a/library/Zend/InfoCard/Xml/EncryptedData.php +++ b/library/Zend/InfoCard/Xml/EncryptedData.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EncryptedData.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EncryptedData.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_InfoCard_Xml_EncryptedData diff --git a/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php b/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php index 8965b238e..538d98625 100644 --- a/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php +++ b/library/Zend/InfoCard/Xml/EncryptedData/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Xml_EncryptedData_Abstract extends Zend_InfoCard_Xml_Element diff --git a/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php b/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php index 0590c7838..91d2b133e 100644 --- a/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php +++ b/library/Zend/InfoCard/Xml/EncryptedData/XmlEnc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlEnc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlEnc.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_EncryptedData_XmlEnc extends Zend_InfoCard_Xml_EncryptedData_Abstract @@ -52,7 +52,7 @@ public function getCipherValue() if(!($cipherdata instanceof Zend_InfoCard_Xml_Element)) { throw new Zend_InfoCard_Xml_Exception("Unable to find the enc:CipherData block"); } - + $cipherdata->registerXPathNamespace('enc', 'http://www.w3.org/2001/04/xmlenc#'); list(,$ciphervalue) = $cipherdata->xpath("//enc:CipherValue"); if(!($ciphervalue instanceof Zend_InfoCard_Xml_Element)) { diff --git a/library/Zend/InfoCard/Xml/EncryptedKey.php b/library/Zend/InfoCard/Xml/EncryptedKey.php index d5499f9e9..a75d7e7a2 100644 --- a/library/Zend/InfoCard/Xml/EncryptedKey.php +++ b/library/Zend/InfoCard/Xml/EncryptedKey.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EncryptedKey.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EncryptedKey.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_EncryptedKey diff --git a/library/Zend/InfoCard/Xml/Exception.php b/library/Zend/InfoCard/Xml/Exception.php index 942a8e98b..e6543590b 100644 --- a/library/Zend/InfoCard/Xml/Exception.php +++ b/library/Zend/InfoCard/Xml/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Exception extends Zend_InfoCard_Exception diff --git a/library/Zend/InfoCard/Xml/KeyInfo.php b/library/Zend/InfoCard/Xml/KeyInfo.php index e589330c3..aad005b3b 100644 --- a/library/Zend/InfoCard/Xml/KeyInfo.php +++ b/library/Zend/InfoCard/Xml/KeyInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: KeyInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: KeyInfo.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_KeyInfo diff --git a/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php b/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php index a0b713ec2..922d16d40 100644 --- a/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php +++ b/library/Zend/InfoCard/Xml/KeyInfo/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_InfoCard_Xml_KeyInfo_Abstract extends Zend_InfoCard_Xml_Element diff --git a/library/Zend/InfoCard/Xml/KeyInfo/Default.php b/library/Zend/InfoCard/Xml/KeyInfo/Default.php index 9d38b3e57..ebcb6a312 100644 --- a/library/Zend/InfoCard/Xml/KeyInfo/Default.php +++ b/library/Zend/InfoCard/Xml/KeyInfo/Default.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_KeyInfo_Default extends Zend_InfoCard_Xml_KeyInfo_Abstract diff --git a/library/Zend/InfoCard/Xml/KeyInfo/Interface.php b/library/Zend/InfoCard/Xml/KeyInfo/Interface.php index eda475ccf..e5babc5b9 100644 --- a/library/Zend/InfoCard/Xml/KeyInfo/Interface.php +++ b/library/Zend/InfoCard/Xml/KeyInfo/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_KeyInfo_Interface diff --git a/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php b/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php index 3afccf9ad..5b028d3b9 100644 --- a/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php +++ b/library/Zend/InfoCard/Xml/KeyInfo/XmlDSig.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlDSig.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlDSig.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * * @category Zend * @package Zend_InfoCard - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_KeyInfo_XmlDSig diff --git a/library/Zend/InfoCard/Xml/Security.php b/library/Zend/InfoCard/Xml/Security.php index 387cc3dc5..7ca65dfce 100644 --- a/library/Zend/InfoCard/Xml/Security.php +++ b/library/Zend/InfoCard/Xml/Security.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Security.php 23280 2010-10-31 10:28:58Z ramon $ + * @version $Id: Security.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security diff --git a/library/Zend/InfoCard/Xml/Security/Exception.php b/library/Zend/InfoCard/Xml/Security/Exception.php index 9b511e170..d08792791 100644 --- a/library/Zend/InfoCard/Xml/Security/Exception.php +++ b/library/Zend/InfoCard/Xml/Security/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Exception extends Zend_InfoCard_Xml_Exception diff --git a/library/Zend/InfoCard/Xml/Security/Transform.php b/library/Zend/InfoCard/Xml/Security/Transform.php index 108c6cea2..fd971084e 100644 --- a/library/Zend/InfoCard/Xml/Security/Transform.php +++ b/library/Zend/InfoCard/Xml/Security/Transform.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Transform.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Transform.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform diff --git a/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php b/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php index d4bdf98ce..0032c4231 100644 --- a/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php +++ b/library/Zend/InfoCard/Xml/Security/Transform/EnvelopedSignature.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EnvelopedSignature.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EnvelopedSignature.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform_EnvelopedSignature diff --git a/library/Zend/InfoCard/Xml/Security/Transform/Exception.php b/library/Zend/InfoCard/Xml/Security/Transform/Exception.php index 328c79e56..f6f8bea29 100644 --- a/library/Zend/InfoCard/Xml/Security/Transform/Exception.php +++ b/library/Zend/InfoCard/Xml/Security/Transform/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform_Exception extends Zend_InfoCard_Xml_Security_Exception diff --git a/library/Zend/InfoCard/Xml/Security/Transform/Interface.php b/library/Zend/InfoCard/Xml/Security/Transform/Interface.php index 9864c750b..dbb3226ef 100644 --- a/library/Zend/InfoCard/Xml/Security/Transform/Interface.php +++ b/library/Zend/InfoCard/Xml/Security/Transform/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_InfoCard_Xml_Security_Transform_Interface diff --git a/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php b/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php index 9e95d10c2..f5d2a6cdf 100644 --- a/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php +++ b/library/Zend/InfoCard/Xml/Security/Transform/XmlExcC14N.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlExcC14N.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlExcC14N.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml_Security - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_Security_Transform_XmlExcC14N diff --git a/library/Zend/InfoCard/Xml/SecurityTokenReference.php b/library/Zend/InfoCard/Xml/SecurityTokenReference.php index 1839b8a2f..06710aa6a 100644 --- a/library/Zend/InfoCard/Xml/SecurityTokenReference.php +++ b/library/Zend/InfoCard/Xml/SecurityTokenReference.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SecurityTokenReference.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SecurityTokenReference.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_InfoCard * @subpackage Zend_InfoCard_Xml - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_InfoCard_Xml_SecurityTokenReference extends Zend_InfoCard_Xml_Element diff --git a/library/Zend/Json.php b/library/Zend/Json.php index 9665f3ece..d4d8467fc 100644 --- a/library/Zend/Json.php +++ b/library/Zend/Json.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 20615 2010-01-25 19:54:12Z matthew $ + * @version $Id: Json.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Json * @uses Zend_Json_Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json @@ -179,12 +179,15 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar * NOTE: This method is used internally by the encode method. * * @see encode - * @param mixed $valueToCheck a string - object property to be encoded + * @param array|object|Zend_Json_Expr $value a string - object property to be encoded + * @param array $javascriptExpressions + * @param null $currentKey + * + * @internal param mixed $valueToCheck * @return void */ - protected static function _recursiveJsonExprFinder( - &$value, array &$javascriptExpressions, $currentKey = null - ) { + protected static function _recursiveJsonExprFinder(&$value, array &$javascriptExpressions, $currentKey = null) + { if ($value instanceof Zend_Json_Expr) { // TODO: Optimize with ascii keys, if performance is bad $magicKey = "____" . $currentKey . "_" . (count($javascriptExpressions)); @@ -207,6 +210,104 @@ protected static function _recursiveJsonExprFinder( return $value; } + /** + * Return the value of an XML attribute text or the text between + * the XML tags + * + * In order to allow Zend_Json_Expr from xml, we check if the node + * matchs the pattern that try to detect if it is a new Zend_Json_Expr + * if it matches, we return a new Zend_Json_Expr instead of a text node + * + * @param SimpleXMLElement $simpleXmlElementObject + * @return Zend_Json_Expr|string + */ + protected static function _getXmlValue($simpleXmlElementObject) { + $pattern = '/^[\s]*new Zend_Json_Expr[\s]*\([\s]*[\"\']{1}(.*)[\"\']{1}[\s]*\)[\s]*$/'; + $matchings = array(); + $match = preg_match ($pattern, $simpleXmlElementObject, $matchings); + if ($match) { + return new Zend_Json_Expr($matchings[1]); + } else { + return (trim(strval($simpleXmlElementObject))); + } + } + /** + * _processXml - Contains the logic for xml2json + * + * The logic in this function is a recursive one. + * + * The main caller of this function (i.e. fromXml) needs to provide + * only the first two parameters i.e. the SimpleXMLElement object and + * the flag for ignoring or not ignoring XML attributes. The third parameter + * will be used internally within this function during the recursive calls. + * + * This function converts the SimpleXMLElement object into a PHP array by + * calling a recursive (protected static) function in this class. Once all + * the XML elements are stored in the PHP array, it is returned to the caller. + * + * Throws a Zend_Json_Exception if the XML tree is deeper than the allowed limit. + * + * @param SimpleXMLElement $simpleXmlElementObject + * @param boolean $ignoreXmlAttributes + * @param integer $recursionDepth + * @return array + */ + protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth=0) + { + // Keep an eye on how deeply we are involved in recursion. + if ($recursionDepth > self::$maxRecursionDepthAllowed) { + // XML tree is too deep. Exit now by throwing an exception. + // require_once 'Zend/Json/Exception.php'; + throw new Zend_Json_Exception( + "Function _processXml exceeded the allowed recursion depth of " . + self::$maxRecursionDepthAllowed); + } // End of if ($recursionDepth > self::$maxRecursionDepthAllowed) + + $children = $simpleXmlElementObject->children(); + $name = $simpleXmlElementObject->getName(); + $value = self::_getXmlValue($simpleXmlElementObject); + $attributes = (array) $simpleXmlElementObject->attributes(); + + if (count($children) == 0) { + if (!empty($attributes) && !$ignoreXmlAttributes) { + foreach ($attributes['@attributes'] as $k => $v) { + $attributes['@attributes'][$k]= self::_getXmlValue($v); + } + if (!empty($value)) { + $attributes['@text'] = $value; + } + return array($name => $attributes); + } else { + return array($name => $value); + } + } else { + $childArray= array(); + foreach ($children as $child) { + $childname = $child->getName(); + $element = self::_processXml($child,$ignoreXmlAttributes,$recursionDepth+1); + if (array_key_exists($childname, $childArray)) { + if (empty($subChild[$childname])) { + $childArray[$childname] = array($childArray[$childname]); + $subChild[$childname] = true; + } + $childArray[$childname][] = $element[$childname]; + } else { + $childArray[$childname] = $element[$childname]; + } + } + if (!empty($attributes) && !$ignoreXmlAttributes) { + foreach ($attributes['@attributes'] as $k => $v) { + $attributes['@attributes'][$k] = self::_getXmlValue($v); + } + $childArray['@attributes'] = $attributes['@attributes']; + } + if (!empty($value)) { + $childArray['@text'] = $value; + } + return array($name => $childArray); + } + } + /** * fromXml - Converts XML to JSON * @@ -233,7 +334,8 @@ protected static function _recursiveJsonExprFinder( * @return mixed - JSON formatted string on success * @throws Zend_Json_Exception */ - public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true) { + public static function fromXml($xmlStringContents, $ignoreXmlAttributes=true) + { // Load the XML formatted string into a Simple XML Element object. $simpleXmlElementObject = simplexml_load_string($xmlStringContents); @@ -252,120 +354,16 @@ public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true) { // It is just that simple. $jsonStringOutput = self::encode($resultArray); return($jsonStringOutput); - } // End of function fromXml. - - /** - * _processXml - Contains the logic for xml2json - * - * The logic in this function is a recursive one. - * - * The main caller of this function (i.e. fromXml) needs to provide - * only the first two parameters i.e. the SimpleXMLElement object and - * the flag for ignoring or not ignoring XML attributes. The third parameter - * will be used internally within this function during the recursive calls. - * - * This function converts the SimpleXMLElement object into a PHP array by - * calling a recursive (protected static) function in this class. Once all - * the XML elements are stored in the PHP array, it is returned to the caller. - * - * Throws a Zend_Json_Exception if the XML tree is deeper than the allowed limit. - * - * @static - * @access protected - * @param SimpleXMLElement $simpleXmlElementObject XML element to be converted - * @param boolean $ignoreXmlAttributes Include or exclude XML attributes in - * the xml2json conversion process. - * @param int $recursionDepth Current recursion depth of this function - * @return mixed - On success, a PHP associative array of traversed XML elements - * @throws Zend_Json_Exception - */ - protected static function _processXml ($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth=0) { - // Keep an eye on how deeply we are involved in recursion. - if ($recursionDepth > self::$maxRecursionDepthAllowed) { - // XML tree is too deep. Exit now by throwing an exception. - // require_once 'Zend/Json/Exception.php'; - throw new Zend_Json_Exception( - "Function _processXml exceeded the allowed recursion depth of " . - self::$maxRecursionDepthAllowed); - } // End of if ($recursionDepth > self::$maxRecursionDepthAllowed) - - if ($recursionDepth == 0) { - // Store the original SimpleXmlElementObject sent by the caller. - // We will need it at the very end when we return from here for good. - $callerProvidedSimpleXmlElementObject = $simpleXmlElementObject; - } // End of if ($recursionDepth == 0) - - if ($simpleXmlElementObject instanceof SimpleXMLElement) { - // Get a copy of the simpleXmlElementObject - $copyOfSimpleXmlElementObject = $simpleXmlElementObject; - // Get the object variables in the SimpleXmlElement object for us to iterate. - $simpleXmlElementObject = get_object_vars($simpleXmlElementObject); - } // End of if (get_class($simpleXmlElementObject) == "SimpleXMLElement") - - // It needs to be an array of object variables. - if (is_array($simpleXmlElementObject)) { - // Initialize a result array. - $resultArray = array(); - // Is the input array size 0? Then, we reached the rare CDATA text if any. - if (count($simpleXmlElementObject) <= 0) { - // Let us return the lonely CDATA. It could even be - // an empty element or just filled with whitespaces. - return (trim(strval($copyOfSimpleXmlElementObject))); - } // End of if (count($simpleXmlElementObject) <= 0) - - // Let us walk through the child elements now. - foreach($simpleXmlElementObject as $key=>$value) { - // Check if we need to ignore the XML attributes. - // If yes, you can skip processing the XML attributes. - // Otherwise, add the XML attributes to the result array. - if(($ignoreXmlAttributes == true) && (is_string($key)) && ($key == "@attributes")) { - continue; - } // End of if(($ignoreXmlAttributes == true) && ($key == "@attributes")) - - // Let us recursively process the current XML element we just visited. - // Increase the recursion depth by one. - $recursionDepth++; - $resultArray[$key] = self::_processXml ($value, $ignoreXmlAttributes, $recursionDepth); - - // Decrease the recursion depth by one. - $recursionDepth--; - } // End of foreach($simpleXmlElementObject as $key=>$value) { - - if ($recursionDepth == 0) { - // That is it. We are heading to the exit now. - // Set the XML root element name as the root [top-level] key of - // the associative array that we are going to return to the original - // caller of this recursive function. - $tempArray = $resultArray; - $resultArray = array(); - $resultArray[$callerProvidedSimpleXmlElementObject->getName()] = $tempArray; - } // End of if ($recursionDepth == 0) - - return($resultArray); - } else { - // We are now looking at either the XML attribute text or - // the text between the XML tags. - - // In order to allow Zend_Json_Expr from xml, we check if the node - // matchs the pattern that try to detect if it is a new Zend_Json_Expr - // if it matches, we return a new Zend_Json_Expr instead of a text node - $pattern = '/^[\s]*new Zend_Json_Expr[\s]*\([\s]*[\"\']{1}(.*)[\"\']{1}[\s]*\)[\s]*$/'; - $matchings = array(); - $match = preg_match ($pattern, $simpleXmlElementObject, $matchings); - if ($match) { - return new Zend_Json_Expr($matchings[1]); - } else { - return (trim(strval($simpleXmlElementObject))); - } + } - } // End of if (is_array($simpleXmlElementObject)) - } // End of function _processXml. + /** * Pretty-print JSON string - * - * Use 'indent' option to select indentation string - by default it's a tab - * + * + * Use 'format' option to select output format - currently html and txt supported, txt is default + * Use 'indent' option to override the indentation string set in the format - by default for the 'txt' format it's a tab + * * @param string $json Original JSON string * @param array $options Encoding options * @return string @@ -373,32 +371,62 @@ protected static function _processXml ($simpleXmlElementObject, $ignoreXmlAttrib public static function prettyPrint($json, $options = array()) { $tokens = preg_split('|([\{\}\]\[,])|', $json, -1, PREG_SPLIT_DELIM_CAPTURE); - $result = ""; + $result = ''; $indent = 0; - + + $format= 'txt'; + $ind = "\t"; - if(isset($options['indent'])) { + + if (isset($options['format'])) { + $format = $options['format']; + } + + switch ($format) { + case 'html': + $lineBreak = '
    '; + $ind = '    '; + break; + default: + case 'txt': + $lineBreak = "\n"; + $ind = "\t"; + break; + } + + // override the defined indent setting with the supplied option + if (isset($options['indent'])) { $ind = $options['indent']; } - + + $inLiteral = false; foreach($tokens as $token) { - if($token == "") continue; - + if($token == '') { + continue; + } + $prefix = str_repeat($ind, $indent); - if($token == "{" || $token == "[") { + if (!$inLiteral && ($token == '{' || $token == '[')) { $indent++; - if($result != "" && $result[strlen($result)-1] == "\n") { + if (($result != '') && ($result[(strlen($result)-1)] == $lineBreak)) { $result .= $prefix; } - $result .= "$token\n"; - } else if($token == "}" || $token == "]") { + $result .= $token . $lineBreak; + } elseif (!$inLiteral && ($token == '}' || $token == ']')) { $indent--; $prefix = str_repeat($ind, $indent); - $result .= "\n$prefix$token"; - } else if($token == ",") { - $result .= "$token\n"; + $result .= $lineBreak . $prefix . $token; + } elseif (!$inLiteral && $token == ',') { + $result .= $token . $lineBreak; } else { - $result .= $prefix.$token; + $result .= ( $inLiteral ? '' : $prefix ) . $token; + + // Count # of unescaped double-quotes in token, subtract # of + // escaped double-quotes and if the result is odd then we are + // inside a string literal + if ((substr_count($token, "\"")-substr_count($token, "\\\"")) % 2 != 0) { + $inLiteral = !$inLiteral; + } } } return $result; diff --git a/library/Zend/Json/Decoder.php b/library/Zend/Json/Decoder.php index 7260dbea1..03e87a6d7 100644 --- a/library/Zend/Json/Decoder.php +++ b/library/Zend/Json/Decoder.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decoder.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Decoder.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Decoder diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php index efc127494..697642745 100644 --- a/library/Zend/Json/Encoder.php +++ b/library/Zend/Json/Encoder.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Encoder.php 22452 2010-06-18 18:13:23Z ralph $ + * @version $Id: Encoder.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Encoder @@ -85,7 +85,7 @@ public static function encode($value, $cycleCheck = false, $options = array()) * - arrays (returns from {@link _encodeArray()}) * - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()}) * - * @param $value mixed The value to be encoded + * @param mixed $value The value to be encoded * @return string Encoded value */ protected function _encodeValue(&$value) @@ -108,7 +108,7 @@ protected function _encodeValue(&$value) * that contains the name of the class of $value. This is used to decode * the object on the client into a specific class. * - * @param $value object + * @param object $value * @return string * @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously */ @@ -151,7 +151,8 @@ protected function _encodeObject(&$value) } } - return '{"__className":"' . get_class($value) . '"' + $className = get_class($value); + return '{"__className":' . $this->_encodeString($className) . $props . '}'; } @@ -182,7 +183,7 @@ protected function _wasVisited(&$value) * the last index is (count($array) -1); any deviation from that is * considered an associative array, and will be encoded as such. * - * @param $array array + * @param array& $array * @return string */ protected function _encodeArray(&$array) @@ -222,7 +223,7 @@ protected function _encodeArray(&$array) * If value type is not a string, number, boolean, or null, the string * 'null' is returned. * - * @param $value mixed + * @param mixed& $value * @return string */ protected function _encodeDatum(&$value) @@ -245,7 +246,7 @@ protected function _encodeDatum(&$value) /** * JSON encode a string value by escaping characters as necessary * - * @param $value string + * @param string& $value * @return string */ protected function _encodeString(&$string) @@ -270,7 +271,7 @@ protected function _encodeString(&$string) * Encode the constants associated with the ReflectionClass * parameter. The encoding format is based on the class2 format * - * @param $cls ReflectionClass + * @param ReflectionClass $cls * @return string Encoded constant block in class2 format */ private static function _encodeConstants(ReflectionClass $cls) @@ -295,7 +296,7 @@ private static function _encodeConstants(ReflectionClass $cls) * Encode the public methods of the ReflectionClass in the * class2 format * - * @param $cls ReflectionClass + * @param ReflectionClass $cls * @return string Encoded method fragment * */ @@ -359,7 +360,7 @@ private static function _encodeMethods(ReflectionClass $cls) * Encode the public properties of the ReflectionClass in the class2 * format. * - * @param $cls ReflectionClass + * @param ReflectionClass $cls * @return string Encode properties list * */ @@ -391,10 +392,10 @@ private static function _encodeVariables(ReflectionClass $cls) * NOTE: Currently only public methods and variables are proxied onto * the client machine * - * @param $className string The name of the class, the class must be - * instantiable using a null constructor - * @param $package string Optional package name appended to JavaScript - * proxy class name + * @param string $className The name of the class, the class must be + * instantiable using a null constructor + * @param string $package Optional package name appended to JavaScript + * proxy class name * @return string The class2 (JavaScript) encoding of the class * @throws Zend_Json_Exception */ diff --git a/library/Zend/Json/Exception.php b/library/Zend/Json/Exception.php index 1559a9a55..41b478765 100644 --- a/library/Zend/Json/Exception.php +++ b/library/Zend/Json/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Exception extends Zend_Exception diff --git a/library/Zend/Json/Expr.php b/library/Zend/Json/Expr.php index 2d403c9b2..4016726cf 100644 --- a/library/Zend/Json/Expr.php +++ b/library/Zend/Json/Expr.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Json * @subpackage Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Expr.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Expr.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -45,7 +45,7 @@ * @category Zend * @package Zend_Json * @subpackage Expr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Expr diff --git a/library/Zend/Json/Server.php b/library/Zend/Json/Server.php index 2b9226433..0c687089d 100644 --- a/library/Zend/Json/Server.php +++ b/library/Zend/Json/Server.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 22237 2010-05-21 23:58:00Z andyfowler $ + * @version $Id: Server.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server extends Zend_Server_Abstract @@ -534,8 +534,8 @@ protected function _handle() $reflection = new ReflectionFunction( $callback->getFunction() ); $refParams = $reflection->getParameters(); } else { - - $reflection = new ReflectionMethod( + + $reflection = new ReflectionMethod( $callback->getClass(), $callback->getMethod() ); @@ -549,9 +549,9 @@ protected function _handle() } elseif( $refParam->isOptional() ) { $orderedParams[ $refParam->getName() ] = null; } else { - throw new Zend_Server_Exception( - 'Missing required parameter: ' . $refParam->getName() - ); + throw new Zend_Server_Exception( + 'Missing required parameter: ' . $refParam->getName() + ); } } $params = $orderedParams; diff --git a/library/Zend/Json/Server/Cache.php b/library/Zend/Json/Server/Cache.php index 8e6802d23..7bb88519d 100644 --- a/library/Zend/Json/Server/Cache.php +++ b/library/Zend/Json/Server/Cache.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cache.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Server_Cache */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Cache extends Zend_Server_Cache diff --git a/library/Zend/Json/Server/Error.php b/library/Zend/Json/Server/Error.php index aeccbce9e..0a037e52a 100644 --- a/library/Zend/Json/Server/Error.php +++ b/library/Zend/Json/Server/Error.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Error.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Error diff --git a/library/Zend/Json/Server/Exception.php b/library/Zend/Json/Server/Exception.php index d3c029f11..8a412e5e0 100644 --- a/library/Zend/Json/Server/Exception.php +++ b/library/Zend/Json/Server/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Json_Exception */ @@ -28,7 +28,7 @@ * @uses Zend_Json_Exception * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Exception extends Zend_Json_Exception diff --git a/library/Zend/Json/Server/Request.php b/library/Zend/Json/Server/Request.php index 0310c97ab..9208bce2c 100644 --- a/library/Zend/Json/Server/Request.php +++ b/library/Zend/Json/Server/Request.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Request.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Request diff --git a/library/Zend/Json/Server/Request/Http.php b/library/Zend/Json/Server/Request/Http.php index 043a686e9..3e69563d4 100644 --- a/library/Zend/Json/Server/Request/Http.php +++ b/library/Zend/Json/Server/Request/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Request_Http extends Zend_Json_Server_Request diff --git a/library/Zend/Json/Server/Response.php b/library/Zend/Json/Server/Response.php index ee2dc66b8..1277bfaf4 100644 --- a/library/Zend/Json/Server/Response.php +++ b/library/Zend/Json/Server/Response.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Response @@ -173,7 +173,6 @@ public function toJson() { if ($this->isError()) { $response = array( - 'result' => null, 'error' => $this->getError()->toArray(), 'id' => $this->getId(), ); @@ -181,7 +180,6 @@ public function toJson() $response = array( 'result' => $this->getResult(), 'id' => $this->getId(), - 'error' => null, ); } diff --git a/library/Zend/Json/Server/Response/Http.php b/library/Zend/Json/Server/Response/Http.php index dfbb0b7e6..bc674bf32 100644 --- a/library/Zend/Json/Server/Response/Http.php +++ b/library/Zend/Json/Server/Response/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Response_Http extends Zend_Json_Server_Response diff --git a/library/Zend/Json/Server/Smd.php b/library/Zend/Json/Server/Smd.php index 5372b9609..2f99efde4 100644 --- a/library/Zend/Json/Server/Smd.php +++ b/library/Zend/Json/Server/Smd.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smd.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Smd.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Json * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Smd diff --git a/library/Zend/Json/Server/Smd/Service.php b/library/Zend/Json/Server/Smd/Service.php index cafc4a2ea..2b112b114 100644 --- a/library/Zend/Json/Server/Smd/Service.php +++ b/library/Zend/Json/Server/Smd/Service.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Json - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,8 +28,8 @@ * * @package Zend_Json * @subpackage Server - * @version $Id: Service.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Service.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Json_Server_Smd_Service diff --git a/library/Zend/Layout.php b/library/Zend/Layout.php index dd1e3451b..a5afdcaf9 100644 --- a/library/Zend/Layout.php +++ b/library/Zend/Layout.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Layout.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Layout diff --git a/library/Zend/Layout/Controller/Action/Helper/Layout.php b/library/Zend/Layout/Controller/Action/Helper/Layout.php index 0aff408bd..9a581a1e9 100644 --- a/library/Zend/Layout/Controller/Action/Helper/Layout.php +++ b/library/Zend/Layout/Controller/Action/Helper/Layout.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Layout.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Layout/Controller/Plugin/Layout.php b/library/Zend/Layout/Controller/Plugin/Layout.php index ae6d2888f..44fd91b5e 100644 --- a/library/Zend/Layout/Controller/Plugin/Layout.php +++ b/library/Zend/Layout/Controller/Plugin/Layout.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Layout.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Layout_Controller_Plugin_Layout extends Zend_Controller_Plugin_Abstract { diff --git a/library/Zend/Layout/Exception.php b/library/Zend/Layout/Exception.php index b9f297540..c759337ef 100644 --- a/library/Zend/Layout/Exception.php +++ b/library/Zend/Layout/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Layout - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Layout_Exception extends Zend_Exception diff --git a/library/Zend/Ldap.php b/library/Zend/Ldap.php index b872b9ac6..5658c60fd 100644 --- a/library/Zend/Ldap.php +++ b/library/Zend/Ldap.php @@ -15,15 +15,15 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ldap.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Ldap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap @@ -922,8 +922,8 @@ public function bind($username = null, $password = null) * @param array $attributes * @param string|null $sort * @param string|null $collectionClass - * @param integer $sizelimit - * @param integer $timelimit + * @param integer $sizelimit + * @param integer $timelimit * @return Zend_Ldap_Collection * @throws Zend_Ldap_Exception */ @@ -1008,8 +1008,8 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, /** * Extension point for collection creation * - * @param Zend_Ldap_Collection_Iterator_Default $iterator - * @param string|null $collectionClass + * @param Zend_Ldap_Collection_Iterator_Default $iterator + * @param string|null $collectionClass * @return Zend_Ldap_Collection * @throws Zend_Ldap_Exception */ @@ -1107,8 +1107,8 @@ public function exists($dn) * @param array $attributes * @param string|null $sort * @param boolean $reverseSort - * @param integer $sizelimit - * @param integer $timelimit + * @param integer $sizelimit + * @param integer $timelimit * @return array * @throws Zend_Ldap_Exception */ diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php index a064a9d5c..ae833ebe8 100644 --- a/library/Zend/Ldap/Attribute.php +++ b/library/Zend/Ldap/Attribute.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Attribute.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Attribute.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Attribute @@ -214,9 +214,9 @@ private static function _valueFromLdap($value) /** * Converts a PHP data type into its LDAP representation * - * @deprected use Zend_Ldap_Converter instead - * @param mixed $value - * @return string|null - null if the PHP data type cannot be converted. + * @deprected use Zend_Ldap_Converter instead + * @param mixed $value + * @return string|null - null if the PHP data type cannot be converted. */ public static function convertToLdapValue($value) { @@ -226,9 +226,9 @@ public static function convertToLdapValue($value) /** * Converts an LDAP value into its PHP data type * - * @deprected use Zend_Ldap_Converter instead - * @param string $value - * @return mixed + * @deprected use Zend_Ldap_Converter instead + * @param string $value + * @return mixed */ public static function convertFromLdapValue($value) { @@ -392,9 +392,9 @@ public static function getDateTimeAttribute(array $data, $attribName, $index = n } } else { - $newVal = self::_valueFromLdapDateTime($values); - if ($newVal !== null) $values = $newVal; - } + $newVal = self::_valueFromLdapDateTime($values); + if ($newVal !== null) $values = $newVal; + } return $values; } diff --git a/library/Zend/Ldap/Collection.php b/library/Zend/Ldap/Collection.php index f6a08c1f3..396a44e47 100644 --- a/library/Zend/Ldap/Collection.php +++ b/library/Zend/Ldap/Collection.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Collection.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Collection implements Iterator, Countable diff --git a/library/Zend/Ldap/Collection/Iterator/Default.php b/library/Zend/Ldap/Collection/Iterator/Default.php index b7fb7e67e..26b2d6fe6 100644 --- a/library/Zend/Ldap/Collection/Iterator/Default.php +++ b/library/Zend/Ldap/Collection/Iterator/Default.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24613 2012-01-21 14:44:26Z sgehrig $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Collection_Iterator_Default implements Iterator, Countable @@ -260,7 +260,7 @@ public function key() */ public function next() { - if (is_resource($this->_current)) { + if (is_resource($this->_current) && $this->_itemCount > 0) { $this->_current = @ldap_next_entry($this->_ldap->getResource(), $this->_current); /** @see Zend_Ldap_Exception */ // require_once 'Zend/Ldap/Exception.php'; @@ -273,6 +273,8 @@ public function next() throw new Zend_Ldap_Exception($this->_ldap, 'getting next entry (' . $msg . ')'); } } + } else { + $this->_current = false; } } diff --git a/library/Zend/Ldap/Converter.php b/library/Zend/Ldap/Converter.php index 33a256b4a..c61ca3331 100644 --- a/library/Zend/Ldap/Converter.php +++ b/library/Zend/Ldap/Converter.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Converter.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Converter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Converter @@ -73,7 +73,7 @@ public static function hex32ToAsc($string) return $string; } - /** + /** * Convert any value to an LDAP-compatible value. * * By setting the $type-parameter the conversion of a certain @@ -81,10 +81,10 @@ public static function hex32ToAsc($string) * * @todo write more tests * - * @param mixed $value The value to convert - * @param int $ytpe The conversion type to use - * @return string - * @throws Zend_Ldap_Converter_Exception + * @param mixed $value The value to convert + * @param int $ytpe The conversion type to use + * @return string + * @throws Zend_Ldap_Converter_Exception */ public static function toLdap($value, $type = self::STANDARD) { @@ -132,11 +132,11 @@ public static function toLdap($value, $type = self::STANDARD) * DateTime Object, a string that is parseable by strtotime() or a Zend_Date * Object. * - * @param integer|string|DateTimt|Zend_Date $date The date-entity - * @param boolean $asUtc Whether to return the LDAP-compatible date-string - * as UTC or as local value - * @return string - * @throws InvalidArgumentException + * @param integer|string|DateTimt|Zend_Date $date The date-entity + * @param boolean $asUtc Whether to return the LDAP-compatible date-string + * as UTC or as local value + * @return string + * @throws InvalidArgumentException */ public static function toLdapDateTime($date, $asUtc = true) { @@ -170,8 +170,8 @@ public static function toLdapDateTime($date, $asUtc = true) * case-insensitive string 'true' to an LDAP-compatible 'TRUE'. All other * other values are converted to an LDAP-compatible 'FALSE'. * - * @param boolean|integer|string $value The boolean value to encode - * @return string + * @param boolean|integer|string $value The boolean value to encode + * @return string */ public static function toLdapBoolean($value) { @@ -188,8 +188,8 @@ public static function toLdapBoolean($value) /** * Serialize any value for storage in LDAP * - * @param mixed $value The value to serialize - * @return string + * @param mixed $value The value to serialize + * @return string */ public static function toLdapSerialize($value) { @@ -202,11 +202,11 @@ public static function toLdapSerialize($value) * By setting the $type-parameter the conversion of a certain * type can be forced * . - * @param string $value The value to convert - * @param int $ytpe The conversion type to use - * @param boolean $dateTimeAsUtc Return DateTime values in UTC timezone - * @return mixed - * @throws Zend_Ldap_Converter_Exception + * @param string $value The value to convert + * @param int $ytpe The conversion type to use + * @param boolean $dateTimeAsUtc Return DateTime values in UTC timezone + * @return mixed + * @throws Zend_Ldap_Converter_Exception */ public static function fromLdap($value, $type = self::STANDARD, $dateTimeAsUtc = true) { @@ -219,7 +219,8 @@ public static function fromLdap($value, $type = self::STANDARD, $dateTimeAsUtc = break; default: if (is_numeric($value)) { - return (float)$value; + // prevent numeric values to be treated as date/time + return $value; } else if ('TRUE' === $value || 'FALSE' === $value) { return self::fromLdapBoolean($value); } @@ -239,10 +240,10 @@ public static function fromLdap($value, $type = self::STANDARD, $dateTimeAsUtc = * * CAVEAT: The DateTime-Object returned will alwasy be set to UTC-Timezone. * - * @param string $date The generalized-Time - * @param boolean $asUtc Return the DateTime with UTC timezone - * @return DateTime - * @throws InvalidArgumentException if a non-parseable-format is given + * @param string $date The generalized-Time + * @param boolean $asUtc Return the DateTime with UTC timezone + * @return DateTime + * @throws InvalidArgumentException if a non-parseable-format is given */ public static function fromLdapDateTime($date, $asUtc = true) { @@ -265,7 +266,7 @@ public static function fromLdapDateTime($date, $asUtc = true) 'second' => 0, 'offdir' => '+', 'offsethours' => 0, - 'offsetminutes' => 0 + 'offsetminutes' => 0 ); $length = strlen($date); @@ -363,9 +364,9 @@ public static function fromLdapDateTime($date, $asUtc = true) /** * Convert an LDAP-compatible boolean value into a PHP-compatible one * - * @param string $value The value to convert - * @return boolean - * @throws InvalidArgumentException + * @param string $value The value to convert + * @return boolean + * @throws InvalidArgumentException */ public static function fromLdapBoolean($value) { @@ -381,9 +382,9 @@ public static function fromLdapBoolean($value) /** * Unserialize a serialized value to return the corresponding object * - * @param string $value The value to convert - * @return mixed - * @throws UnexpectedValueException + * @param string $value The value to convert + * @return mixed + * @throws UnexpectedValueException */ public static function fromLdapUnserialize($value) { diff --git a/library/Zend/Ldap/Converter/Exception.php b/library/Zend/Ldap/Converter/Exception.php index 66c4c6134..872df92e7 100644 --- a/library/Zend/Ldap/Converter/Exception.php +++ b/library/Zend/Ldap/Converter/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Converter_Exception extends Zend_Exception diff --git a/library/Zend/Ldap/Dn.php b/library/Zend/Ldap/Dn.php index 9dadc5435..b719ec129 100644 --- a/library/Zend/Ldap/Dn.php +++ b/library/Zend/Ldap/Dn.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dn.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Dn.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Dn implements ArrayAccess diff --git a/library/Zend/Ldap/Exception.php b/library/Zend/Ldap/Exception.php index 3a3672b8a..5cf24e689 100644 --- a/library/Zend/Ldap/Exception.php +++ b/library/Zend/Ldap/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Ldap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 22996 2010-09-22 17:01:46Z sgehrig $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Ldap * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Exception extends Zend_Exception diff --git a/library/Zend/Ldap/Filter.php b/library/Zend/Ldap/Filter.php index 2a8ae33d3..c7ad2e21f 100644 --- a/library/Zend/Ldap/Filter.php +++ b/library/Zend/Ldap/Filter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filter.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Filter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter extends Zend_Ldap_Filter_String diff --git a/library/Zend/Ldap/Filter/Abstract.php b/library/Zend/Ldap/Filter/Abstract.php index ea351f152..5ab68d382 100644 --- a/library/Zend/Ldap/Filter/Abstract.php +++ b/library/Zend/Ldap/Filter/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Filter_Abstract diff --git a/library/Zend/Ldap/Filter/And.php b/library/Zend/Ldap/Filter/And.php index dc9eb2fcc..1d3876236 100644 --- a/library/Zend/Ldap/Filter/And.php +++ b/library/Zend/Ldap/Filter/And.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: And.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: And.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_And extends Zend_Ldap_Filter_Logical diff --git a/library/Zend/Ldap/Filter/Exception.php b/library/Zend/Ldap/Filter/Exception.php index 59228daa9..59f636c46 100644 --- a/library/Zend/Ldap/Filter/Exception.php +++ b/library/Zend/Ldap/Filter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Exception extends Zend_Exception diff --git a/library/Zend/Ldap/Filter/Logical.php b/library/Zend/Ldap/Filter/Logical.php index 31d997e16..a4de8b4ac 100644 --- a/library/Zend/Ldap/Filter/Logical.php +++ b/library/Zend/Ldap/Filter/Logical.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Logical.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Logical.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Filter_Logical extends Zend_Ldap_Filter_Abstract diff --git a/library/Zend/Ldap/Filter/Mask.php b/library/Zend/Ldap/Filter/Mask.php index 7761b04de..830838560 100644 --- a/library/Zend/Ldap/Filter/Mask.php +++ b/library/Zend/Ldap/Filter/Mask.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mask.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mask.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Mask extends Zend_Ldap_Filter_String diff --git a/library/Zend/Ldap/Filter/Not.php b/library/Zend/Ldap/Filter/Not.php index db8fdb820..c2f988ba4 100644 --- a/library/Zend/Ldap/Filter/Not.php +++ b/library/Zend/Ldap/Filter/Not.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Not.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Not.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Not extends Zend_Ldap_Filter_Abstract diff --git a/library/Zend/Ldap/Filter/Or.php b/library/Zend/Ldap/Filter/Or.php index d7239e16a..6aca2c616 100644 --- a/library/Zend/Ldap/Filter/Or.php +++ b/library/Zend/Ldap/Filter/Or.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Or.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Or.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_Or extends Zend_Ldap_Filter_Logical diff --git a/library/Zend/Ldap/Filter/String.php b/library/Zend/Ldap/Filter/String.php index 1a5398426..02f0c47d1 100644 --- a/library/Zend/Ldap/Filter/String.php +++ b/library/Zend/Ldap/Filter/String.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: String.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Filter_String extends Zend_Ldap_Filter_Abstract diff --git a/library/Zend/Ldap/Ldif/Encoder.php b/library/Zend/Ldap/Ldif/Encoder.php index b56b0a06d..83309bbbe 100644 --- a/library/Zend/Ldap/Ldif/Encoder.php +++ b/library/Zend/Ldap/Ldif/Encoder.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Ldif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Encoder.php 21005 2010-02-09 13:16:26Z sgehrig $ + * @version $Id: Encoder.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Ldif - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Ldif_Encoder diff --git a/library/Zend/Ldap/Node.php b/library/Zend/Ldap/Node.php index 14e0f6c1f..565f6012b 100644 --- a/library/Zend/Ldap/Node.php +++ b/library/Zend/Ldap/Node.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Node.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Node.php 24615 2012-01-23 15:49:10Z sgehrig $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node extends Zend_Ldap_Node_Abstract implements Iterator, RecursiveIterator @@ -319,12 +319,17 @@ public static function fromArray(array $data, $fromDataSource = false) /** * Ensures that teh RDN attributes are correctly set. * + * @param boolean $overwrite True to overwrite the RDN attributes * @return void */ - protected function _ensureRdnAttributeValues() + protected function _ensureRdnAttributeValues($overwrite = false) { foreach ($this->getRdnArray() as $key => $value) { - Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, false); + if (!array_key_exists($key, $this->_currentData) || $overwrite) { + Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, false); + } else if (!in_array($value, $this->_currentData[$key])) { + Zend_Ldap_Attribute::setAttribute($this->_currentData, $key, $value, true); + } } } @@ -501,7 +506,7 @@ public function setDn($newDn) } else { $this->_newDn = Zend_Ldap_Dn::factory($newDn); } - $this->_ensureRdnAttributeValues(); + $this->_ensureRdnAttributeValues(true); return $this; } diff --git a/library/Zend/Ldap/Node/Abstract.php b/library/Zend/Ldap/Node/Abstract.php index 0f178a384..7d403bb27 100644 --- a/library/Zend/Ldap/Node/Abstract.php +++ b/library/Zend/Ldap/Node/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Node_Abstract implements ArrayAccess, Countable diff --git a/library/Zend/Ldap/Node/ChildrenIterator.php b/library/Zend/Ldap/Node/ChildrenIterator.php index 451b750d7..fcc4da2db 100644 --- a/library/Zend/Ldap/Node/ChildrenIterator.php +++ b/library/Zend/Ldap/Node/ChildrenIterator.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChildrenIterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ChildrenIterator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_ChildrenIterator implements Iterator, Countable, RecursiveIterator, ArrayAccess diff --git a/library/Zend/Ldap/Node/Collection.php b/library/Zend/Ldap/Node/Collection.php index fd523fd0b..0ec48d569 100644 --- a/library/Zend/Ldap/Node/Collection.php +++ b/library/Zend/Ldap/Node/Collection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Collection.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Node - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Collection extends Zend_Ldap_Collection diff --git a/library/Zend/Ldap/Node/RootDse.php b/library/Zend/Ldap/Node/RootDse.php index d1c6f8c40..bfe4b37dd 100644 --- a/library/Zend/Ldap/Node/RootDse.php +++ b/library/Zend/Ldap/Node/RootDse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RootDse.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RootDse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse extends Zend_Ldap_Node_Abstract diff --git a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php index a7c5aa502..7c806a47b 100644 --- a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse_ActiveDirectory extends Zend_Ldap_Node_RootDse diff --git a/library/Zend/Ldap/Node/RootDse/OpenLdap.php b/library/Zend/Ldap/Node/RootDse/OpenLdap.php index 808f72d8d..e059ecb1b 100644 --- a/library/Zend/Ldap/Node/RootDse/OpenLdap.php +++ b/library/Zend/Ldap/Node/RootDse/OpenLdap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse_OpenLdap extends Zend_Ldap_Node_RootDse diff --git a/library/Zend/Ldap/Node/RootDse/eDirectory.php b/library/Zend/Ldap/Node/RootDse/eDirectory.php index 6c815d955..270bac6b7 100644 --- a/library/Zend/Ldap/Node/RootDse/eDirectory.php +++ b/library/Zend/Ldap/Node/RootDse/eDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: eDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: eDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Ldap * @subpackage RootDSE - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_RootDse_eDirectory extends Zend_Ldap_Node_RootDse diff --git a/library/Zend/Ldap/Node/Schema.php b/library/Zend/Ldap/Node/Schema.php index 658c0d589..ff63a0824 100644 --- a/library/Zend/Ldap/Node/Schema.php +++ b/library/Zend/Ldap/Node/Schema.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Schema.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Schema.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema extends Zend_Ldap_Node_Abstract diff --git a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php index c65cdf444..c4e71fd4f 100644 --- a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_ActiveDirectory extends Zend_Ldap_Node_Schema diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php index 798dd6bfd..58d6c59fa 100644 --- a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory extends Zend_Ldap_Node_Schema_Item diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php b/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php index c24d07720..1c7680c61 100644 --- a/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php +++ b/library/Zend/Ldap/Node/Schema/AttributeType/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Ldap_Node_Schema_AttributeType_Interface diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php index c4890cb00..d4be71a91 100644 --- a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php +++ b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_AttributeType_OpenLdap extends Zend_Ldap_Node_Schema_Item diff --git a/library/Zend/Ldap/Node/Schema/Item.php b/library/Zend/Ldap/Node/Schema/Item.php index ed3e26a34..5a06eb54a 100644 --- a/library/Zend/Ldap/Node/Schema/Item.php +++ b/library/Zend/Ldap/Node/Schema/Item.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Item.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Ldap_Node_Schema_Item implements ArrayAccess, Countable diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php index d4208c63b..c1c0b4d60 100644 --- a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActiveDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActiveDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory extends Zend_Ldap_Node_Schema_Item diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php b/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php index fceafdd80..fa3e3ac76 100644 --- a/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php +++ b/library/Zend/Ldap/Node/Schema/ObjectClass/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Ldap_Node_Schema_ObjectClass_Interface diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php index bcee64269..3417a7922 100644 --- a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php +++ b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_ObjectClass_OpenLdap extends Zend_Ldap_Node_Schema_Item diff --git a/library/Zend/Ldap/Node/Schema/OpenLdap.php b/library/Zend/Ldap/Node/Schema/OpenLdap.php index a247ffe9b..921256f04 100644 --- a/library/Zend/Ldap/Node/Schema/OpenLdap.php +++ b/library/Zend/Ldap/Node/Schema/OpenLdap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenLdap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenLdap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Ldap * @subpackage Schema - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema diff --git a/library/Zend/Loader.php b/library/Zend/Loader.php index 4297aa365..d3022c96f 100644 --- a/library/Zend/Loader.php +++ b/library/Zend/Loader.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Loader.php 22019 2010-04-27 16:33:31Z matthew $ + * @version $Id: Loader.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader @@ -61,7 +61,7 @@ public static function loadClass($class, $dirs = null) } // Autodiscover the path from the class name - // Implementation is PHP namespace-aware, and based on + // Implementation is PHP namespace-aware, and based on // Framework Interop Group reference implementation: // http://groups.google.com/group/php-standards/web/psr-0-final-proposal $className = ltrim($class, '\\'); @@ -138,7 +138,7 @@ public static function loadFile($filename, $dirs = null, $once = false) $incPath = get_include_path(); set_include_path($dirs . PATH_SEPARATOR . $incPath); } - + /** * Try finding for the plain filename in the include_path. */ @@ -174,7 +174,7 @@ public static function loadFile($filename, $dirs = null, $once = false) public static function isReadable($filename) { if (is_readable($filename)) { - // Return early if the filename is readable without needing the + // Return early if the filename is readable without needing the // include_path return true; } @@ -182,7 +182,7 @@ public static function isReadable($filename) if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' && preg_match('/^[a-z]:/i', $filename) ) { - // If on windows, and path provided is clearly an absolute path, + // If on windows, and path provided is clearly an absolute path, // return false immediately return false; } @@ -207,8 +207,8 @@ public static function isReadable($filename) * * If no path provided, uses current include_path. Works around issues that * occur when the path includes stream schemas. - * - * @param string|null $path + * + * @param string|null $path * @return array */ public static function explodeIncludePath($path = null) @@ -218,7 +218,7 @@ public static function explodeIncludePath($path = null) } if (PATH_SEPARATOR == ':') { - // On *nix systems, include_paths which include paths with a stream + // On *nix systems, include_paths which include paths with a stream // schema cannot be safely explode'd, so we have to be a bit more // intelligent in the approach. $paths = preg_split('#:(?!//)#', $path); diff --git a/library/Zend/Loader/Autoloader.php b/library/Zend/Loader/Autoloader.php index e9f27e79c..b357e229e 100644 --- a/library/Zend/Loader/Autoloader.php +++ b/library/Zend/Loader/Autoloader.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Autoloader.php 23161 2010-10-19 16:08:36Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Autoloader.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_Loader_Autoloader * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_Autoloader @@ -335,9 +335,10 @@ public function getClassAutoloaders($class) continue; } if (0 === strpos($class, $ns)) { - $namespace = $ns; - $autoloaders = $autoloaders + $this->getNamespaceAutoloaders($ns); - break; + if ((false === $namespace) || (strlen($ns) > strlen($namespace))) { + $namespace = $ns; + $autoloaders = $this->getNamespaceAutoloaders($ns); + } } } @@ -351,7 +352,13 @@ public function getClassAutoloaders($class) } // Add non-namespaced autoloaders - $autoloaders = $autoloaders + $this->getNamespaceAutoloaders(''); + $autoloadersNonNamespace = $this->getNamespaceAutoloaders(''); + if (count($autoloadersNonNamespace)) { + foreach ($autoloadersNonNamespace as $ns) { + $autoloaders[] = $ns; + } + unset($autoloadersNonNamespace); + } // Add fallback autoloader if (!$namespace && $this->isFallbackAutoloader()) { diff --git a/library/Zend/Loader/Autoloader/Interface.php b/library/Zend/Loader/Autoloader/Interface.php index 353328598..483c804a4 100644 --- a/library/Zend/Loader/Autoloader/Interface.php +++ b/library/Zend/Loader/Autoloader/Interface.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Interface.php 22913 2010-08-29 00:28:02Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Loader_Autoloader_Interface diff --git a/library/Zend/Loader/Autoloader/Resource.php b/library/Zend/Loader/Autoloader/Resource.php index cd0a7fe7f..2c32b6f7c 100644 --- a/library/Zend/Loader/Autoloader/Resource.php +++ b/library/Zend/Loader/Autoloader/Resource.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Resource.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_Loader_Autoloader_Interface * @package Zend_Loader * @subpackage Autoloader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interface @@ -88,6 +88,7 @@ public function __construct($options) if (!empty($namespace)) { $namespace .= '_'; } + // require_once 'Zend/Loader/Autoloader.php'; Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace); } @@ -144,7 +145,12 @@ public function getClassPath($class) $namespace = ''; if (!empty($namespaceTopLevel)) { - $namespace = array_shift($segments); + $namespace = array(); + $topLevelSegments = count(explode('_', $namespaceTopLevel)); + for ($i = 0; $i < $topLevelSegments; $i++) { + $namespace[] = array_shift($segments); + } + $namespace = implode('_', $namespace); if ($namespace != $namespaceTopLevel) { // wrong prefix? we're done return false; @@ -205,6 +211,12 @@ public function autoload($class) */ public function setOptions(array $options) { + // Set namespace first, see ZF-10836 + if (isset($options['namespace'])) { + $this->setNamespace($options['namespace']); + unset($options['namespace']); + } + $methods = get_class_methods($this); foreach ($options as $key => $value) { $method = 'set' . ucfirst($key); diff --git a/library/Zend/Loader/Exception.php b/library/Zend/Loader/Exception.php index 84d40420e..29f4d70e6 100644 --- a/library/Zend/Loader/Exception.php +++ b/library/Zend/Loader/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Loader * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_Exception extends Zend_Exception diff --git a/library/Zend/Loader/PluginLoader.php b/library/Zend/Loader/PluginLoader.php index 78bc2155c..51c945b74 100644 --- a/library/Zend/Loader/PluginLoader.php +++ b/library/Zend/Loader/PluginLoader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PluginLoader.php 22603 2010-07-17 00:02:10Z ramon $ + * @version $Id: PluginLoader.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Loader_PluginLoader_Interface */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface diff --git a/library/Zend/Loader/PluginLoader/Exception.php b/library/Zend/Loader/PluginLoader/Exception.php index 7db26ae6b..f1896dff9 100644 --- a/library/Zend/Loader/PluginLoader/Exception.php +++ b/library/Zend/Loader/PluginLoader/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_PluginLoader_Exception extends Zend_Loader_Exception diff --git a/library/Zend/Loader/PluginLoader/Interface.php b/library/Zend/Loader/PluginLoader/Interface.php index bfbbe50e3..c190c6470 100644 --- a/library/Zend/Loader/PluginLoader/Interface.php +++ b/library/Zend/Loader/PluginLoader/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Loader_PluginLoader_Interface diff --git a/library/Zend/Locale.php b/library/Zend/Locale.php index 3079bd1df..df54f2480 100644 --- a/library/Zend/Locale.php +++ b/library/Zend/Locale.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locale.php 22712 2010-07-29 08:24:28Z thomas $ + * @version $Id: Locale.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale @@ -666,7 +666,7 @@ public static function getTranslation($value = null, $path = null, $locale = nul // require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $result = Zend_Locale_Data::getContent($locale, $path, $value); - if (empty($result) === true) { + if (empty($result) === true && '0' !== $result) { return false; } diff --git a/library/Zend/Locale/Data.php b/library/Zend/Locale/Data.php index 46dc76c1e..d67ca5a41 100644 --- a/library/Zend/Locale/Data.php +++ b/library/Zend/Locale/Data.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Locale * @subpackage Data - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Data.php 22712 2010-07-29 08:24:28Z thomas $ + * @version $Id: Data.php 24767 2012-05-06 02:53:18Z adamlundrigan $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Locale * @subpackage Data - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Data @@ -361,7 +361,7 @@ public static function getList($locale, $path, $value = false) break; case 'type': - if (empty($type)) { + if (empty($value)) { $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type', 'type'); } else { if (($value == 'calendar') or @@ -1139,6 +1139,10 @@ public static function getContent($locale, $path, $value = false) $temp = self::_getFile($locale, '/ldml/dates/calendars/calendar[@type=\'' . $value[0] . '\']/fields/field/relative[@type=\'' . $value[1] . '\']', '', $value[1]); break; + case 'defaultnumberingsystem': + $temp = self::_getFile($locale, '/ldml/numbers/defaultNumberingSystem', '', 'default'); + break; + case 'decimalnumber': $temp = self::_getFile($locale, '/ldml/numbers/decimalFormats/decimalFormatLength/decimalFormat/pattern', '', 'default'); break; diff --git a/library/Zend/Locale/Data/Translation.php b/library/Zend/Locale/Data/Translation.php index 9dfa87ee3..ec29a30e6 100644 --- a/library/Zend/Locale/Data/Translation.php +++ b/library/Zend/Locale/Data/Translation.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Translation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Data_Translation diff --git a/library/Zend/Locale/Exception.php b/library/Zend/Locale/Exception.php index b01a5b70c..fbea2d499 100644 --- a/library/Zend/Locale/Exception.php +++ b/library/Zend/Locale/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Exception extends Zend_Exception diff --git a/library/Zend/Locale/Format.php b/library/Zend/Locale/Format.php index 09fb9fb67..9c7483bce 100644 --- a/library/Zend/Locale/Format.php +++ b/library/Zend/Locale/Format.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Locale * @subpackage Format - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Format.php 22808 2010-08-08 09:38:42Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Format.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Locale * @subpackage Format - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Format @@ -307,8 +307,8 @@ public static function toNumber($value, array $options = array()) // Get correct signs for this locale $symbols = Zend_Locale_Data::getList($options['locale'], 'symbols'); - $oenc = iconv_get_encoding('internal_encoding'); - iconv_set_encoding('internal_encoding', 'UTF-8'); + $oenc = self::_getEncoding(); + self::_setEncoding('UTF-8'); // Get format $format = $options['number_format']; @@ -343,7 +343,7 @@ public static function toNumber($value, array $options = array()) } if (iconv_strpos($format, '0') === false) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Wrong format... missing 0'); } @@ -469,7 +469,7 @@ public static function toNumber($value, array $options = array()) } } - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); return (string) $format; } @@ -778,8 +778,8 @@ private static function _parseDate($date, $options) $result['date_format'] = $format; // save the format used to normalize $number (convenience) $result['locale'] = $options['locale']; // save the locale used to normalize $number (convenience) - $oenc = iconv_get_encoding('internal_encoding'); - iconv_set_encoding('internal_encoding', 'UTF-8'); + $oenc = self::_getEncoding(); + self::_setEncoding('UTF-8'); $day = iconv_strpos($format, 'd'); $month = iconv_strpos($format, 'M'); $year = iconv_strpos($format, 'y'); @@ -844,7 +844,7 @@ private static function _parseDate($date, $options) } if (empty($parse)) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found"); } @@ -864,7 +864,7 @@ private static function _parseDate($date, $options) preg_match_all('/\d+/u', $number, $splitted); if (count($splitted[0]) == 0) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("No date part in '$date' found."); } @@ -970,7 +970,7 @@ private static function _parseDate($date, $options) if (($position !== false) and ((iconv_strpos($date, $result['day']) === false) or (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) { if ($options['fix_date'] !== true) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (false month, $position, $month)"); @@ -986,7 +986,7 @@ private static function _parseDate($date, $options) if (isset($result['day']) and isset($result['year'])) { if ($result['day'] > 31) { if ($options['fix_date'] !== true) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (d <> y)"); @@ -1002,7 +1002,7 @@ private static function _parseDate($date, $options) if (isset($result['month']) and isset($result['year'])) { if ($result['month'] > 31) { if ($options['fix_date'] !== true) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (M <> y)"); @@ -1018,7 +1018,7 @@ private static function _parseDate($date, $options) if (isset($result['month']) and isset($result['day'])) { if ($result['month'] > 12) { if ($options['fix_date'] !== true || $result['month'] > 31) { - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); // require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (M <> d)"); @@ -1045,7 +1045,7 @@ private static function _parseDate($date, $options) } } - iconv_set_encoding('internal_encoding', $oenc); + self::_setEncoding($oenc); return $result; } @@ -1137,7 +1137,7 @@ public static function checkDateFormat($date, array $options = array()) if (empty($options['date_format'])) { $options['format_type'] = 'iso'; - $options['date_format'] = self::getDateFormat($options['locale']); + $options['date_format'] = self::getDateFormat(isset($options['locale']) ? $options['locale'] : null); } $options = self::_checkOptions($options) + self::$_options; @@ -1262,4 +1262,33 @@ protected static function _getUniCodeSupport() { return (@preg_match('/\pL/u', 'a')) ? true : false; } + + /** + * Internal method to retrieve the current encoding via the ini setting + * default_charset for PHP >= 5.6 or iconv_get_encoding otherwise. + * + * @return string + */ + protected static function _getEncoding() + { + $oenc = PHP_VERSION_ID < 50600 + ? iconv_get_encoding('internal_encoding') + : ini_get('default_charset'); + + } + + /** + * Internal method to set the encoding via the ini setting + * default_charset for PHP >= 5.6 or iconv_set_encoding otherwise. + * + * @return void + */ + protected static function _setEncoding($enc) + { + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('internal_encoding', $enc); + } else { + ini_set('default_charset', $enc); + } + } } diff --git a/library/Zend/Locale/Math.php b/library/Zend/Locale/Math.php index 97553139c..4280e6f4b 100644 --- a/library/Zend/Locale/Math.php +++ b/library/Zend/Locale/Math.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Math.php 21180 2010-02-23 22:00:29Z matthew $ + * @version $Id: Math.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Locale/Math/Exception.php b/library/Zend/Locale/Math/Exception.php index 763b62a7b..ddeed99c0 100644 --- a/library/Zend/Locale/Math/Exception.php +++ b/library/Zend/Locale/Math/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Math_Exception extends Zend_Locale_Exception diff --git a/library/Zend/Locale/Math/PhpMath.php b/library/Zend/Locale/Math/PhpMath.php index 35e20dc7d..6b8a22ae5 100644 --- a/library/Zend/Locale/Math/PhpMath.php +++ b/library/Zend/Locale/Math/PhpMath.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhpMath.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PhpMath.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math diff --git a/library/Zend/Log.php b/library/Zend/Log.php index 74d1fc7ef..4cfbcf89f 100644 --- a/library/Zend/Log.php +++ b/library/Zend/Log.php @@ -14,17 +14,17 @@ * * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 22976 2010-09-19 11:57:26Z intiilapa $ + * @version $Id: Log.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 22976 2010-09-19 11:57:26Z intiilapa $ + * @version $Id: Log.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log { @@ -70,6 +70,12 @@ class Zend_Log */ protected $_defaultFilterNamespace = 'Zend_Log_Filter'; + /** + * + * @var string + */ + protected $_defaultFormatterNamespace = 'Zend_Log_Formatter'; + /** * * @var callback @@ -84,7 +90,7 @@ class Zend_Log /** * - * @var array + * @var array|boolean */ protected $_errorHandlerMap = false; @@ -92,12 +98,13 @@ class Zend_Log * * @var string */ - protected $_timestampFormat = 'Y-m-d H:i:s'; + protected $_timestampFormat = 'c'; /** * Class constructor. Create a new logger * * @param Zend_Log_Writer_Abstract|null $writer default writer + * @return void */ public function __construct(Zend_Log_Writer_Abstract $writer = null) { @@ -115,6 +122,7 @@ public function __construct(Zend_Log_Writer_Abstract $writer = null) * * @param array|Zend_Config Array or instance of Zend_Config * @return Zend_Log + * @throws Zend_Log_Exception */ static public function factory($config = array()) { @@ -130,6 +138,13 @@ static public function factory($config = array()) $log = new self; + if (array_key_exists('timestampFormat', $config)) { + if (null != $config['timestampFormat'] && '' != $config['timestampFormat']) { + $log->setTimestampFormat($config['timestampFormat']); + } + unset($config['timestampFormat']); + } + if (!is_array(current($config))) { $log->addWriter(current($config)); } else { @@ -147,6 +162,7 @@ static public function factory($config = array()) * * @param array $spec config array with writer spec * @return Zend_Log_Writer_Abstract + * @throws Zend_Log_Exception */ protected function _constructWriterFromConfig($config) { @@ -166,6 +182,11 @@ protected function _constructWriterFromConfig($config) $writer->addFilter($filter); } + if (isset($config['formatterName'])) { + $formatter = $this->_constructFormatterFromConfig($config); + $writer->setFormatter($formatter); + } + return $writer; } @@ -174,6 +195,7 @@ protected function _constructWriterFromConfig($config) * * @param array|Zend_Config $config Zend_Config or Array * @return Zend_Log_Filter_Interface + * @throws Zend_Log_Exception */ protected function _constructFilterFromConfig($config) { @@ -191,6 +213,29 @@ protected function _constructFilterFromConfig($config) return $filter; } + /** + * Construct formatter object from configuration array or Zend_Config object + * + * @param array|Zend_Config $config Zend_Config or Array + * @return Zend_Log_Formatter_Interface + * @throws Zend_Log_Exception + */ + protected function _constructFormatterFromConfig($config) + { + $formatter = $this->_constructFromConfig('formatter', $config, $this->_defaultFormatterNamespace); + + if (!$formatter instanceof Zend_Log_Formatter_Interface) { + $formatterName = is_object($formatter) + ? get_class($formatter) + : 'The specified formatter'; + /** @see Zend_Log_Exception */ + // require_once 'Zend/Log/Exception.php'; + throw new Zend_Log_Exception($formatterName . ' does not implement Zend_Log_Formatter_Interface'); + } + + return $formatter; + } + /** * Construct a filter or writer from config * @@ -198,6 +243,7 @@ protected function _constructFilterFromConfig($config) * @param mixed $config Zend_Config or Array * @param string $namespace * @return object + * @throws Zend_Log_Exception */ protected function _constructFromConfig($type, $config, $namespace) { @@ -223,7 +269,7 @@ protected function _constructFromConfig($type, $config, $namespace) if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) { // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( - 'Driver does not implement Zend_Log_FactoryInterface and can not be constructed from config.' + $className . ' does not implement Zend_Log_FactoryInterface and can not be constructed from config.' ); } @@ -237,6 +283,7 @@ protected function _constructFromConfig($type, $config, $namespace) * @param string $type filter|writer * @param string $defaultNamespace * @return string full classname + * @throws Zend_Log_Exception */ protected function getClassName($config, $type, $defaultNamespace) { @@ -261,7 +308,7 @@ protected function getClassName($config, $type, $defaultNamespace) * @param string $message Message to log * @param integer $priority Priority of message * @return array Event array - **/ + */ protected function _packEvent($message, $priority) { return array_merge(array( @@ -387,7 +434,7 @@ public function log($message, $priority, $extras = null) * * @param string $name Name of priority * @param integer $priority Numeric priority - * @throws Zend_Log_InvalidArgumentException + * @throws Zend_Log_Exception */ public function addPriority($name, $priority) { @@ -410,12 +457,13 @@ public function addPriority($name, $priority) * Before a message will be received by any of the writers, it * must be accepted by all filters added with this method. * - * @param int|Zend_Log_Filter_Interface $filter - * @return void + * @param int|Zend_Config|array|Zend_Log_Filter_Interface $filter + * @return Zend_Log + * @throws Zend_Log_Exception */ public function addFilter($filter) { - if (is_integer($filter)) { + if (is_int($filter)) { /** @see Zend_Log_Filter_Priority */ // require_once 'Zend/Log/Filter/Priority.php'; $filter = new Zend_Log_Filter_Priority($filter); @@ -438,7 +486,7 @@ public function addFilter($filter) * message and writing it out to storage. * * @param mixed $writer Zend_Log_Writer_Abstract or Config array - * @return void + * @return Zend_Log */ public function addWriter($writer) { @@ -462,9 +510,9 @@ public function addWriter($writer) /** * Set an extra item to pass to the log writers. * - * @param $name Name of the field - * @param $value Value of the field - * @return void + * @param string $name Name of the field + * @param string $value Value of the field + * @return Zend_Log */ public function setEventItem($name, $value) { @@ -491,7 +539,7 @@ public function registerErrorHandler() { // Only register once. Avoids loop issues if it gets registered twice. if ($this->_registeredErrorHandler) { - return $this; + return $this; } $this->_origErrorHandler = set_error_handler(array($this, 'errorHandler')); diff --git a/library/Zend/Log/Exception.php b/library/Zend/Log/Exception.php index b4bd50b5b..1351e5d55 100644 --- a/library/Zend/Log/Exception.php +++ b/library/Zend/Log/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Exception */ @@ -25,9 +25,9 @@ /** * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Exception extends Zend_Exception {} diff --git a/library/Zend/Log/FactoryInterface.php b/library/Zend/Log/FactoryInterface.php index 33d45bb66..32d6278fe 100644 --- a/library/Zend/Log/FactoryInterface.php +++ b/library/Zend/Log/FactoryInterface.php @@ -14,25 +14,25 @@ * * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FactoryInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: FactoryInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Log - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FactoryInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: FactoryInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ interface Zend_Log_FactoryInterface { /** * Construct a Zend_Log driver - * - * @param array|Zen_Config $config + * + * @param array|Zend_Config $config * @return Zend_Log_FactoryInterface */ static public function factory($config); -} +} \ No newline at end of file diff --git a/library/Zend/Log/Filter/Abstract.php b/library/Zend/Log/Filter/Abstract.php index 7356a2382..35855140d 100644 --- a/library/Zend/Log/Filter/Abstract.php +++ b/library/Zend/Log/Filter/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21892 2010-04-16 19:15:20Z juokaz $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Log_Filter_Interface */ @@ -30,16 +30,16 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21892 2010-04-16 19:15:20Z juokaz $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ -abstract class Zend_Log_Filter_Abstract +abstract class Zend_Log_Filter_Abstract implements Zend_Log_Filter_Interface, Zend_Log_FactoryInterface { /** * Validate and optionally convert the config to array - * + * * @param array|Zend_Config $config Zend_Config or Array * @return array * @throws Zend_Log_Exception diff --git a/library/Zend/Log/Filter/Interface.php b/library/Zend/Log/Filter/Interface.php index c2165d2ba..250f6e4a6 100644 --- a/library/Zend/Log/Filter/Interface.php +++ b/library/Zend/Log/Filter/Interface.php @@ -15,18 +15,18 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ interface Zend_Log_Filter_Interface { diff --git a/library/Zend/Log/Filter/Message.php b/library/Zend/Log/Filter/Message.php index 0c89d197f..e2c24989c 100644 --- a/library/Zend/Log/Filter/Message.php +++ b/library/Zend/Log/Filter/Message.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20981 2010-02-08 15:51:02Z matthew $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Filter_Abstract */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20981 2010-02-08 15:51:02Z matthew $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract { @@ -42,6 +42,7 @@ class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract * Filter out any log messages not matching $regexp. * * @param string $regexp Regular expression to test the log message + * @return void * @throws Zend_Log_Exception */ public function __construct($regexp) @@ -55,12 +56,11 @@ public function __construct($regexp) /** * Create a new instance of Zend_Log_Filter_Message - * + * * @param array|Zend_Config $config * @return Zend_Log_Filter_Message - * @throws Zend_Log_Exception */ - static public function factory($config) + static public function factory($config) { $config = self::_parseConfig($config); $config = array_merge(array( diff --git a/library/Zend/Log/Filter/Priority.php b/library/Zend/Log/Filter/Priority.php index dc4f766f8..a25521270 100644 --- a/library/Zend/Log/Filter/Priority.php +++ b/library/Zend/Log/Filter/Priority.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Priority.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Priority.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Filter_Abstract */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Priority.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Priority.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract { @@ -49,11 +49,12 @@ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract * * @param integer $priority Priority * @param string $operator Comparison operator + * @return void * @throws Zend_Log_Exception */ - public function __construct($priority, $operator = NULL) + public function __construct($priority, $operator = null) { - if (! is_integer($priority)) { + if (! is_int($priority)) { // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Priority must be an integer'); } @@ -64,16 +65,15 @@ public function __construct($priority, $operator = NULL) /** * Create a new instance of Zend_Log_Filter_Priority - * + * * @param array|Zend_Config $config * @return Zend_Log_Filter_Priority - * @throws Zend_Log_Exception */ - static public function factory($config) + static public function factory($config) { $config = self::_parseConfig($config); $config = array_merge(array( - 'priority' => null, + 'priority' => null, 'operator' => null, ), $config); @@ -83,7 +83,7 @@ static public function factory($config) } return new self( - (int) $config['priority'], + (int) $config['priority'], $config['operator'] ); } diff --git a/library/Zend/Log/Filter/Suppress.php b/library/Zend/Log/Filter/Suppress.php index 4efbf87f8..80f580125 100644 --- a/library/Zend/Log/Filter/Suppress.php +++ b/library/Zend/Log/Filter/Suppress.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Suppress.php 22977 2010-09-19 12:44:00Z intiilapa $ + * @version $Id: Suppress.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Filter_Interface */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Filter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Suppress.php 22977 2010-09-19 12:44:00Z intiilapa $ + * @version $Id: Suppress.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Filter_Suppress extends Zend_Log_Filter_Abstract { diff --git a/library/Zend/Log/Formatter/Abstract.php b/library/Zend/Log/Formatter/Abstract.php new file mode 100644 index 000000000..e8abb1048 --- /dev/null +++ b/library/Zend/Log/Formatter/Abstract.php @@ -0,0 +1,40 @@ +_format = $format; } + /** + * Factory for Zend_Log_Formatter_Simple classe + * + * @param array|Zend_Config $options + * @return Zend_Log_Formatter_Simple + */ + public static function factory($options) + { + $format = null; + if (null !== $options) { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } + + if (array_key_exists('format', $options)) { + $format = $options['format']; + } + } + + return new self($format); + } + /** * Formats data into a single line to be written by the writer. * @@ -69,17 +92,17 @@ public function __construct($format = null) public function format($event) { $output = $this->_format; - foreach ($event as $name => $value) { + foreach ($event as $name => $value) { if ((is_object($value) && !method_exists($value,'__toString')) - || is_array($value)) { - + || is_array($value) + ) { $value = gettype($value); } $output = str_replace("%$name%", $value, $output); } + return $output; } - -} +} \ No newline at end of file diff --git a/library/Zend/Log/Formatter/Xml.php b/library/Zend/Log/Formatter/Xml.php index ebf3c29e9..fdf776bba 100644 --- a/library/Zend/Log/Formatter/Xml.php +++ b/library/Zend/Log/Formatter/Xml.php @@ -15,31 +15,31 @@ * @category Zend * @package Zend_Log * @subpackage Formatter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Xml.php 24594 2012-01-05 21:27:01Z matthew $ */ -/** Zend_Log_Formatter_Interface */ -// require_once 'Zend/Log/Formatter/Interface.php'; +/** Zend_Log_Formatter_Abstract */ +// require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend * @package Zend_Log * @subpackage Formatter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Xml.php 24594 2012-01-05 21:27:01Z matthew $ */ -class Zend_Log_Formatter_Xml implements Zend_Log_Formatter_Interface +class Zend_Log_Formatter_Xml extends Zend_Log_Formatter_Abstract { /** - * @var Relates XML elements to log data field keys. + * @var string Name of root element */ protected $_rootElement; /** - * @var Relates XML elements to log data field keys. + * @var array Relates XML elements to log data field keys. */ protected $_elementMap; @@ -50,16 +50,56 @@ class Zend_Log_Formatter_Xml implements Zend_Log_Formatter_Interface /** * Class constructor + * (the default encoding is UTF-8) * - * @param string $rootElement Name of root element - * @param array $elementMap - * @param string $encoding Encoding to use (defaults to UTF-8) + * @param array|Zend_Config $options + * @return void */ - public function __construct($rootElement = 'logEntry', $elementMap = null, $encoding = 'UTF-8') + public function __construct($options = array()) { - $this->_rootElement = $rootElement; - $this->_elementMap = $elementMap; - $this->setEncoding($encoding); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } elseif (!is_array($options)) { + $args = func_get_args(); + + $options = array( + 'rootElement' => array_shift($args) + ); + + if (count($args)) { + $options['elementMap'] = array_shift($args); + } + + if (count($args)) { + $options['encoding'] = array_shift($args); + } + } + + if (!array_key_exists('rootElement', $options)) { + $options['rootElement'] = 'logEntry'; + } + + if (!array_key_exists('encoding', $options)) { + $options['encoding'] = 'UTF-8'; + } + + $this->_rootElement = $options['rootElement']; + $this->setEncoding($options['encoding']); + + if (array_key_exists('elementMap', $options)) { + $this->_elementMap = $options['elementMap']; + } + } + + /** + * Factory for Zend_Log_Formatter_Xml classe + * + * @param array|Zend_Config $options + * @return Zend_Log_Formatter_Xml + */ + public static function factory($options) + { + return new self($options); } /** @@ -106,10 +146,15 @@ public function format($event) $elt = $dom->appendChild(new DOMElement($this->_rootElement)); foreach ($dataToInsert as $key => $value) { - if($key == "message") { - $value = htmlspecialchars($value, ENT_COMPAT, $enc); + if (empty($value) + || is_scalar($value) + || (is_object($value) && method_exists($value,'__toString')) + ) { + if($key == "message") { + $value = htmlspecialchars($value, ENT_COMPAT, $enc); + } + $elt->appendChild(new DOMElement($key, (string)$value)); } - $elt->appendChild(new DOMElement($key, $value)); } $xml = $dom->saveXML(); @@ -117,5 +162,4 @@ public function format($event) return $xml . PHP_EOL; } - } diff --git a/library/Zend/Log/Writer/Abstract.php b/library/Zend/Log/Writer/Abstract.php index a2208e152..4fca6cba8 100644 --- a/library/Zend/Log/Writer/Abstract.php +++ b/library/Zend/Log/Writer/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22567 2010-07-16 03:32:31Z ramon $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Filter_Priority */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22567 2010-07-16 03:32:31Z ramon $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface { @@ -40,6 +40,7 @@ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface /** * Formats the log message before writing. + * * @var Zend_Log_Formatter_Interface */ protected $_formatter; @@ -48,11 +49,11 @@ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface * Add a filter specific to this writer. * * @param Zend_Log_Filter_Interface $filter - * @return void + * @return Zend_Log_Writer_Abstract */ public function addFilter($filter) { - if (is_integer($filter)) { + if (is_int($filter)) { $filter = new Zend_Log_Filter_Priority($filter); } @@ -69,7 +70,7 @@ public function addFilter($filter) /** * Log a message to this writer. * - * @param array $event log data event + * @param array $event log data event * @return void */ public function write($event) @@ -88,7 +89,7 @@ public function write($event) * Set a new formatter for this writer * * @param Zend_Log_Formatter_Interface $formatter - * @return void + * @return Zend_Log_Writer_Abstract */ public function setFormatter(Zend_Log_Formatter_Interface $formatter) { @@ -128,8 +129,8 @@ static protected function _parseConfig($config) if (!is_array($config)) { // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( - 'Configuration must be an array or instance of Zend_Config' - ); + 'Configuration must be an array or instance of Zend_Config' + ); } return $config; diff --git a/library/Zend/Log/Writer/Db.php b/library/Zend/Log/Writer/Db.php index 9a9d21fe8..3e5cad01a 100644 --- a/library/Zend/Log/Writer/Db.php +++ b/library/Zend/Log/Writer/Db.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 22513 2010-07-01 13:48:39Z ramon $ + * @version $Id: Db.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,20 +27,22 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 22513 2010-07-01 13:48:39Z ramon $ + * @version $Id: Db.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract { /** * Database adapter instance + * * @var Zend_Db_Adapter */ private $_db; /** * Name of the log table in the database + * * @var string */ private $_table; @@ -58,6 +60,7 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract * @param Zend_Db_Adapter $db Database adapter instance * @param string $table Log table in database * @param array $columnMap + * @return void */ public function __construct($db, $table, $columnMap = null) { @@ -71,7 +74,6 @@ public function __construct($db, $table, $columnMap = null) * * @param array|Zend_Config $config * @return Zend_Log_Writer_Db - * @throws Zend_Log_Exception */ static public function factory($config) { @@ -95,6 +97,9 @@ static public function factory($config) /** * Formatting is not possible on this writer + * + * @return void + * @throws Zend_Log_Exception */ public function setFormatter(Zend_Log_Formatter_Interface $formatter) { @@ -117,6 +122,7 @@ public function shutdown() * * @param array $event event data * @return void + * @throws Zend_Log_Exception */ protected function _write($event) { diff --git a/library/Zend/Log/Writer/Firebug.php b/library/Zend/Log/Writer/Firebug.php index ede206f09..5b7d002e2 100644 --- a/library/Zend/Log/Writer/Firebug.php +++ b/library/Zend/Log/Writer/Firebug.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Firebug.php 23066 2010-10-09 23:29:20Z cadorn $ + * @version $Id: Firebug.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log */ @@ -38,14 +38,14 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract { - /** * Maps logging priorities to logging display styles + * * @var array */ protected $_priorityStyles = array(Zend_Log::EMERG => Zend_Wildfire_Plugin_FirePhp::ERROR, @@ -59,18 +59,22 @@ class Zend_Log_Writer_Firebug extends Zend_Log_Writer_Abstract /** * The default logging style for un-mapped priorities + * * @var string */ protected $_defaultPriorityStyle = Zend_Wildfire_Plugin_FirePhp::LOG; /** * Flag indicating whether the log writer is enabled + * * @var boolean */ protected $_enabled = true; /** * Class constructor + * + * @return void */ public function __construct() { @@ -80,13 +84,12 @@ public function __construct() $this->_formatter = new Zend_Log_Formatter_Firebug(); } - + /** * Create a new instance of Zend_Log_Writer_Firebug - * + * * @param array|Zend_Config $config * @return Zend_Log_Writer_Firebug - * @throws Zend_Log_Exception */ static public function factory($config) { diff --git a/library/Zend/Log/Writer/Mail.php b/library/Zend/Log/Writer/Mail.php index 5699c74bd..c9a783358 100644 --- a/library/Zend/Log/Writer/Mail.php +++ b/library/Zend/Log/Writer/Mail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 22971 2010-09-18 20:32:24Z mikaelkael $ + * @version $Id: Mail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -39,9 +39,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 22971 2010-09-18 20:32:24Z mikaelkael $ + * @version $Id: Mail.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract { @@ -106,7 +106,7 @@ class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract * @var array */ protected static $_methodMapHeaders = array( - 'from' => 'setFrom', + 'from' => 'setFrom', 'to' => 'addTo', 'cc' => 'addCc', 'bcc' => 'addBcc', @@ -148,7 +148,7 @@ static public function factory($config) $writer->setLayout($config); } if (isset($config['layoutFormatter'])) { - $layoutFormatter = new $config['layoutFormatter']; + $layoutFormatter = new $config['layoutFormatter']; $writer->setLayoutFormatter($layoutFormatter); } if (isset($config['subjectPrependText'])) { @@ -185,6 +185,7 @@ public function setLayout($layout) * * @param array $config * @return Zend_Mail + * @throws Zend_Log_Exception */ protected static function _constructMailFromConfig(array $config) { @@ -213,8 +214,8 @@ protected static function _constructMailFromConfig(array $config) && !is_numeric($address['name']) ) { $params = array( - $address['email'], - $address['name'] + $address['email'], + $address['name'] ); } else if (is_array($address) && isset($address['email'])) { $params = array($address['email']); @@ -233,6 +234,7 @@ protected static function _constructMailFromConfig(array $config) * * @param array $config * @return Zend_Layout + * @throws Zend_Log_Exception */ protected function _constructLayoutFromConfig(array $config) { @@ -331,6 +333,7 @@ public function setLayoutFormatter(Zend_Log_Formatter_Interface $formatter) * * @param string $subject Subject prepend text. * @return Zend_Log_Writer_Mail + * @throws Zend_Log_Exception */ public function setSubjectPrependText($subject) { diff --git a/library/Zend/Log/Writer/Mock.php b/library/Zend/Log/Writer/Mock.php index 1e14a2f00..d30dd6842 100644 --- a/library/Zend/Log/Writer/Mock.php +++ b/library/Zend/Log/Writer/Mock.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mock.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,19 +27,23 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mock.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Writer_Mock extends Zend_Log_Writer_Abstract { /** * array of log events + * + * @var array */ public $events = array(); /** * shutdown called? + * + * @var boolean */ public $shutdown = false; @@ -66,12 +70,11 @@ public function shutdown() /** * Create a new instance of Zend_Log_Writer_Mock - * + * * @param array|Zend_Config $config * @return Zend_Log_Writer_Mock - * @throws Zend_Log_Exception */ - static public function factory($config) + static public function factory($config) { return new self(); } diff --git a/library/Zend/Log/Writer/Null.php b/library/Zend/Log/Writer/Null.php index f281883fb..c1c408eba 100644 --- a/library/Zend/Log/Writer/Null.php +++ b/library/Zend/Log/Writer/Null.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Writer_Null extends Zend_Log_Writer_Abstract { @@ -42,13 +42,12 @@ class Zend_Log_Writer_Null extends Zend_Log_Writer_Abstract protected function _write($event) { } - + /** * Create a new instance of Zend_Log_Writer_Null - * + * * @param array|Zend_Config $config * @return Zend_Log_Writer_Null - * @throws Zend_Log_Exception */ static public function factory($config) { diff --git a/library/Zend/Log/Writer/Stream.php b/library/Zend/Log/Writer/Stream.php index b722dbb4b..ecfb6e31b 100644 --- a/library/Zend/Log/Writer/Stream.php +++ b/library/Zend/Log/Writer/Stream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -30,14 +30,15 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract { /** * Holds the PHP stream to log to. + * * @var null|stream */ protected $_stream = null; @@ -45,13 +46,15 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract /** * Class Constructor * - * @param streamOrUrl Stream or URL to open as a stream - * @param mode Mode, only applicable if a URL is given + * @param array|string|resource $streamOrUrl Stream or URL to open as a stream + * @param string|null $mode Mode, only applicable if a URL is given + * @return void + * @throws Zend_Log_Exception */ - public function __construct($streamOrUrl, $mode = NULL) + public function __construct($streamOrUrl, $mode = null) { // Setting the default - if ($mode === NULL) { + if (null === $mode) { $mode = 'a'; } @@ -81,30 +84,29 @@ public function __construct($streamOrUrl, $mode = NULL) $this->_formatter = new Zend_Log_Formatter_Simple(); } - + /** - * Create a new instance of Zend_Log_Writer_Mock - * + * Create a new instance of Zend_Log_Writer_Stream + * * @param array|Zend_Config $config - * @return Zend_Log_Writer_Mock - * @throws Zend_Log_Exception + * @return Zend_Log_Writer_Stream */ static public function factory($config) { $config = self::_parseConfig($config); $config = array_merge(array( - 'stream' => null, + 'stream' => null, 'mode' => null, ), $config); - $streamOrUrl = isset($config['url']) ? $config['url'] : $config['stream']; - + $streamOrUrl = isset($config['url']) ? $config['url'] : $config['stream']; + return new self( - $streamOrUrl, + $streamOrUrl, $config['mode'] ); } - + /** * Close the stream resource. * @@ -122,6 +124,7 @@ public function shutdown() * * @param array $event event data * @return void + * @throws Zend_Log_Exception */ protected function _write($event) { diff --git a/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php index 56e967115..d1a85ebbf 100644 --- a/library/Zend/Log/Writer/Syslog.php +++ b/library/Zend/Log/Writer/Syslog.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Syslog.php 22977 2010-09-19 12:44:00Z intiilapa $ + * @version $Id: Syslog.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log */ @@ -32,13 +32,14 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract { /** * Maps Zend_Log priorities to PHP's syslog priorities + * * @var array */ protected $_priorities = array( @@ -54,36 +55,41 @@ class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract /** * The default log priority - for unmapped custom priorities + * * @var string */ protected $_defaultPriority = LOG_NOTICE; /** * Last application name set by a syslog-writer instance + * * @var string */ protected static $_lastApplication; /** * Last facility name set by a syslog-writer instance + * * @var string */ protected static $_lastFacility; /** * Application name used by this syslog-writer instance + * * @var string */ protected $_application = 'Zend_Log'; /** * Facility used by this syslog-writer instance + * * @var int */ protected $_facility = LOG_USER; /** - * _validFacilities + * Types of program available to logging of message * * @var array */ @@ -92,7 +98,7 @@ class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract /** * Class constructor * - * @param array $options Array of options; may include "application" and "facility" keys + * @param array $params Array of options; may include "application" and "facility" keys * @return void */ public function __construct(array $params = array()) @@ -103,7 +109,7 @@ public function __construct(array $params = array()) $runInitializeSyslog = true; if (isset($params['facility'])) { - $this->_facility = $this->setFacility($params['facility']); + $this->setFacility($params['facility']); $runInitializeSyslog = false; } @@ -117,7 +123,6 @@ public function __construct(array $params = array()) * * @param array|Zend_Config $config * @return Zend_Log_Writer_Syslog - * @throws Zend_Log_Exception */ static public function factory($config) { @@ -176,7 +181,7 @@ protected function _initializeSyslog() * Set syslog facility * * @param int $facility Syslog facility - * @return void + * @return Zend_Log_Writer_Syslog * @throws Zend_Log_Exception for invalid log facility */ public function setFacility($facility) @@ -210,7 +215,7 @@ public function setFacility($facility) * Set application name * * @param string $application Application name - * @return void + * @return Zend_Log_Writer_Syslog */ public function setApplicationName($application) { @@ -235,7 +240,7 @@ public function shutdown() /** * Write a message to syslog. * - * @param array $event event data + * @param array $event event data * @return void */ protected function _write($event) @@ -252,6 +257,11 @@ protected function _write($event) $this->_initializeSyslog(); } - syslog($priority, $event['message']); + $message = $event['message']; + if ($this->_formatter instanceof Zend_Log_Formatter_Interface) { + $message = $this->_formatter->format($event); + } + + syslog($priority, $message); } -} +} \ No newline at end of file diff --git a/library/Zend/Log/Writer/ZendMonitor.php b/library/Zend/Log/Writer/ZendMonitor.php index 81064dedf..22518e60f 100644 --- a/library/Zend/Log/Writer/ZendMonitor.php +++ b/library/Zend/Log/Writer/ZendMonitor.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendMonitor.php 23351 2010-11-16 18:09:45Z matthew $ + * @version $Id: ZendMonitor.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Log_Writer_Abstract */ @@ -27,26 +27,28 @@ * @category Zend * @package Zend_Log * @subpackage Writer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendMonitor.php 23351 2010-11-16 18:09:45Z matthew $ + * @version $Id: ZendMonitor.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Log_Writer_ZendMonitor extends Zend_Log_Writer_Abstract { /** * Is Zend Monitor enabled? - * @var bool + * + * @var boolean */ protected $_isEnabled = true; /** * Is this for a Zend Server intance? - * @var bool + * + * @var boolean */ protected $_isZendServer = false; /** - * @throws Zend_Log_Exception if Zend Monitor extension not present + * @return void */ public function __construct() { @@ -62,8 +64,7 @@ public function __construct() * Create a new instance of Zend_Log_Writer_ZendMonitor * * @param array|Zend_Config $config - * @return Zend_Log_Writer_Syslog - * @throws Zend_Log_Exception + * @return Zend_Log_Writer_ZendMonitor */ static public function factory($config) { @@ -77,7 +78,7 @@ static public function factory($config) * fail silently. You can query this method to determine if the log * writer is enabled. * - * @return bool + * @return boolean */ public function isEnabled() { @@ -87,7 +88,7 @@ public function isEnabled() /** * Log a message to this writer. * - * @param array $event log data event + * @param array $event log data event * @return void */ public function write($event) @@ -102,7 +103,7 @@ public function write($event) /** * Write a message to the log. * - * @param array $event log data event + * @param array $event log data event * @return void */ protected function _write($event) @@ -116,10 +117,10 @@ protected function _write($event) // On Zend Server; third argument should be the event zend_monitor_custom_event($priority, $message, $event); } else { - // On Zend Platform; third argument is severity -- either + // On Zend Platform; third argument is severity -- either // 0 or 1 -- and fourth is optional (event) // Severity is either 0 (normal) or 1 (severe); classifying - // notice, info, and debug as "normal", and all others as + // notice, info, and debug as "normal", and all others as // "severe" monitor_custom_event($priority, $message, ($priority > 4) ? 0 : 1, $event); } diff --git a/library/Zend/Mail.php b/library/Zend/Mail.php index 8a1fa7a40..72b4e0493 100644 --- a/library/Zend/Mail.php +++ b/library/Zend/Mail.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 23251 2010-10-26 12:47:55Z matthew $ + * @version $Id: Mail.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -46,7 +46,7 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail extends Zend_Mime_Message @@ -1264,8 +1264,7 @@ protected function _formatAddress($email, $name) return $email; } else { $encodedName = $this->_encodeHeader($name); - if ($encodedName === $name && - ((strpos($name, '@') !== false) || (strpos($name, ',') !== false))) { + if ($encodedName === $name && strcspn($name, '()<>[]:;@\\,') != strlen($name)) { $format = '"%s" <%s>'; } else { $format = '%s <%s>'; diff --git a/library/Zend/Mail/Exception.php b/library/Zend/Mail/Exception.php index c912769ee..e06a9f94c 100644 --- a/library/Zend/Mail/Exception.php +++ b/library/Zend/Mail/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Exception extends Zend_Exception diff --git a/library/Zend/Mail/Message.php b/library/Zend/Mail/Message.php index bff51340d..1d7802572 100644 --- a/library/Zend/Mail/Message.php +++ b/library/Zend/Mail/Message.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Interface @@ -73,7 +73,7 @@ public function __construct(array $params) if (!empty($params['flags'])) { // set key and value to the same value for easy lookup - $this->_flags = array_combine($params['flags'], $params['flags']); + $this->_flags = array_merge($this->_flags, array_combine($params['flags'],$params['flags'])); } parent::__construct($params); diff --git a/library/Zend/Mail/Message/File.php b/library/Zend/Mail/Message/File.php index 7857c743d..9798c5fb2 100644 --- a/library/Zend/Mail/Message/File.php +++ b/library/Zend/Mail/Message/File.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Message_File extends Zend_Mail_Part_File implements Zend_Mail_Message_Interface diff --git a/library/Zend/Mail/Message/Interface.php b/library/Zend/Mail/Message/Interface.php index 833be6b44..135ddd3e6 100644 --- a/library/Zend/Mail/Message/Interface.php +++ b/library/Zend/Mail/Message/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Mail/Part.php b/library/Zend/Mail/Part.php index bb7b38e44..786708477 100644 --- a/library/Zend/Mail/Part.php +++ b/library/Zend/Mail/Part.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Part.php 24760 2012-05-05 03:00:27Z adamlundrigan $ */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface @@ -86,6 +86,12 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface * @var int */ protected $_messageNum = 0; + + /** + * Class to use when creating message parts + * @var string + */ + protected $_partClass; /** * Public constructor @@ -122,6 +128,10 @@ public function __construct(array $params) $this->_mail = $params['handler']; $this->_messageNum = $params['id']; } + + if (isset($params['partclass'])) { + $this->setPartClass($params['partclass']); + } if (isset($params['raw'])) { Zend_Mime_Decode::splitMessage($params['raw'], $this->_headers, $this->_content); @@ -140,6 +150,44 @@ public function __construct(array $params) } } } + + /** + * Set name pf class used to encapsulate message parts + * @param string $class + * @return Zend_Mail_Part + */ + public function setPartClass($class) + { + if ( !class_exists($class) ) { + /** + * @see Zend_Mail_Exception + */ + // require_once 'Zend/Mail/Exception.php'; + throw new Zend_Mail_Exception("Class '{$class}' does not exist"); + } + if ( !is_subclass_of($class, 'Zend_Mail_Part_Interface') ) { + /** + * @see Zend_Mail_Exception + */ + // require_once 'Zend/Mail/Exception.php'; + throw new Zend_Mail_Exception("Class '{$class}' must implement Zend_Mail_Part_Interface"); + } + + $this->_partClass = $class; + return $this; + } + + /** + * Retrieve the class name used to encapsulate message parts + * @return string + */ + public function getPartClass() + { + if ( !$this->_partClass ) { + $this->_partClass = __CLASS__; + } + return $this->_partClass; + } /** * Check if part is a multipart message @@ -223,9 +271,10 @@ protected function _cacheContent() if ($parts === null) { return; } + $partClass = $this->getPartClass(); $counter = 1; foreach ($parts as $part) { - $this->_parts[$counter++] = new self(array('headers' => $part['header'], 'content' => $part['body'])); + $this->_parts[$counter++] = new $partClass(array('headers' => $part['header'], 'content' => $part['body'])); } } diff --git a/library/Zend/Mail/Part/File.php b/library/Zend/Mail/Part/File.php index 581195bcc..be7e106eb 100644 --- a/library/Zend/Mail/Part/File.php +++ b/library/Zend/Mail/Part/File.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Part_File extends Zend_Mail_Part diff --git a/library/Zend/Mail/Part/Interface.php b/library/Zend/Mail/Part/Interface.php index 2d8f6f894..9b22af348 100644 --- a/library/Zend/Mail/Part/Interface.php +++ b/library/Zend/Mail/Part/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Mail/Protocol/Abstract.php b/library/Zend/Mail/Protocol/Abstract.php index b38b9a6d1..97ce793d6 100644 --- a/library/Zend/Mail/Protocol/Abstract.php +++ b/library/Zend/Mail/Protocol/Abstract.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22602 2010-07-16 22:37:31Z freak $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -42,9 +42,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22602 2010-07-16 22:37:31Z freak $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ * @todo Implement proxy settings */ abstract class Zend_Mail_Protocol_Abstract @@ -161,8 +161,8 @@ public function __destruct() } /** - * Set the maximum log size - * + * Set the maximum log size + * * @param integer $maximumLog Maximum log size * @return void */ @@ -170,18 +170,18 @@ public function setMaximumLog($maximumLog) { $this->_maximumLog = (int) $maximumLog; } - - + + /** - * Get the maximum log size - * + * Get the maximum log size + * * @return int the maximum log size */ public function getMaximumLog() { return $this->_maximumLog; } - + /** * Create a connection to the remote host @@ -277,7 +277,7 @@ protected function _connect($remote) throw new Zend_Mail_Protocol_Exception($errorStr); } - if (($result = stream_set_timeout($this->_socket, self::TIMEOUT_CONNECTION)) === false) { + if (($result = $this->_setStreamTimeout(self::TIMEOUT_CONNECTION)) === false) { /** * @see Zend_Mail_Protocol_Exception */ @@ -357,7 +357,7 @@ protected function _receive($timeout = null) // Adapters may wish to supply per-commend timeouts according to appropriate RFC if ($timeout !== null) { - stream_set_timeout($this->_socket, $timeout); + $this->_setStreamTimeout($timeout); } // Retrieve response @@ -428,9 +428,20 @@ protected function _expect($code, $timeout = null) * @see Zend_Mail_Protocol_Exception */ // require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception($errMsg); + throw new Zend_Mail_Protocol_Exception($errMsg, $cmd); } return $msg; } + + /** + * Set stream timeout + * + * @param integer $timeout + * @return boolean + */ + protected function _setStreamTimeout($timeout) + { + return stream_set_timeout($this->_socket, $timeout); + } } diff --git a/library/Zend/Mail/Protocol/Exception.php b/library/Zend/Mail/Protocol/Exception.php index 30999c2d1..fcf4b4429 100644 --- a/library/Zend/Mail/Protocol/Exception.php +++ b/library/Zend/Mail/Protocol/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Exception extends Zend_Mail_Exception diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php index 286642fb4..643b668f3 100644 --- a/library/Zend/Mail/Protocol/Imap.php +++ b/library/Zend/Mail/Protocol/Imap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imap.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Imap diff --git a/library/Zend/Mail/Protocol/Pop3.php b/library/Zend/Mail/Protocol/Pop3.php index 78f01fe37..67d973679 100644 --- a/library/Zend/Mail/Protocol/Pop3.php +++ b/library/Zend/Mail/Protocol/Pop3.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pop3.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Pop3 diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php index a7d8153fa..c905f9336 100644 --- a/library/Zend/Mail/Protocol/Smtp.php +++ b/library/Zend/Mail/Protocol/Smtp.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Smtp.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract @@ -327,7 +327,7 @@ public function data($data) /** - * Issues the RSET command end validates answer + * Issues the RSET command and validates answer * * Can be used to restore a clean smtp communication state when a transaction has been cancelled or commencing a new transaction. * @@ -346,7 +346,7 @@ public function rset() /** - * Issues the NOOP command end validates answer + * Issues the NOOP command and validates answer * * Not used by Zend_Mail, could be used to keep a connection alive or check if it is still open. * @@ -360,7 +360,7 @@ public function noop() /** - * Issues the VRFY command end validates answer + * Issues the VRFY command and validates answer * * Not used by Zend_Mail. * diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php index 146159eb0..934a65d66 100644 --- a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php +++ b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crammd5.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Crammd5.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Crammd5 extends Zend_Mail_Protocol_Smtp diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php index 892f6724e..96523dcef 100644 --- a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php +++ b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Login.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Login extends Zend_Mail_Protocol_Smtp diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php index fd97fc626..d20de22ea 100644 --- a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php +++ b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plain.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Plain.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Plain extends Zend_Mail_Protocol_Smtp diff --git a/library/Zend/Mail/Storage.php b/library/Zend/Mail/Storage.php index 771f7ae23..e82891f41 100644 --- a/library/Zend/Mail/Storage.php +++ b/library/Zend/Mail/Storage.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage diff --git a/library/Zend/Mail/Storage/Abstract.php b/library/Zend/Mail/Storage/Abstract.php index 0d5f1ed1e..cf66ce907 100644 --- a/library/Zend/Mail/Storage/Abstract.php +++ b/library/Zend/Mail/Storage/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, SeekableIterator @@ -119,7 +119,7 @@ abstract public function getSize($id = 0); /** * Get a message with headers and body * - * @param $id int number of message + * @param int $id number of message * @return Zend_Mail_Message */ abstract public function getMessage($id); diff --git a/library/Zend/Mail/Storage/Exception.php b/library/Zend/Mail/Storage/Exception.php index 29cbc2698..5de4301ab 100644 --- a/library/Zend/Mail/Storage/Exception.php +++ b/library/Zend/Mail/Storage/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Exception extends Zend_Mail_Exception diff --git a/library/Zend/Mail/Storage/Folder.php b/library/Zend/Mail/Storage/Folder.php index 51d8a61a5..a89cbcdb5 100644 --- a/library/Zend/Mail/Storage/Folder.php +++ b/library/Zend/Mail/Storage/Folder.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Folder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Folder.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder implements RecursiveIterator diff --git a/library/Zend/Mail/Storage/Folder/Interface.php b/library/Zend/Mail/Storage/Folder/Interface.php index b5c89ac91..b3b39e135 100644 --- a/library/Zend/Mail/Storage/Folder/Interface.php +++ b/library/Zend/Mail/Storage/Folder/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Mail_Storage_Folder_Interface diff --git a/library/Zend/Mail/Storage/Folder/Maildir.php b/library/Zend/Mail/Storage/Folder/Maildir.php index 228465a9e..6ecaf8d6b 100644 --- a/library/Zend/Mail/Storage/Folder/Maildir.php +++ b/library/Zend/Mail/Storage/Folder/Maildir.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir implements Zend_Mail_Storage_Folder_Interface @@ -77,7 +77,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme * - delim delim char for folder structur, default is '.' * - folder intial selected folder, default is 'INBOX' * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff --git a/library/Zend/Mail/Storage/Folder/Mbox.php b/library/Zend/Mail/Storage/Folder/Mbox.php index fc1d50b2a..c33fd05bc 100644 --- a/library/Zend/Mail/Storage/Folder/Mbox.php +++ b/library/Zend/Mail/Storage/Folder/Mbox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mbox.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Zend_Mail_Storage_Folder_Interface @@ -73,7 +73,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze * - dirname rootdir of mbox structure * - folder intial selected folder, default is 'INBOX' * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php index 2efc5b856..e2c1f721f 100644 --- a/library/Zend/Mail/Storage/Imap.php +++ b/library/Zend/Mail/Storage/Imap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imap.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -60,7 +60,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract diff --git a/library/Zend/Mail/Storage/Maildir.php b/library/Zend/Mail/Storage/Maildir.php index 736b70cc6..73fd78a99 100644 --- a/library/Zend/Mail/Storage/Maildir.php +++ b/library/Zend/Mail/Storage/Maildir.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract @@ -257,7 +257,7 @@ public function getRawContent($id, $part = null) * Supported parameters are: * - dirname dirname of mbox file * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff --git a/library/Zend/Mail/Storage/Mbox.php b/library/Zend/Mail/Storage/Mbox.php index 97bc56e39..c3644a4a7 100644 --- a/library/Zend/Mail/Storage/Mbox.php +++ b/library/Zend/Mail/Storage/Mbox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mbox.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract @@ -216,7 +216,7 @@ public function getRawContent($id, $part = null) * Supported parameters are: * - filename filename of mbox file * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) diff --git a/library/Zend/Mail/Storage/Pop3.php b/library/Zend/Mail/Storage/Pop3.php index 0841c3c35..9eb3515c5 100644 --- a/library/Zend/Mail/Storage/Pop3.php +++ b/library/Zend/Mail/Storage/Pop3.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pop3.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract @@ -154,7 +154,7 @@ public function getRawContent($id, $part = null) * - port port for POP3 server [optional, default = 110] * - ssl 'SSL' or 'TLS' for secure sockets * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception * @throws Zend_Mail_Protocol_Exception */ diff --git a/library/Zend/Mail/Storage/Writable/Interface.php b/library/Zend/Mail/Storage/Writable/Interface.php index 982b44eeb..4d06cae58 100644 --- a/library/Zend/Mail/Storage/Writable/Interface.php +++ b/library/Zend/Mail/Storage/Writable/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Mail/Storage/Writable/Maildir.php b/library/Zend/Mail/Storage/Writable/Maildir.php index 3519a4b41..cfedc3a0d 100644 --- a/library/Zend/Mail/Storage/Writable/Maildir.php +++ b/library/Zend/Mail/Storage/Writable/Maildir.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Maildir @@ -105,7 +105,7 @@ public static function initMaildir($dir) * Additional parameters are (see parent for more): * - create if true a new maildir is create if none exists * - * @param $params array mail reader specific parameters + * @param array $params mail reader specific parameters * @throws Zend_Mail_Storage_Exception */ public function __construct($params) { diff --git a/library/Zend/Mail/Transport/Abstract.php b/library/Zend/Mail/Transport/Abstract.php index 74d6ab005..e8dd675ce 100644 --- a/library/Zend/Mail/Transport/Abstract.php +++ b/library/Zend/Mail/Transport/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Mail_Transport_Abstract diff --git a/library/Zend/Mail/Transport/Exception.php b/library/Zend/Mail/Transport/Exception.php index cf4165a88..452d47742 100644 --- a/library/Zend/Mail/Transport/Exception.php +++ b/library/Zend/Mail/Transport/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Exception extends Zend_Mail_Exception diff --git a/library/Zend/Mail/Transport/File.php b/library/Zend/Mail/Transport/File.php index d5775a872..f6a8913ea 100644 --- a/library/Zend/Mail/Transport/File.php +++ b/library/Zend/Mail/Transport/File.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_File extends Zend_Mail_Transport_Abstract @@ -86,7 +86,7 @@ public function __construct($options = null) */ public function setOptions(array $options) { - if (isset($options['path'])&& is_dir($options['path'])) { + if (isset($options['path']) && is_dir($options['path'])) { $this->_path = $options['path']; } if (isset($options['callback']) && is_callable($options['callback'])) { @@ -127,7 +127,7 @@ protected function _sendMail() * @param Zend_Mail_Transport_File File transport instance * @return string */ - public function defaultCallback($transport) + public function defaultCallback($transport) { return 'ZendMail_' . $_SERVER['REQUEST_TIME'] . '_' . mt_rand() . '.tmp'; } diff --git a/library/Zend/Mail/Transport/Sendmail.php b/library/Zend/Mail/Transport/Sendmail.php index a19300793..de02635e9 100644 --- a/library/Zend/Mail/Transport/Sendmail.php +++ b/library/Zend/Mail/Transport/Sendmail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sendmail.php 21603 2010-03-22 12:47:11Z yoshida@zend.co.jp $ + * @version $Id: Sendmail.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract @@ -74,14 +74,14 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract */ public function __construct($parameters = null) { - if ($parameters instanceof Zend_Config) { - $parameters = $parameters->toArray(); + if ($parameters instanceof Zend_Config) { + $parameters = $parameters->toArray(); } - if (is_array($parameters)) { + if (is_array($parameters)) { $parameters = implode(' ', $parameters); } - + $this->parameters = $parameters; } @@ -109,7 +109,7 @@ public function _sendMail() if(!is_string($this->parameters)) { /** * @see Zend_Mail_Transport_Exception - * + * * Exception is thrown here because * $parameters is a public property */ diff --git a/library/Zend/Mail/Transport/Smtp.php b/library/Zend/Mail/Transport/Smtp.php index 726b23815..24d214023 100644 --- a/library/Zend/Mail/Transport/Smtp.php +++ b/library/Zend/Mail/Transport/Smtp.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 23424 2010-11-22 22:42:55Z bittarman $ + * @version $Id: Smtp.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -45,7 +45,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract @@ -111,7 +111,7 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract * @param string $host OPTIONAL (Default: 127.0.0.1) * @param array|null $config OPTIONAL (Default: null) * @return void - * + * * @todo Someone please make this compatible * with the SendMail transport class. */ diff --git a/library/Zend/Markup.php b/library/Zend/Markup.php index de5cd7238..f9caf69c0 100644 --- a/library/Zend/Markup.php +++ b/library/Zend/Markup.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Markup.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Markup.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup diff --git a/library/Zend/Markup/Exception.php b/library/Zend/Markup/Exception.php index 51f698326..451510872 100644 --- a/library/Zend/Markup/Exception.php +++ b/library/Zend/Markup/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,10 +27,10 @@ /** * Exception class for Zend_Markup * - * @category Zend + * @category Zend * @uses Zend_Exception * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Exception extends Zend_Exception diff --git a/library/Zend/Markup/Parser/Bbcode.php b/library/Zend/Markup/Parser/Bbcode.php index f801a3a65..ead33a273 100644 --- a/library/Zend/Markup/Parser/Bbcode.php +++ b/library/Zend/Markup/Parser/Bbcode.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bbcode.php 21127 2010-02-21 15:35:03Z kokx $ + * @version $Id: Bbcode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Parser_Bbcode implements Zend_Markup_Parser_ParserInterface diff --git a/library/Zend/Markup/Parser/Exception.php b/library/Zend/Markup/Parser/Exception.php index 60c4165a7..13458fef0 100644 --- a/library/Zend/Markup/Parser/Exception.php +++ b/library/Zend/Markup/Parser/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,11 +28,11 @@ /** * Exception class for Zend_Markup_Parser * - * @category Zend + * @category Zend * @uses Zend_Markup_Exception * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Parser_Exception extends Zend_Markup_Exception diff --git a/library/Zend/Markup/Parser/ParserInterface.php b/library/Zend/Markup/Parser/ParserInterface.php index 9eaa0ab37..26007222e 100644 --- a/library/Zend/Markup/Parser/ParserInterface.php +++ b/library/Zend/Markup/Parser/ParserInterface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ParserInterface.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: ParserInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Markup_Parser_ParserInterface diff --git a/library/Zend/Markup/Parser/Textile.php b/library/Zend/Markup/Parser/Textile.php index c074b5b29..48c23c03b 100644 --- a/library/Zend/Markup/Parser/Textile.php +++ b/library/Zend/Markup/Parser/Textile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Textile.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Textile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Parser_Textile implements Zend_Markup_Parser_ParserInterface @@ -288,7 +288,7 @@ protected function _tokenize() $this->_temp = array( 'tag' => '', 'name' => 'p', - 'type' => Zend_Markup_token::TYPE_TAG, + 'type' => Zend_Markup_Token::TYPE_TAG, 'attributes' => array() ); } else { diff --git a/library/Zend/Markup/Renderer/Exception.php b/library/Zend/Markup/Renderer/Exception.php index 76e87b99f..746f00d4e 100644 --- a/library/Zend/Markup/Renderer/Exception.php +++ b/library/Zend/Markup/Renderer/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @uses Zend_Markup_Exception * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Exception extends Zend_Markup_Exception diff --git a/library/Zend/Markup/Renderer/Html.php b/library/Zend/Markup/Renderer/Html.php index f2c25933e..cd5c141c2 100644 --- a/library/Zend/Markup/Renderer/Html.php +++ b/library/Zend/Markup/Renderer/Html.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Html.php 22286 2010-05-25 14:26:45Z matthew $ + * @version $Id: Html.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html extends Zend_Markup_Renderer_RendererAbstract diff --git a/library/Zend/Markup/Renderer/Html/Code.php b/library/Zend/Markup/Renderer/Html/Code.php index e7cd55e52..f560dbbe9 100644 --- a/library/Zend/Markup/Renderer/Html/Code.php +++ b/library/Zend/Markup/Renderer/Html/Code.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code.php 20270 2010-01-13 22:37:41Z kokx $ + * @version $Id: Code.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_Code extends Zend_Markup_Renderer_Html_HtmlAbstract diff --git a/library/Zend/Markup/Renderer/Html/HtmlAbstract.php b/library/Zend/Markup/Renderer/Html/HtmlAbstract.php index dad816dac..34252334c 100644 --- a/library/Zend/Markup/Renderer/Html/HtmlAbstract.php +++ b/library/Zend/Markup/Renderer/Html/HtmlAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlAbstract.php 20271 2010-01-13 23:27:34Z kokx $ + * @version $Id: HtmlAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Markup_Renderer_Html_HtmlAbstract implements Zend_Markup_Renderer_TokenConverterInterface diff --git a/library/Zend/Markup/Renderer/Html/Img.php b/library/Zend/Markup/Renderer/Html/Img.php index d2bc29c0f..e51b32b7d 100644 --- a/library/Zend/Markup/Renderer/Html/Img.php +++ b/library/Zend/Markup/Renderer/Html/Img.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Img.php 20663 2010-01-26 18:45:18Z kokx $ + * @version $Id: Img.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_Img extends Zend_Markup_Renderer_Html_HtmlAbstract diff --git a/library/Zend/Markup/Renderer/Html/List.php b/library/Zend/Markup/Renderer/Html/List.php index 66f2e8421..7226c8b1a 100644 --- a/library/Zend/Markup/Renderer/Html/List.php +++ b/library/Zend/Markup/Renderer/Html/List.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: List.php 20270 2010-01-13 22:37:41Z kokx $ + * @version $Id: List.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_List extends Zend_Markup_Renderer_Html_HtmlAbstract diff --git a/library/Zend/Markup/Renderer/Html/Url.php b/library/Zend/Markup/Renderer/Html/Url.php index a0475853d..6ee812ccb 100644 --- a/library/Zend/Markup/Renderer/Html/Url.php +++ b/library/Zend/Markup/Renderer/Html/Url.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Url.php 20663 2010-01-26 18:45:18Z kokx $ + * @version $Id: Url.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer_Html - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Renderer_Html_Url extends Zend_Markup_Renderer_Html_HtmlAbstract diff --git a/library/Zend/Markup/Renderer/RendererAbstract.php b/library/Zend/Markup/Renderer/RendererAbstract.php index c9aa1d194..40884bdf7 100644 --- a/library/Zend/Markup/Renderer/RendererAbstract.php +++ b/library/Zend/Markup/Renderer/RendererAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 22197 2010-05-19 13:32:25Z kokx $ + * @version $Id: RendererAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Markup_Renderer_RendererAbstract diff --git a/library/Zend/Markup/Renderer/TokenConverterInterface.php b/library/Zend/Markup/Renderer/TokenConverterInterface.php index 8c9383747..5c96218e7 100644 --- a/library/Zend/Markup/Renderer/TokenConverterInterface.php +++ b/library/Zend/Markup/Renderer/TokenConverterInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TokenConverterInterface.php 20271 2010-01-13 23:27:34Z kokx $ + * @version $Id: TokenConverterInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Markup * @subpackage Renderer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Markup_Renderer_TokenConverterInterface diff --git a/library/Zend/Markup/Token.php b/library/Zend/Markup/Token.php index 42580f20c..5e5dbfde9 100644 --- a/library/Zend/Markup/Token.php +++ b/library/Zend/Markup/Token.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Markup * @subpackage Parser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: Token.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_Token @@ -260,7 +260,7 @@ public function getChildren() return $this->_children; } - /** + /** * Does this token have any children * * @return bool diff --git a/library/Zend/Markup/TokenList.php b/library/Zend/Markup/TokenList.php index 521fe2e37..5bd28ca63 100644 --- a/library/Zend/Markup/TokenList.php +++ b/library/Zend/Markup/TokenList.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TokenList.php 20277 2010-01-14 14:17:12Z kokx $ + * @version $Id: TokenList.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Markup - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Markup_TokenList implements RecursiveIterator diff --git a/library/Zend/Measure/Abstract.php b/library/Zend/Measure/Abstract.php index b612d1b27..6ddfb4147 100644 --- a/library/Zend/Measure/Abstract.php +++ b/library/Zend/Measure/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21329 2010-03-04 22:06:08Z thomas $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Measure_Abstract @@ -74,9 +74,9 @@ abstract class Zend_Measure_Abstract /** * Zend_Measure_Abstract is an abstract class for the different measurement types * - * @param $value mixed - Value as string, integer, real or float - * @param $type type - OPTIONAL a measure type f.e. Zend_Measure_Length::METER - * @param $locale locale - OPTIONAL a Zend_Locale Type + * @param mixed $value Value as string, integer, real or float + * @param int $type OPTIONAL a measure type f.e. Zend_Measure_Length::METER + * @param Zend_Locale $locale OPTIONAL a Zend_Locale Type * @throws Zend_Measure_Exception */ public function __construct($value, $type = null, $locale = null) diff --git a/library/Zend/Measure/Acceleration.php b/library/Zend/Measure/Acceleration.php index 9ab0ce900..457e9ad7d 100644 --- a/library/Zend/Measure/Acceleration.php +++ b/library/Zend/Measure/Acceleration.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Acceleration.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Acceleration.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Acceleration - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Acceleration extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Angle.php b/library/Zend/Measure/Angle.php index 7fac021cd..68e438945 100644 --- a/library/Zend/Measure/Angle.php +++ b/library/Zend/Measure/Angle.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Angle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Angle.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Angle - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Angle extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Area.php b/library/Zend/Measure/Area.php index 133fdbe70..1c412b0c7 100644 --- a/library/Zend/Measure/Area.php +++ b/library/Zend/Measure/Area.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Area.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Area.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Area - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Area extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Binary.php b/library/Zend/Measure/Binary.php index 21cbbc8d5..e3d646210 100644 --- a/library/Zend/Measure/Binary.php +++ b/library/Zend/Measure/Binary.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Binary.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Binary.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Binary - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Binary extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Capacitance.php b/library/Zend/Measure/Capacitance.php index 917c9ab53..4f6a1031b 100644 --- a/library/Zend/Measure/Capacitance.php +++ b/library/Zend/Measure/Capacitance.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Capacitance.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Capacitance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Capacitance - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Capacitance extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Cooking/Volume.php b/library/Zend/Measure/Cooking/Volume.php index dd7f60316..846dbc76e 100644 --- a/library/Zend/Measure/Cooking/Volume.php +++ b/library/Zend/Measure/Cooking/Volume.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Volume.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Cooking_Volume - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Cooking_Volume extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Cooking/Weight.php b/library/Zend/Measure/Cooking/Weight.php index 3d9d4e2c4..68d6b2ca3 100644 --- a/library/Zend/Measure/Cooking/Weight.php +++ b/library/Zend/Measure/Cooking/Weight.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Cooking_Weight - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Cooking_Weight extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Current.php b/library/Zend/Measure/Current.php index af361cc01..405eea5fb 100644 --- a/library/Zend/Measure/Current.php +++ b/library/Zend/Measure/Current.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Current.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Current.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Current - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Current extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Density.php b/library/Zend/Measure/Density.php index b672f5163..1f3a5465c 100644 --- a/library/Zend/Measure/Density.php +++ b/library/Zend/Measure/Density.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Density.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Density.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Density - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Density extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Energy.php b/library/Zend/Measure/Energy.php index bb82bc387..ef0608465 100644 --- a/library/Zend/Measure/Energy.php +++ b/library/Zend/Measure/Energy.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Energy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Energy.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Energy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Energy extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Exception.php b/library/Zend/Measure/Exception.php index 27dad8b4a..87eb33315 100644 --- a/library/Zend/Measure/Exception.php +++ b/library/Zend/Measure/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Exception extends Zend_Exception diff --git a/library/Zend/Measure/Flow/Mass.php b/library/Zend/Measure/Flow/Mass.php index 718d4c481..e1ece9de1 100644 --- a/library/Zend/Measure/Flow/Mass.php +++ b/library/Zend/Measure/Flow/Mass.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mass.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mass.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Flow_Mass - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Flow_Mass extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Flow/Mole.php b/library/Zend/Measure/Flow/Mole.php index 726801a25..31b8be07e 100644 --- a/library/Zend/Measure/Flow/Mole.php +++ b/library/Zend/Measure/Flow/Mole.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mole.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mole.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Flow_Mole - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Flow_Mole extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Flow/Volume.php b/library/Zend/Measure/Flow/Volume.php index c8d18e43f..80f2c0785 100644 --- a/library/Zend/Measure/Flow/Volume.php +++ b/library/Zend/Measure/Flow/Volume.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Volume.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Flow_Volume - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Flow_Volume extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Force.php b/library/Zend/Measure/Force.php index a4aac71f3..9ab991b7f 100644 --- a/library/Zend/Measure/Force.php +++ b/library/Zend/Measure/Force.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Force.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Force.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Force - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Force extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Frequency.php b/library/Zend/Measure/Frequency.php index ca9b662e8..240e4ad01 100644 --- a/library/Zend/Measure/Frequency.php +++ b/library/Zend/Measure/Frequency.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frequency.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Frequency.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Frequency - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Frequency extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Illumination.php b/library/Zend/Measure/Illumination.php index 923d00065..45b4382b2 100644 --- a/library/Zend/Measure/Illumination.php +++ b/library/Zend/Measure/Illumination.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Illumination.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Illumination.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Illumination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Illumination extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Length.php b/library/Zend/Measure/Length.php index 771868b37..99e8b0be5 100644 --- a/library/Zend/Measure/Length.php +++ b/library/Zend/Measure/Length.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Length.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Length.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Length - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Length extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Lightness.php b/library/Zend/Measure/Lightness.php index 0d6d19286..48d2f6f36 100644 --- a/library/Zend/Measure/Lightness.php +++ b/library/Zend/Measure/Lightness.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lightness.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Lightness.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Lightness - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Lightness extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Number.php b/library/Zend/Measure/Number.php index 7488aad30..66bc938e0 100644 --- a/library/Zend/Measure/Number.php +++ b/library/Zend/Measure/Number.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Number.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Number.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Number - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Number extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Power.php b/library/Zend/Measure/Power.php index 12e22c9f6..7efd1fb74 100644 --- a/library/Zend/Measure/Power.php +++ b/library/Zend/Measure/Power.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Power.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Power.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Power - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Power extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Pressure.php b/library/Zend/Measure/Pressure.php index 701e753ad..d74c40c51 100644 --- a/library/Zend/Measure/Pressure.php +++ b/library/Zend/Measure/Pressure.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pressure.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pressure.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Pressure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Pressure extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Speed.php b/library/Zend/Measure/Speed.php index 33fa94b01..ea01c2819 100644 --- a/library/Zend/Measure/Speed.php +++ b/library/Zend/Measure/Speed.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Speed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Speed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Speed - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Speed extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Temperature.php b/library/Zend/Measure/Temperature.php index 66e27c6e8..053cdcea8 100644 --- a/library/Zend/Measure/Temperature.php +++ b/library/Zend/Measure/Temperature.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Temperature.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Temperature.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Temperature - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Temperature extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Time.php b/library/Zend/Measure/Time.php index c0cdc86f2..223a99597 100644 --- a/library/Zend/Measure/Time.php +++ b/library/Zend/Measure/Time.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Time.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Time.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Time - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Time extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Torque.php b/library/Zend/Measure/Torque.php index e73dae4af..354169cb7 100644 --- a/library/Zend/Measure/Torque.php +++ b/library/Zend/Measure/Torque.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Torque.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Torque.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Torque - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Torque extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Viscosity/Dynamic.php b/library/Zend/Measure/Viscosity/Dynamic.php index a93af2b7f..060ba2332 100644 --- a/library/Zend/Measure/Viscosity/Dynamic.php +++ b/library/Zend/Measure/Viscosity/Dynamic.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dynamic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dynamic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Viscosity_Dynamic - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Viscosity_Dynamic extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Viscosity/Kinematic.php b/library/Zend/Measure/Viscosity/Kinematic.php index abba38917..82bb213dd 100644 --- a/library/Zend/Measure/Viscosity/Kinematic.php +++ b/library/Zend/Measure/Viscosity/Kinematic.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Kinematic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Kinematic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Viscosity_Kinematic - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Viscosity_Kinematic extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Volume.php b/library/Zend/Measure/Volume.php index 467e26202..166221b15 100644 --- a/library/Zend/Measure/Volume.php +++ b/library/Zend/Measure/Volume.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Volume.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Volume.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Volume - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Volume extends Zend_Measure_Abstract diff --git a/library/Zend/Measure/Weight.php b/library/Zend/Measure/Weight.php index 4edda1453..9d5ba76f9 100644 --- a/library/Zend/Measure/Weight.php +++ b/library/Zend/Measure/Weight.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Measure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Measure * @subpackage Zend_Measure_Weigth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Measure_Weight extends Zend_Measure_Abstract diff --git a/library/Zend/Memory.php b/library/Zend/Memory.php index 149b65d34..6e96ab099 100644 --- a/library/Zend/Memory.php +++ b/library/Zend/Memory.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memory.php 20804 2010-02-01 15:49:16Z alexander $ + * @version $Id: Memory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Memory_Exception */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory @@ -56,7 +56,7 @@ public static function factory($backend, $backendOptions = array()) // Look through available backendsand // (that allows to specify it in any case) $backendIsFound = false; - foreach (Zend_Cache::$availableBackends as $zendCacheBackend) { + foreach (Zend_Cache::$standardBackends as $zendCacheBackend) { if (strcasecmp($backend, $zendCacheBackend) == 0) { $backend = $zendCacheBackend; $backendIsFound = true; diff --git a/library/Zend/Memory/AccessController.php b/library/Zend/Memory/AccessController.php index 5a3055946..c261b6813 100644 --- a/library/Zend/Memory/AccessController.php +++ b/library/Zend/Memory/AccessController.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccessController.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AccessController.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_AccessController implements Zend_Memory_Container_Interface diff --git a/library/Zend/Memory/Container.php b/library/Zend/Memory/Container.php index eefa56f57..ff876b482 100644 --- a/library/Zend/Memory/Container.php +++ b/library/Zend/Memory/Container.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Container.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Memory_Container_Interface */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Memory_Container implements Zend_Memory_Container_Interface diff --git a/library/Zend/Memory/Container/Interface.php b/library/Zend/Memory/Container/Interface.php index 2c7fb5038..1e9770a86 100644 --- a/library/Zend/Memory/Container/Interface.php +++ b/library/Zend/Memory/Container/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Memory_Container_Interface diff --git a/library/Zend/Memory/Container/Locked.php b/library/Zend/Memory/Container/Locked.php index e1ac29ed3..72066cc58 100644 --- a/library/Zend/Memory/Container/Locked.php +++ b/library/Zend/Memory/Container/Locked.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locked.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Locked.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Memory_Container */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Container_Locked extends Zend_Memory_Container diff --git a/library/Zend/Memory/Container/Movable.php b/library/Zend/Memory/Container/Movable.php index 9d08b665f..5de6c884c 100644 --- a/library/Zend/Memory/Container/Movable.php +++ b/library/Zend/Memory/Container/Movable.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Movable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Movable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Memory_Container */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Container_Movable extends Zend_Memory_Container { diff --git a/library/Zend/Memory/Exception.php b/library/Zend/Memory/Exception.php index ea599e652..483b846b5 100644 --- a/library/Zend/Memory/Exception.php +++ b/library/Zend/Memory/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Exception extends Zend_Exception diff --git a/library/Zend/Memory/Manager.php b/library/Zend/Memory/Manager.php index a9d2a0986..237f65edc 100644 --- a/library/Zend/Memory/Manager.php +++ b/library/Zend/Memory/Manager.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manager.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manager.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Memory_Container_Movable */ @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Memory_Manager diff --git a/library/Zend/Memory/Value.php b/library/Zend/Memory/Value.php index 7eb6c61f6..f4d096df5 100644 --- a/library/Zend/Memory/Value.php +++ b/library/Zend/Memory/Value.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Value.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Value.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Memory - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo also implement Countable for PHP 5.1 but not yet to stay 5.0 compatible */ diff --git a/library/Zend/Mime.php b/library/Zend/Mime.php index aa3582efe..1f93b5b28 100644 --- a/library/Zend/Mime.php +++ b/library/Zend/Mime.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mime.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mime.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime diff --git a/library/Zend/Mime/Decode.php b/library/Zend/Mime/Decode.php index b996a4a02..02946e4d9 100644 --- a/library/Zend/Mime/Decode.php +++ b/library/Zend/Mime/Decode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Decode @@ -239,6 +239,6 @@ public static function splitHeaderField($field, $wantedPart = null, $firstName = */ public static function decodeQuotedPrintable($string) { - return iconv_mime_decode($string, ICONV_MIME_DECODE_CONTINUE_ON_ERROR); + return quoted_printable_decode($string); } } diff --git a/library/Zend/Mime/Exception.php b/library/Zend/Mime/Exception.php index cb76e79c5..204cf2374 100644 --- a/library/Zend/Mime/Exception.php +++ b/library/Zend/Mime/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Exception extends Zend_Exception diff --git a/library/Zend/Mime/Message.php b/library/Zend/Mime/Message.php index 781ac9924..e4afe737a 100644 --- a/library/Zend/Mime/Message.php +++ b/library/Zend/Mime/Message.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Message diff --git a/library/Zend/Mime/Part.php b/library/Zend/Mime/Part.php index 96e20d09a..d42c7d7b9 100644 --- a/library/Zend/Mime/Part.php +++ b/library/Zend/Mime/Part.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Part.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Part { @@ -146,6 +146,19 @@ public function getContent($EOL = Zend_Mime::LINEEND) return Zend_Mime::encode($this->_content, $this->encoding, $EOL); } } + + /** + * Get the RAW unencoded content from this part + * @return string + */ + public function getRawContent() + { + if ($this->_isStream) { + return stream_get_contents($this->_content); + } else { + return $this->_content; + } + } /** * Create and return the array of headers for this MIME part diff --git a/library/Zend/Navigation.php b/library/Zend/Navigation.php index db1cf812d..85a0e9a67 100644 --- a/library/Zend/Navigation.php +++ b/library/Zend/Navigation.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Navigation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation extends Zend_Navigation_Container diff --git a/library/Zend/Navigation/Container.php b/library/Zend/Navigation/Container.php index b6ae4c476..d612fe0fd 100644 --- a/library/Zend/Navigation/Container.php +++ b/library/Zend/Navigation/Container.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Container.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable @@ -143,9 +143,12 @@ public function addPage($page) /** * Adds several pages at once * - * @param array|Zend_Config $pages pages to add - * @return Zend_Navigation_Container fluent interface, returns self - * @throws Zend_Navigation_Exception if $pages is not array or Zend_Config + * @param array|Zend_Config|Zend_Navigation_Container $pages pages to add + * @return Zend_Navigation_Container fluent interface, + * returns self + * @throws Zend_Navigation_Exception if $pages is not + * array, Zend_Config or + * Zend_Navigation_Container */ public function addPages($pages) { @@ -153,11 +156,16 @@ public function addPages($pages) $pages = $pages->toArray(); } + if ($pages instanceof Zend_Navigation_Container) { + $pages = iterator_to_array($pages); + } + if (!is_array($pages)) { // require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( - 'Invalid argument: $pages must be an array or an ' . - 'instance of Zend_Config'); + 'Invalid argument: $pages must be an array, an ' . + 'instance of Zend_Config or an instance of ' . + 'Zend_Navigation_Container'); } foreach ($pages as $page) { @@ -369,7 +377,7 @@ public function __call($method, $arguments) public function toArray() { $pages = array(); - + $this->_dirtyIndex = true; $this->_sort(); $indexes = array_keys($this->_index); diff --git a/library/Zend/Navigation/Exception.php b/library/Zend/Navigation/Exception.php index c50fc4540..247ebf254 100644 --- a/library/Zend/Navigation/Exception.php +++ b/library/Zend/Navigation/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation_Exception extends Zend_Exception diff --git a/library/Zend/Navigation/Page.php b/library/Zend/Navigation/Page.php index cb61dd9f5..d0c9cc7b7 100644 --- a/library/Zend/Navigation/Page.php +++ b/library/Zend/Navigation/Page.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 22882 2010-08-22 14:00:16Z freak $ + * @version $Id: Page.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Navigation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Navigation_Page extends Zend_Navigation_Container @@ -41,6 +41,20 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container */ protected $_label; + /** + * Fragment identifier (anchor identifier) + * + * The fragment identifier (anchor identifier) pointing to an anchor within + * a resource that is subordinate to another, primary resource. + * The fragment identifier introduced by a hash mark "#". + * Example: http://www.example.org/foo.html#bar ("bar" is the fragment identifier) + * + * @link http://www.w3.org/TR/html401/intro/intro.html#fragment-uri + * + * @var string|null + */ + protected $_fragment; + /** * Page id * @@ -69,6 +83,18 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container */ protected $_target; + /** + * Accessibility key character + * + * This attribute assigns an access key to an element. An access key is a + * single character from the document character set. + * + * @link http://www.w3.org/TR/html401/interact/forms.html#access-keys + * + * @var string|null + */ + protected $_accesskey; + /** * Forward links to other pages * @@ -138,11 +164,11 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container /** * The type of page to use when it wasn't set - * + * * @var string */ protected static $_defaultPageType; - + // Initialization: /** @@ -191,7 +217,7 @@ public static function factory($options) } elseif(self::getDefaultPageType()!= null) { $type = self::getDefaultPageType(); } - + if(isset($type)) { if (is_string($type) && !empty($type)) { switch (strtolower($type)) { @@ -329,6 +355,35 @@ public function getLabel() return $this->_label; } + /** + * Sets a fragment identifier + * + * @param string $fragment new fragment identifier + * @return Zend_Navigation_Page fluent interface, returns self + * @throws Zend_Navigation_Exception if empty/no string is given + */ + public function setFragment($fragment) + { + if (null !== $fragment && !is_string($fragment)) { + // require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $fragment must be a string or null'); + } + + $this->_fragment = $fragment; + return $this; + } + + /** + * Returns fragment identifier + * + * @return string|null fragment identifier + */ + public function getFragment() + { + return $this->_fragment; + } + /** * Sets page id * @@ -450,6 +505,40 @@ public function getTarget() return $this->_target; } + /** + * Sets access key for this page + * + * @param string|null $character [optional] access key to set. Default + * is null, which sets no access key. + * @return Zend_Navigation_Page fluent interface, returns self + * @throws Zend_Navigation_Exception if access key is not string or null or + * if the string length not equal to one + */ + public function setAccesskey($character = null) + { + if (null !== $character + && (!is_string($character) || 1 != strlen($character))) + { + // require_once 'Zend/Navigation/Exception.php'; + throw new Zend_Navigation_Exception( + 'Invalid argument: $character must be a single character or null' + ); + } + + $this->_accesskey = $character; + return $this; + } + + /** + * Returns page access key + * + * @return string|null page access key or null + */ + public function getAccesskey() + { + return $this->_accesskey; + } + /** * Sets the page's forward links to other pages * @@ -740,6 +829,9 @@ public function getActive($recursive = false) */ public function setVisible($visible = true) { + if (is_string($visible) && 'false' == strtolower($visible)) { + $visible = false; + } $this->_visible = (bool) $visible; return $this; } @@ -1091,10 +1183,12 @@ public function toArray() $this->getCustomProperties(), array( 'label' => $this->getlabel(), + 'fragment' => $this->getFragment(), 'id' => $this->getId(), 'class' => $this->getClass(), 'title' => $this->getTitle(), 'target' => $this->getTarget(), + 'accesskey' => $this->getAccesskey(), 'rel' => $this->getRel(), 'rev' => $this->getRev(), 'order' => $this->getOrder(), @@ -1119,17 +1213,17 @@ protected static function _normalizePropertyName($property) { return str_replace(' ', '', ucwords(str_replace('_', ' ', $property))); } - + public static function setDefaultPageType($type = null) { if($type !== null && !is_string($type)) { throw new Zend_Navigation_Exception( 'Cannot set default page type: type is no string but should be' ); } - + self::$_defaultPageType = $type; } - + public static function getDefaultPageType() { return self::$_defaultPageType; } diff --git a/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php index 57ecc0572..155c22e66 100644 --- a/library/Zend/Navigation/Page/Mvc.php +++ b/library/Zend/Navigation/Page/Mvc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mvc.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mvc.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page @@ -94,6 +94,15 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page */ protected $_resetParams = true; + + /** + * Whether href should be encoded when assembling URL + * + * @see getHref() + * @var bool + */ + protected $_encodeUrl = true; + /** * Cached href * @@ -129,33 +138,49 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page public function isActive($recursive = false) { if (!$this->_active) { - $front = Zend_Controller_Front::getInstance(); - $reqParams = $front->getRequest()->getParams(); - - if (!array_key_exists('module', $reqParams)) { - $reqParams['module'] = $front->getDefaultModule(); + $front = Zend_Controller_Front::getInstance(); + $request = $front->getRequest(); + $reqParams = array(); + if ($request) { + $reqParams = $request->getParams(); + if (!array_key_exists('module', $reqParams)) { + $reqParams['module'] = $front->getDefaultModule(); + } } $myParams = $this->_params; + if ($this->_route) { + $route = $front->getRouter()->getRoute($this->_route); + if(method_exists($route, 'getDefaults')) { + $myParams = array_merge($route->getDefaults(), $myParams); + } + } + if (null !== $this->_module) { $myParams['module'] = $this->_module; - } else { + } elseif(!array_key_exists('module', $myParams)) { $myParams['module'] = $front->getDefaultModule(); } if (null !== $this->_controller) { $myParams['controller'] = $this->_controller; - } else { + } elseif(!array_key_exists('controller', $myParams)) { $myParams['controller'] = $front->getDefaultControllerName(); } if (null !== $this->_action) { $myParams['action'] = $this->_action; - } else { + } elseif(!array_key_exists('action', $myParams)) { $myParams['action'] = $front->getDefaultAction(); } + foreach($myParams as $key => $value) { + if($value == null) { + unset($myParams[$key]); + } + } + if (count(array_intersect_assoc($reqParams, $myParams)) == count($myParams)) { $this->_active = true; @@ -201,7 +226,16 @@ public function getHref() $url = self::$_urlHelper->url($params, $this->getRoute(), - $this->getResetParams()); + $this->getResetParams(), + $this->getEncodeUrl()); + + // Add the fragment identifier if it is set + $fragment = $this->getFragment(); + if (null !== $fragment) { + $url .= '#' . $fragment; + } + + return $this->_hrefCache = $url; return $this->_hrefCache = $url; } @@ -404,6 +438,35 @@ public function getResetParams() return $this->_resetParams; } + /** + * Sets whether href should be encoded when assembling URL + * + * @see getHref() + * + * @param bool $resetParams whether href should be encoded when + * assembling URL + * @return Zend_Navigation_Page_Mvc fluent interface, returns self + */ + public function setEncodeUrl($encodeUrl) + { + $this->_encodeUrl = (bool) $encodeUrl; + $this->_hrefCache = null; + + return $this; + } + + /** + * Returns whether herf should be encoded when assembling URL + * + * @see getHref() + * + * @return bool whether herf should be encoded when assembling URL + */ + public function getEncodeUrl() + { + return $this->_encodeUrl; + } + /** * Sets action helper for assembling URLs * @@ -434,7 +497,8 @@ public function toArray() 'module' => $this->getModule(), 'params' => $this->getParams(), 'route' => $this->getRoute(), - 'reset_params' => $this->getResetParams() + 'reset_params' => $this->getResetParams(), + 'encodeUrl' => $this->getEncodeUrl(), )); } } diff --git a/library/Zend/Navigation/Page/Uri.php b/library/Zend/Navigation/Page/Uri.php index c15e52dad..7888d2fc6 100644 --- a/library/Zend/Navigation/Page/Uri.php +++ b/library/Zend/Navigation/Page/Uri.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uri.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Uri.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Navigation * @subpackage Page - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Navigation_Page_Uri extends Zend_Navigation_Page @@ -79,7 +79,18 @@ public function getUri() */ public function getHref() { - return $this->getUri(); + $uri = $this->getUri(); + + $fragment = $this->getFragment(); + if (null !== $fragment) { + if ('#' == substr($uri, -1)) { + return $uri . $fragment; + } else { + return $uri . '#' . $fragment; + } + } + + return $uri; } // Public methods: diff --git a/library/Zend/Oauth.php b/library/Zend/Oauth.php index 402d7d5eb..a8c3ba641 100644 --- a/library/Zend/Oauth.php +++ b/library/Zend/Oauth.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oauth.php 21070 2010-02-16 14:34:25Z padraic $ + * @version $Id: Oauth.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Http_Client */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth diff --git a/library/Zend/Oauth/Client.php b/library/Zend/Oauth/Client.php index 382f249c0..9d1043ce9 100644 --- a/library/Zend/Oauth/Client.php +++ b/library/Zend/Oauth/Client.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 23076 2010-10-10 21:37:20Z padraic $ + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth */ @@ -34,7 +34,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Client extends Zend_Http_Client @@ -69,14 +69,18 @@ class Zend_Oauth_Client extends Zend_Http_Client * assist in automating OAuth parameter generation, addition and * cryptographioc signing of requests. * - * @param array $oauthOptions - * @param string $uri + * @param array|Zend_Config $oauthOptions + * @param string $uri * @param array|Zend_Config $config * @return void */ public function __construct($oauthOptions, $uri = null, $config = null) { - if (!isset($config['rfc3986_strict'])) { + if ($config instanceof Zend_Config && !isset($config->rfc3986_strict)) { + $config = $config->toArray(); + $config['rfc3986_strict'] = true; + } else if (null === $config || + (is_array($config) && !isset($config['rfc3986_strict']))) { $config['rfc3986_strict'] = true; } parent::__construct($uri, $config); @@ -89,16 +93,6 @@ public function __construct($oauthOptions, $uri = null, $config = null) } } - /** - * Return the current connection adapter - * - * @return Zend_Http_Client_Adapter_Interface|string $adapter - */ - public function getAdapter() - { - return $this->adapter; - } - /** * Load the connection adapter * @@ -246,7 +240,8 @@ public function prepareOauth() $oauthHeaderValue = $this->getToken()->toHeader( $this->getUri(true), $this->_config, - $this->_getSignableParametersAsQueryString() + $this->_getSignableParametersAsQueryString(), + $this->getRealm() ); $this->setHeaders('Authorization', $oauthHeaderValue); } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY) { @@ -266,14 +261,14 @@ public function prepareOauth() $this->setRawData($raw, 'application/x-www-form-urlencoded'); $this->paramsPost = array(); } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_QUERYSTRING) { - $params = array(); + $params = $this->paramsGet; $query = $this->getUri()->getQuery(); if ($query) { $queryParts = explode('&', $this->getUri()->getQuery()); foreach ($queryParts as $queryPart) { $kvTuple = explode('=', $queryPart); $params[urldecode($kvTuple[0])] = - (array_key_exists(1, $kvTuple) ? urldecode($kvTuple[1]) : NULL); + (array_key_exists(1, $kvTuple) ? urldecode($kvTuple[1]) : null); } } if (!empty($this->paramsPost)) { diff --git a/library/Zend/Oauth/Config.php b/library/Zend/Oauth/Config.php index 6fd43a001..ad0aac50f 100644 --- a/library/Zend/Oauth/Config.php +++ b/library/Zend/Oauth/Config.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Config.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth */ @@ -31,7 +31,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface @@ -146,6 +146,13 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface * @var Zend_Oauth_Token */ protected $_token = null; + + /** + * Define the OAuth realm + * + * @var string + */ + protected $_realm = null; /** * Constructor; create a new object with an optional array|Zend_Config @@ -214,6 +221,9 @@ public function setOptions(array $options) case 'rsaPublicKey': $this->setRsaPublicKey($value); break; + case 'realm': + $this->setRealm($value); + break; } } if (isset($options['requestScheme'])) { @@ -260,7 +270,7 @@ public function setConsumerSecret($secret) /** * Get consumer secret * - * Returns RSA private key if set; otherwise, returns any previously set + * Returns RSA private key if set; otherwise, returns any previously set * consumer secret. * * @return string @@ -380,7 +390,7 @@ public function getVersion() */ public function setCallbackUrl($url) { - if (!Zend_Uri::check($url)) { + if (!Zend_Uri::check($url) && $url !== 'oob') { // require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' @@ -451,7 +461,7 @@ public function setRequestTokenUrl($url) /** * Get request token URL * - * If no request token URL has been set, but a site URL has, returns the + * If no request token URL has been set, but a site URL has, returns the * site URL with the string "/request_token" appended. * * @return string @@ -486,7 +496,7 @@ public function setAccessTokenUrl($url) /** * Get access token URL * - * If no access token URL has been set, but a site URL has, returns the + * If no access token URL has been set, but a site URL has, returns the * site URL with the string "/access_token" appended. * * @return string @@ -543,7 +553,7 @@ public function getUserAuthorizationUrl() /** * Get authorization URL * - * If no authorization URL has been set, but a site URL has, returns the + * If no authorization URL has been set, but a site URL has, returns the * site URL with the string "/authorize" appended. * * @return string @@ -567,9 +577,9 @@ public function setRequestMethod($method) { $method = strtoupper($method); if (!in_array($method, array( - Zend_Oauth::GET, - Zend_Oauth::POST, - Zend_Oauth::PUT, + Zend_Oauth::GET, + Zend_Oauth::POST, + Zend_Oauth::PUT, Zend_Oauth::DELETE, )) ) { @@ -655,4 +665,26 @@ public function getToken() { return $this->_token; } + + /** + * Set OAuth realm + * + * @param string $realm + * @return Zend_Oauth_Config + */ + public function setRealm($realm) + { + $this->_realm = $realm; + return $this; + } + + /** + * Get OAuth realm + * + * @return string + */ + public function getRealm() + { + return $this->_realm; + } } diff --git a/library/Zend/Oauth/Config/ConfigInterface.php b/library/Zend/Oauth/Config/ConfigInterface.php index 77f3d6039..85f483c2d 100644 --- a/library/Zend/Oauth/Config/ConfigInterface.php +++ b/library/Zend/Oauth/Config/ConfigInterface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConfigInterface.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: ConfigInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Oauth_Config_ConfigInterface @@ -72,4 +72,8 @@ public function getUserAuthorizationUrl(); public function setToken(Zend_Oauth_Token $token); public function getToken(); + + public function setRealm($realm); + + public function getRealm(); } diff --git a/library/Zend/Oauth/Consumer.php b/library/Zend/Oauth/Consumer.php index 8a9fb391a..67c949d66 100644 --- a/library/Zend/Oauth/Consumer.php +++ b/library/Zend/Oauth/Consumer.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Consumer.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Consumer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth */ @@ -43,7 +43,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Consumer extends Zend_Oauth @@ -182,9 +182,9 @@ public function redirect( * @throws Zend_Oauth_Exception on invalid authorization token, non-matching response authorization token, or unprovided authorization token */ public function getAccessToken( - $queryData, + $queryData, Zend_Oauth_Token_Request $token, - $httpMethod = null, + $httpMethod = null, Zend_Oauth_Http_AccessToken $request = null ) { $authorizedToken = new Zend_Oauth_Token_AuthorizedRequest($queryData); diff --git a/library/Zend/Oauth/Exception.php b/library/Zend/Oauth/Exception.php index a74a1d51c..787048e40 100644 --- a/library/Zend/Oauth/Exception.php +++ b/library/Zend/Oauth/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Exception extends Zend_Exception {} \ No newline at end of file diff --git a/library/Zend/Oauth/Http.php b/library/Zend/Oauth/Http.php index 6925d2930..7e7053456 100644 --- a/library/Zend/Oauth/Http.php +++ b/library/Zend/Oauth/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Http.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Http_Utility */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http @@ -80,7 +80,7 @@ class Zend_Oauth_Http * @return void */ public function __construct( - Zend_Oauth_Consumer $consumer, + Zend_Oauth_Consumer $consumer, array $parameters = null, Zend_Oauth_Http_Utility $utility = null ) { @@ -233,7 +233,7 @@ protected function _assessRequestAttempt(Zend_Http_Response $response = null) // require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Could not retrieve a valid Token response from Token URL:' - . ($response !== null + . ($response !== null ? PHP_EOL . $response->getBody() : ' No body - check for headers') ); diff --git a/library/Zend/Oauth/Http/AccessToken.php b/library/Zend/Oauth/Http/AccessToken.php index 4216f0737..38e436f20 100644 --- a/library/Zend/Oauth/Http/AccessToken.php +++ b/library/Zend/Oauth/Http/AccessToken.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccessToken.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: AccessToken.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Http */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_AccessToken extends Zend_Oauth_Http diff --git a/library/Zend/Oauth/Http/RequestToken.php b/library/Zend/Oauth/Http/RequestToken.php index aea0478b3..91b8628a8 100644 --- a/library/Zend/Oauth/Http/RequestToken.php +++ b/library/Zend/Oauth/Http/RequestToken.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RequestToken.php 23076 2010-10-10 21:37:20Z padraic $ + * @version $Id: RequestToken.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Http */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_RequestToken extends Zend_Oauth_Http diff --git a/library/Zend/Oauth/Http/UserAuthorization.php b/library/Zend/Oauth/Http/UserAuthorization.php index de4efb87a..388855498 100644 --- a/library/Zend/Oauth/Http/UserAuthorization.php +++ b/library/Zend/Oauth/Http/UserAuthorization.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UserAuthorization.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: UserAuthorization.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Http */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_UserAuthorization extends Zend_Oauth_Http diff --git a/library/Zend/Oauth/Http/Utility.php b/library/Zend/Oauth/Http/Utility.php index 2bea4b64c..899f84bd0 100644 --- a/library/Zend/Oauth/Http/Utility.php +++ b/library/Zend/Oauth/Http/Utility.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utility.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Utility.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Http_Utility @@ -43,7 +43,7 @@ class Zend_Oauth_Http_Utility * @return array */ public function assembleParams( - $url, + $url, Zend_Oauth_Config_ConfigInterface $config, array $serviceProviderParams = null ) { @@ -54,7 +54,7 @@ public function assembleParams( 'oauth_timestamp' => $this->generateTimestamp(), 'oauth_version' => $config->getVersion(), ); - + if ($config->getToken()->getToken() != null) { $params['oauth_token'] = $config->getToken()->getToken(); } @@ -96,8 +96,8 @@ public function toEncodedQueryString(array $params, $customParamsOnly = false) } $encodedParams = array(); foreach ($params as $key => $value) { - $encodedParams[] = self::urlEncode($key) - . '=' + $encodedParams[] = self::urlEncode($key) + . '=' . self::urlEncode($value); } return implode('&', $encodedParams); @@ -105,10 +105,10 @@ public function toEncodedQueryString(array $params, $customParamsOnly = false) /** * Cast to authorization header - * - * @param array $params - * @param null|string $realm - * @param bool $excludeCustomParams + * + * @param array $params + * @param null|string $realm + * @param bool $excludeCustomParams * @return void */ public function toAuthorizationHeader(array $params, $realm = null, $excludeCustomParams = true) @@ -123,7 +123,7 @@ public function toAuthorizationHeader(array $params, $realm = null, $excludeCust continue; } } - $headerValue[] = self::urlEncode($key) + $headerValue[] = self::urlEncode($key) . '="' . self::urlEncode($value) . '"'; } @@ -132,13 +132,13 @@ public function toAuthorizationHeader(array $params, $realm = null, $excludeCust /** * Sign request - * - * @param array $params - * @param string $signatureMethod - * @param string $consumerSecret - * @param null|string $tokenSecret - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param string $signatureMethod + * @param string $consumerSecret + * @param null|string $tokenSecret + * @param null|string $method + * @param null|string $url * @return string */ public function sign( @@ -161,8 +161,8 @@ public function sign( /** * Parse query string - * - * @param mixed $query + * + * @param mixed $query * @return array */ public function parseQueryString($query) @@ -184,7 +184,7 @@ public function parseQueryString($query) /** * Generate nonce - * + * * @return string */ public function generateNonce() @@ -194,7 +194,7 @@ public function generateNonce() /** * Generate timestamp - * + * * @return int */ public function generateTimestamp() @@ -204,8 +204,8 @@ public function generateTimestamp() /** * urlencode a value - * - * @param string $value + * + * @param string $value * @return string */ public static function urlEncode($value) diff --git a/library/Zend/Oauth/Signature/Hmac.php b/library/Zend/Oauth/Signature/Hmac.php index a49ef2a0e..286eb0657 100644 --- a/library/Zend/Oauth/Signature/Hmac.php +++ b/library/Zend/Oauth/Signature/Hmac.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hmac.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Hmac.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Signature_SignatureAbstract */ @@ -28,17 +28,17 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Signature_Hmac extends Zend_Oauth_Signature_SignatureAbstract { /** * Sign a request - * - * @param array $params - * @param mixed $method - * @param mixed $url + * + * @param array $params + * @param mixed $method + * @param mixed $url * @return string */ public function sign(array $params, $method = null, $url = null) diff --git a/library/Zend/Oauth/Signature/Plaintext.php b/library/Zend/Oauth/Signature/Plaintext.php index 3c88e94f8..2edbb0992 100644 --- a/library/Zend/Oauth/Signature/Plaintext.php +++ b/library/Zend/Oauth/Signature/Plaintext.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plaintext.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Plaintext.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Signature_SignatureAbstract */ @@ -25,17 +25,17 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Signature_Plaintext extends Zend_Oauth_Signature_SignatureAbstract { /** * Sign a request - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ public function sign(array $params, $method = null, $url = null) diff --git a/library/Zend/Oauth/Signature/Rsa.php b/library/Zend/Oauth/Signature/Rsa.php index 7039847df..f4b6607b8 100644 --- a/library/Zend/Oauth/Signature/Rsa.php +++ b/library/Zend/Oauth/Signature/Rsa.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Rsa.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Signature_SignatureAbstract */ @@ -28,20 +28,20 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Signature_Rsa extends Zend_Oauth_Signature_SignatureAbstract { /** * Sign a request - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ - public function sign(array $params, $method = null, $url = null) + public function sign(array $params, $method = null, $url = null) { $rsa = new Zend_Crypt_Rsa; $rsa->setHashAlgorithm($this->_hashAlgorithm); @@ -55,7 +55,7 @@ public function sign(array $params, $method = null, $url = null) /** * Assemble encryption key - * + * * @return string */ protected function _assembleKey() diff --git a/library/Zend/Oauth/Signature/SignatureAbstract.php b/library/Zend/Oauth/Signature/SignatureAbstract.php index ad09bfa72..5105f8442 100644 --- a/library/Zend/Oauth/Signature/SignatureAbstract.php +++ b/library/Zend/Oauth/Signature/SignatureAbstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SignatureAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: SignatureAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Http_Utility */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Oauth_Signature_SignatureAbstract @@ -59,10 +59,10 @@ abstract class Zend_Oauth_Signature_SignatureAbstract /** * Constructor - * - * @param string $consumerSecret - * @param null|string $tokenSecret - * @param null|string $hashAlgo + * + * @param string $consumerSecret + * @param null|string $tokenSecret + * @param null|string $hashAlgo * @return void */ public function __construct($consumerSecret, $tokenSecret = null, $hashAlgo = null) @@ -79,18 +79,18 @@ public function __construct($consumerSecret, $tokenSecret = null, $hashAlgo = nu /** * Sign a request - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ public abstract function sign(array $params, $method = null, $url = null); /** * Normalize the base signature URL - * - * @param string $url + * + * @param string $url * @return string */ public function normaliseBaseSignatureUrl($url) @@ -109,7 +109,7 @@ public function normaliseBaseSignatureUrl($url) /** * Assemble key from consumer and token secrets - * + * * @return string */ protected function _assembleKey() @@ -126,17 +126,17 @@ protected function _assembleKey() /** * Get base signature string - * - * @param array $params - * @param null|string $method - * @param null|string $url + * + * @param array $params + * @param null|string $method + * @param null|string $url * @return string */ protected function _getBaseSignatureString(array $params, $method = null, $url = null) { $encodedParams = array(); foreach ($params as $key => $value) { - $encodedParams[Zend_Oauth_Http_Utility::urlEncode($key)] = + $encodedParams[Zend_Oauth_Http_Utility::urlEncode($key)] = Zend_Oauth_Http_Utility::urlEncode($value); } $baseStrings = array(); @@ -160,8 +160,8 @@ protected function _getBaseSignatureString(array $params, $method = null, $url = /** * Transform an array to a byte value ordered query string - * - * @param array $params + * + * @param array $params * @return string */ protected function _toByteValueOrderedQueryString(array $params) diff --git a/library/Zend/Oauth/Token.php b/library/Zend/Oauth/Token.php index a9f925aa0..4bdce71bb 100644 --- a/library/Zend/Oauth/Token.php +++ b/library/Zend/Oauth/Token.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Token.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Http_Utility */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Oauth_Token @@ -40,14 +40,14 @@ abstract class Zend_Oauth_Token /** * Token parameters - * + * * @var array */ protected $_params = array(); /** * OAuth response object - * + * * @var Zend_Http_Response */ protected $_response = null; @@ -264,11 +264,11 @@ protected function _parseParameters(Zend_Http_Response $response) } return $params; } - + /** * Limit serialisation stored data to the parameters */ - public function __sleep() + public function __sleep() { return array('_params'); } @@ -276,7 +276,7 @@ public function __sleep() /** * After serialisation, re-instantiate a HTTP utility class for use */ - public function __wakeup() + public function __wakeup() { if ($this->_httpUtility === null) { $this->_httpUtility = new Zend_Oauth_Http_Utility; diff --git a/library/Zend/Oauth/Token/Access.php b/library/Zend/Oauth/Token/Access.php index 67e95489a..bc1376bdd 100644 --- a/library/Zend/Oauth/Token/Access.php +++ b/library/Zend/Oauth/Token/Access.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Access.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Access.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Token */ @@ -34,18 +34,18 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Token_Access extends Zend_Oauth_Token { /** * Cast to HTTP header - * - * @param string $url - * @param Zend_Oauth_Config_ConfigInterface $config - * @param null|array $customParams - * @param null|string $realm + * + * @param string $url + * @param Zend_Oauth_Config_ConfigInterface $config + * @param null|array $customParams + * @param null|string $realm * @return string */ public function toHeader( @@ -63,10 +63,10 @@ public function toHeader( /** * Cast to HTTP query string - * - * @param mixed $url - * @param Zend_Oauth_Config_ConfigInterface $config - * @param null|array $params + * + * @param mixed $url + * @param Zend_Oauth_Config_ConfigInterface $config + * @param null|array $params * @return string */ public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, array $params = null) @@ -83,11 +83,11 @@ public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, a /** * Get OAuth client - * - * @param array $oauthOptions - * @param null|string $uri - * @param null|array|Zend_Config $config - * @param bool $excludeCustomParamsFromHeader + * + * @param array $oauthOptions + * @param null|string $uri + * @param null|array|Zend_Config $config + * @param bool $excludeCustomParamsFromHeader * @return Zend_Oauth_Client */ public function getHttpClient(array $oauthOptions, $uri = null, $config = null, $excludeCustomParamsFromHeader = true) diff --git a/library/Zend/Oauth/Token/AuthorizedRequest.php b/library/Zend/Oauth/Token/AuthorizedRequest.php index 0cc311364..41a217a6a 100644 --- a/library/Zend/Oauth/Token/AuthorizedRequest.php +++ b/library/Zend/Oauth/Token/AuthorizedRequest.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AuthorizedRequest.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: AuthorizedRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Token */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Token_AuthorizedRequest extends Zend_Oauth_Token @@ -60,7 +60,7 @@ public function __construct(array $data = null, Zend_Oauth_Http_Utility $utility /** * Retrieve token data - * + * * @return array */ public function getData() @@ -70,7 +70,7 @@ public function getData() /** * Indicate if token is valid - * + * * @return bool */ public function isValid() @@ -85,7 +85,7 @@ public function isValid() /** * Parse string data into array - * + * * @return array */ protected function _parseData() diff --git a/library/Zend/Oauth/Token/Request.php b/library/Zend/Oauth/Token/Request.php index 5ff252c7a..ead9dd624 100644 --- a/library/Zend/Oauth/Token/Request.php +++ b/library/Zend/Oauth/Token/Request.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20217 2010-01-12 16:01:57Z matthew $ + * @version $Id: Request.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Oauth_Token */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Oauth - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Oauth_Token_Request extends Zend_Oauth_Token diff --git a/library/Zend/OpenId.php b/library/Zend/OpenId.php index 55aa2f966..79aa46b72 100644 --- a/library/Zend/OpenId.php +++ b/library/Zend/OpenId.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenId.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: OpenId.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId @@ -285,7 +285,7 @@ static public function normalizeUrl(&$id) $port = $reg[4]; $path = $reg[5]; $query = $reg[6]; - $fragment = $reg[7]; /* strip it */ + $fragment = $reg[7]; /* strip it */ /* ZF-4358 Fragment retained under OpenID 2.0 */ if (empty($scheme) || empty($host)) { return false; @@ -350,7 +350,8 @@ static public function normalizeUrl(&$id) . $host . (empty($port) ? '' : (':' . $port)) . $path - . $query; + . $query + . $fragment; return true; } diff --git a/library/Zend/OpenId/Consumer.php b/library/Zend/OpenId/Consumer.php index ab94200d7..5d6a81c41 100644 --- a/library/Zend/OpenId/Consumer.php +++ b/library/Zend/OpenId/Consumer.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Consumer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Consumer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Consumer diff --git a/library/Zend/OpenId/Consumer/Storage.php b/library/Zend/OpenId/Consumer/Storage.php index 91b8bb010..6a6e6b913 100644 --- a/library/Zend/OpenId/Consumer/Storage.php +++ b/library/Zend/OpenId/Consumer/Storage.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Consumer_Storage diff --git a/library/Zend/OpenId/Consumer/Storage/File.php b/library/Zend/OpenId/Consumer/Storage/File.php index 2ed751bca..0e793a6e9 100644 --- a/library/Zend/OpenId/Consumer/Storage/File.php +++ b/library/Zend/OpenId/Consumer/Storage/File.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 23161 2010-10-19 16:08:36Z matthew $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Consumer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage diff --git a/library/Zend/OpenId/Exception.php b/library/Zend/OpenId/Exception.php index e2c2d4729..b37ec955f 100644 --- a/library/Zend/OpenId/Exception.php +++ b/library/Zend/OpenId/Exception.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Exception extends Zend_Exception diff --git a/library/Zend/OpenId/Extension.php b/library/Zend/OpenId/Extension.php index 38420eb28..62363a6c0 100644 --- a/library/Zend/OpenId/Extension.php +++ b/library/Zend/OpenId/Extension.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Extension diff --git a/library/Zend/OpenId/Extension/Sreg.php b/library/Zend/OpenId/Extension/Sreg.php index c9c4e7551..ea477beff 100644 --- a/library/Zend/OpenId/Extension/Sreg.php +++ b/library/Zend/OpenId/Extension/Sreg.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sreg.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sreg.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_OpenId - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Extension_Sreg extends Zend_OpenId_Extension diff --git a/library/Zend/OpenId/Provider.php b/library/Zend/OpenId/Provider.php index 61423f65a..67db0bf22 100644 --- a/library/Zend/OpenId/Provider.php +++ b/library/Zend/OpenId/Provider.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Provider.php 23088 2010-10-11 19:53:24Z padraic $ + * @version $Id: Provider.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Provider @@ -778,7 +778,7 @@ protected function _checkAuthentication($version, $params) } return $ret; } - + /** * Securely compare two strings for equality while avoided C level memcmp() * optimisations capable of leaking timing information useful to an attacker diff --git a/library/Zend/OpenId/Provider/Storage.php b/library/Zend/OpenId/Provider/Storage.php index ece488916..decd98a13 100644 --- a/library/Zend/OpenId/Provider/Storage.php +++ b/library/Zend/OpenId/Provider/Storage.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Provider_Storage diff --git a/library/Zend/OpenId/Provider/Storage/File.php b/library/Zend/OpenId/Provider/Storage/File.php index f64fe8302..ce0fe6e05 100644 --- a/library/Zend/OpenId/Provider/Storage/File.php +++ b/library/Zend/OpenId/Provider/Storage/File.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Provider_Storage_File extends Zend_OpenId_Provider_Storage @@ -257,7 +257,7 @@ public function hasUser($id) fclose($lock); return false; } - try { + try { $f = @fopen($name, 'r'); if ($f === false) { fclose($lock); diff --git a/library/Zend/OpenId/Provider/User.php b/library/Zend/OpenId/Provider/User.php index 87cefab31..b1df0dc7b 100644 --- a/library/Zend/OpenId/Provider/User.php +++ b/library/Zend/OpenId/Provider/User.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: User.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: User.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_OpenId_Provider_User diff --git a/library/Zend/OpenId/Provider/User/Session.php b/library/Zend/OpenId/Provider/User/Session.php index 476729184..f98de6e0a 100644 --- a/library/Zend/OpenId/Provider/User/Session.php +++ b/library/Zend/OpenId/Provider/User/Session.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Session.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_OpenId * @subpackage Zend_OpenId_Provider - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_OpenId_Provider_User_Session extends Zend_OpenId_Provider_User diff --git a/library/Zend/Paginator.php b/library/Zend/Paginator.php index ba78f913d..75c8684b8 100644 --- a/library/Zend/Paginator.php +++ b/library/Zend/Paginator.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Paginator.php 22865 2010-08-21 12:28:09Z ramon $ + * @version $Id: Paginator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator implements Countable, IteratorAggregate diff --git a/library/Zend/Paginator/Adapter/Array.php b/library/Zend/Paginator/Adapter/Array.php index cf5b8dce0..a357d776a 100644 --- a/library/Zend/Paginator/Adapter/Array.php +++ b/library/Zend/Paginator/Adapter/Array.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Array.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_Array implements Zend_Paginator_Adapter_Interface diff --git a/library/Zend/Paginator/Adapter/DbSelect.php b/library/Zend/Paginator/Adapter/DbSelect.php index 538a505f0..0d4f28248 100644 --- a/library/Zend/Paginator/Adapter/DbSelect.php +++ b/library/Zend/Paginator/Adapter/DbSelect.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbSelect.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_DbSelect implements Zend_Paginator_Adapter_Interface @@ -100,7 +100,9 @@ public function setRowCount($rowCount) if ($rowCount instanceof Zend_Db_Select) { $columns = $rowCount->getPart(Zend_Db_Select::COLUMNS); - $countColumnPart = $columns[0][1]; + $countColumnPart = empty($columns[0][2]) + ? $columns[0][1] + : $columns[0][2]; if ($countColumnPart instanceof Zend_Db_Expr) { $countColumnPart = $countColumnPart->__toString(); @@ -201,7 +203,10 @@ public function getCountSelect() if (!empty($unionParts)) { $expression = new Zend_Db_Expr($countPart . $countColumn); - $rowCount = $db->select()->from($rowCount, $expression); + $rowCount = $db + ->select() + ->bind($rowCount->getBind()) + ->from($rowCount, $expression); } else { $columnParts = $rowCount->getPart(Zend_Db_Select::COLUMNS); $groupParts = $rowCount->getPart(Zend_Db_Select::GROUP); @@ -213,8 +218,13 @@ public function getCountSelect() * than one group, or if the query has a HAVING clause, then take * the original query and use it as a subquery os the COUNT query. */ - if (($isDistinct && count($columnParts) > 1) || count($groupParts) > 1 || !empty($havingParts)) { - $rowCount = $db->select()->from($this->_select); + if (($isDistinct && ((count($columnParts) == 1 && $columnParts[0][1] == Zend_Db_Select::SQL_WILDCARD) + || count($columnParts) > 1)) || count($groupParts) > 1 || !empty($havingParts)) { + $rowCount->reset(Zend_Db_Select::ORDER); + $rowCount = $db + ->select() + ->bind($rowCount->getBind()) + ->from($rowCount); } else if ($isDistinct) { $part = $columnParts[0]; @@ -227,8 +237,7 @@ public function getCountSelect() $groupPart = $column; } - } else if (!empty($groupParts) && $groupParts[0] !== Zend_Db_Select::SQL_WILDCARD && - !($groupParts[0] instanceof Zend_Db_Expr)) { + } else if (!empty($groupParts)) { $groupPart = $db->quoteIdentifier($groupParts[0], true); } diff --git a/library/Zend/Paginator/Adapter/DbTableSelect.php b/library/Zend/Paginator/Adapter/DbTableSelect.php index a5a22a815..86cb3ee54 100644 --- a/library/Zend/Paginator/Adapter/DbTableSelect.php +++ b/library/Zend/Paginator/Adapter/DbTableSelect.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTableSelect.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_DbTableSelect extends Zend_Paginator_Adapter_DbSelect diff --git a/library/Zend/Paginator/Adapter/Interface.php b/library/Zend/Paginator/Adapter/Interface.php index f2f6e1b5e..3ce0f5637 100644 --- a/library/Zend/Paginator/Adapter/Interface.php +++ b/library/Zend/Paginator/Adapter/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 23314 2010-11-08 19:48:10Z matthew $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Paginator_Adapter_Interface extends Countable diff --git a/library/Zend/Paginator/Adapter/Iterator.php b/library/Zend/Paginator/Adapter/Iterator.php index ecb2eae6f..93b4b6ac6 100644 --- a/library/Zend/Paginator/Adapter/Iterator.php +++ b/library/Zend/Paginator/Adapter/Iterator.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Iterator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_Iterator implements Zend_Paginator_Adapter_Interface diff --git a/library/Zend/Paginator/Adapter/Null.php b/library/Zend/Paginator/Adapter/Null.php index cb647c58e..372dbb5f0 100644 --- a/library/Zend/Paginator/Adapter/Null.php +++ b/library/Zend/Paginator/Adapter/Null.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 21150 2010-02-23 16:27:36Z matthew $ + * @version $Id: Null.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Adapter_Null implements Zend_Paginator_Adapter_Interface diff --git a/library/Zend/Paginator/AdapterAggregate.php b/library/Zend/Paginator/AdapterAggregate.php index 2430f2232..ac179f66c 100644 --- a/library/Zend/Paginator/AdapterAggregate.php +++ b/library/Zend/Paginator/AdapterAggregate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Paginator * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAggregate.php 22542 2010-07-09 19:41:46Z ramon $ + * @version $Id: AdapterAggregate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Paginator * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Paginator_AdapterAggregate diff --git a/library/Zend/Paginator/Exception.php b/library/Zend/Paginator/Exception.php index e244e8b05..74957c3dc 100644 --- a/library/Zend/Paginator/Exception.php +++ b/library/Zend/Paginator/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_Exception extends Zend_Exception diff --git a/library/Zend/Paginator/ScrollingStyle/All.php b/library/Zend/Paginator/ScrollingStyle/All.php index 672e84d42..f525307b0 100644 --- a/library/Zend/Paginator/ScrollingStyle/All.php +++ b/library/Zend/Paginator/ScrollingStyle/All.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: All.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: All.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_All implements Zend_Paginator_ScrollingStyle_Interface diff --git a/library/Zend/Paginator/ScrollingStyle/Elastic.php b/library/Zend/Paginator/ScrollingStyle/Elastic.php index 5fb62e5b8..9c0368547 100644 --- a/library/Zend/Paginator/ScrollingStyle/Elastic.php +++ b/library/Zend/Paginator/ScrollingStyle/Elastic.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Elastic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Elastic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @link http://www.google.com/search?q=Zend+Framework * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_Elastic extends Zend_Paginator_ScrollingStyle_Sliding diff --git a/library/Zend/Paginator/ScrollingStyle/Interface.php b/library/Zend/Paginator/ScrollingStyle/Interface.php index abdfbc486..5f5f738a7 100644 --- a/library/Zend/Paginator/ScrollingStyle/Interface.php +++ b/library/Zend/Paginator/ScrollingStyle/Interface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Paginator_ScrollingStyle_Interface diff --git a/library/Zend/Paginator/ScrollingStyle/Jumping.php b/library/Zend/Paginator/ScrollingStyle/Jumping.php index 7d5cd7f8f..ef6f098a3 100644 --- a/library/Zend/Paginator/ScrollingStyle/Jumping.php +++ b/library/Zend/Paginator/ScrollingStyle/Jumping.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Jumping.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Jumping.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_Jumping implements Zend_Paginator_ScrollingStyle_Interface diff --git a/library/Zend/Paginator/ScrollingStyle/Sliding.php b/library/Zend/Paginator/ScrollingStyle/Sliding.php index 62d6ad6fb..44b2f25da 100644 --- a/library/Zend/Paginator/ScrollingStyle/Sliding.php +++ b/library/Zend/Paginator/ScrollingStyle/Sliding.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sliding.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sliding.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @link http://search.yahoo.com/search?p=Zend+Framework * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_ScrollingStyle_Sliding implements Zend_Paginator_ScrollingStyle_Interface diff --git a/library/Zend/Paginator/SerializableLimitIterator.php b/library/Zend/Paginator/SerializableLimitIterator.php index 22b3fa2d1..064fc7557 100644 --- a/library/Zend/Paginator/SerializableLimitIterator.php +++ b/library/Zend/Paginator/SerializableLimitIterator.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SerializableLimitIterator.php 23189 2010-10-20 18:55:32Z mabe $ + * @version $Id: SerializableLimitIterator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Paginator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Paginator_SerializableLimitIterator extends LimitIterator implements Serializable, ArrayAccess diff --git a/library/Zend/Pdf.php b/library/Zend/Pdf.php index 5c968aee3..a14783fb8 100644 --- a/library/Zend/Pdf.php +++ b/library/Zend/Pdf.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdf.php 22908 2010-08-25 20:52:47Z alexander $ + * @version $Id: Pdf.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -78,7 +78,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf @@ -209,6 +209,14 @@ class Zend_Pdf */ protected static $_inheritableAttributes = array('Resources', 'MediaBox', 'CropBox', 'Rotate'); + /** + * True if the object is a newly created PDF document (affects save() method behavior) + * False otherwise + * + * @var boolean + */ + protected $_isNewDocument = true; + /** * Request used memory manager * @@ -262,7 +270,8 @@ public static function load($source = null, $revision = null) /** * Render PDF document and save it. * - * If $updateOnly is true, then it only appends new section to the end of file. + * If $updateOnly is true and it's not a new document, then it only + * appends new section to the end of file. * * @param string $filename * @param boolean $updateOnly @@ -348,6 +357,8 @@ public function __construct($source = null, $revision = null, $load = false) $this->_originalProperties = $this->properties; } + + $this->_isNewDocument = false; } else { $this->_pdfHeaderVersion = Zend_Pdf::PDF_VERSION; @@ -1174,7 +1185,8 @@ public function extractFont($fontName) /** * Render the completed PDF to a string. - * If $newSegmentOnly is true, then only appended part of PDF is returned. + * If $newSegmentOnly is true and it's not a new document, + * then only appended part of PDF is returned. * * @param boolean $newSegmentOnly * @param resource $outputStream @@ -1183,6 +1195,12 @@ public function extractFont($fontName) */ public function render($newSegmentOnly = false, $outputStream = null) { + if ($this->_isNewDocument) { + // Drop full document first time even $newSegmentOnly is set to true + $newSegmentOnly = false; + $this->_isNewDocument = false; + } + // Save document properties if necessary if ($this->properties != $this->_originalProperties) { $docInfo = $this->_objFactory->newObject(new Zend_Pdf_Element_Dictionary()); diff --git a/library/Zend/Pdf/Action.php b/library/Zend/Pdf/Action.php index f445f51a8..1e524e32f 100644 --- a/library/Zend/Pdf/Action.php +++ b/library/Zend/Pdf/Action.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 22437 2010-06-15 16:13:46Z alexander $ + * @version $Id: Action.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Action extends Zend_Pdf_Target implements RecursiveIterator, Countable diff --git a/library/Zend/Pdf/Action/GoTo.php b/library/Zend/Pdf/Action/GoTo.php index 36db5cf4f..5cdf666bb 100644 --- a/library/Zend/Pdf/Action/GoTo.php +++ b/library/Zend/Pdf/Action/GoTo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoTo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoTo.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoTo extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/GoTo3DView.php b/library/Zend/Pdf/Action/GoTo3DView.php index ae3f56a63..96acd3595 100644 --- a/library/Zend/Pdf/Action/GoTo3DView.php +++ b/library/Zend/Pdf/Action/GoTo3DView.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoTo3DView.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoTo3DView.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoTo3DView extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/GoToE.php b/library/Zend/Pdf/Action/GoToE.php index 7912cc9d4..3594f632f 100644 --- a/library/Zend/Pdf/Action/GoToE.php +++ b/library/Zend/Pdf/Action/GoToE.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoToE.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoToE.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoToE extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/GoToR.php b/library/Zend/Pdf/Action/GoToR.php index 8bde64c7b..ccc28cc3e 100644 --- a/library/Zend/Pdf/Action/GoToR.php +++ b/library/Zend/Pdf/Action/GoToR.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GoToR.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GoToR.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_GoToR extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Hide.php b/library/Zend/Pdf/Action/Hide.php index aa5166bff..1472df083 100644 --- a/library/Zend/Pdf/Action/Hide.php +++ b/library/Zend/Pdf/Action/Hide.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hide.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Hide.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Hide extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/ImportData.php b/library/Zend/Pdf/Action/ImportData.php index 4f5459e2b..a5f0d728b 100644 --- a/library/Zend/Pdf/Action/ImportData.php +++ b/library/Zend/Pdf/Action/ImportData.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImportData.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImportData.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_ImportData extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/JavaScript.php b/library/Zend/Pdf/Action/JavaScript.php index 6db361dd5..eb5ab5d0e 100644 --- a/library/Zend/Pdf/Action/JavaScript.php +++ b/library/Zend/Pdf/Action/JavaScript.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JavaScript.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JavaScript.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_JavaScript extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Launch.php b/library/Zend/Pdf/Action/Launch.php index ce0438172..ec8225ac8 100644 --- a/library/Zend/Pdf/Action/Launch.php +++ b/library/Zend/Pdf/Action/Launch.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Launch.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Launch.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Launch extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Movie.php b/library/Zend/Pdf/Action/Movie.php index e39be3e57..3eb52121e 100644 --- a/library/Zend/Pdf/Action/Movie.php +++ b/library/Zend/Pdf/Action/Movie.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Movie.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Movie.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Movie extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Named.php b/library/Zend/Pdf/Action/Named.php index f957a2534..d8aef45ed 100644 --- a/library/Zend/Pdf/Action/Named.php +++ b/library/Zend/Pdf/Action/Named.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Named.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Named.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Named extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Rendition.php b/library/Zend/Pdf/Action/Rendition.php index 342fbba32..98971c0f7 100644 --- a/library/Zend/Pdf/Action/Rendition.php +++ b/library/Zend/Pdf/Action/Rendition.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rendition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rendition.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Rendition extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/ResetForm.php b/library/Zend/Pdf/Action/ResetForm.php index 65e27ebcb..571d61479 100644 --- a/library/Zend/Pdf/Action/ResetForm.php +++ b/library/Zend/Pdf/Action/ResetForm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResetForm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResetForm.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_ResetForm extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/SetOCGState.php b/library/Zend/Pdf/Action/SetOCGState.php index 69075d353..347844e95 100644 --- a/library/Zend/Pdf/Action/SetOCGState.php +++ b/library/Zend/Pdf/Action/SetOCGState.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SetOCGState.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SetOCGState.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_SetOCGState extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Sound.php b/library/Zend/Pdf/Action/Sound.php index 67f3e8875..2e24c2b26 100644 --- a/library/Zend/Pdf/Action/Sound.php +++ b/library/Zend/Pdf/Action/Sound.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sound.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sound.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Sound extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/SubmitForm.php b/library/Zend/Pdf/Action/SubmitForm.php index 27d5a88da..6624e8eae 100644 --- a/library/Zend/Pdf/Action/SubmitForm.php +++ b/library/Zend/Pdf/Action/SubmitForm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubmitForm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SubmitForm.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_SubmitForm extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Thread.php b/library/Zend/Pdf/Action/Thread.php index 5c395a272..dd07fde24 100644 --- a/library/Zend/Pdf/Action/Thread.php +++ b/library/Zend/Pdf/Action/Thread.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Thread.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Thread.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Thread extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Trans.php b/library/Zend/Pdf/Action/Trans.php index d41a2d605..1f1870457 100644 --- a/library/Zend/Pdf/Action/Trans.php +++ b/library/Zend/Pdf/Action/Trans.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Trans.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Trans.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Trans extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/URI.php b/library/Zend/Pdf/Action/URI.php index 2d647be2c..6ff0437d3 100644 --- a/library/Zend/Pdf/Action/URI.php +++ b/library/Zend/Pdf/Action/URI.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: URI.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: URI.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -38,7 +38,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_URI extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Action/Unknown.php b/library/Zend/Pdf/Action/Unknown.php index 6444bd256..24952bd94 100644 --- a/library/Zend/Pdf/Action/Unknown.php +++ b/library/Zend/Pdf/Action/Unknown.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Unknown.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Unknown.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Action */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Action_Unknown extends Zend_Pdf_Action diff --git a/library/Zend/Pdf/Annotation.php b/library/Zend/Pdf/Annotation.php index 981c7c487..fb6238613 100644 --- a/library/Zend/Pdf/Annotation.php +++ b/library/Zend/Pdf/Annotation.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Annotation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Annotation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -32,7 +32,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Annotation @@ -220,7 +220,7 @@ public function __construct(Zend_Pdf_Element $annotationDictionary) * Load Annotation object from a specified resource * * @internal - * @param $destinationArray + * @param Zend_Pdf_Element $resource * @return Zend_Pdf_Annotation */ public static function load(Zend_Pdf_Element $resource) diff --git a/library/Zend/Pdf/Annotation/FileAttachment.php b/library/Zend/Pdf/Annotation/FileAttachment.php index c33c89740..ca02bf939 100644 --- a/library/Zend/Pdf/Annotation/FileAttachment.php +++ b/library/Zend/Pdf/Annotation/FileAttachment.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileAttachment.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileAttachment.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -38,7 +38,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_FileAttachment extends Zend_Pdf_Annotation diff --git a/library/Zend/Pdf/Annotation/Link.php b/library/Zend/Pdf/Annotation/Link.php index c4b435fda..936d33be0 100644 --- a/library/Zend/Pdf/Annotation/Link.php +++ b/library/Zend/Pdf/Annotation/Link.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -40,7 +40,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_Link extends Zend_Pdf_Annotation diff --git a/library/Zend/Pdf/Annotation/Markup.php b/library/Zend/Pdf/Annotation/Markup.php index 5d397c249..5d9c28eb4 100644 --- a/library/Zend/Pdf/Annotation/Markup.php +++ b/library/Zend/Pdf/Annotation/Markup.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Markup.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Markup.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -37,7 +37,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_Markup extends Zend_Pdf_Annotation diff --git a/library/Zend/Pdf/Annotation/Text.php b/library/Zend/Pdf/Annotation/Text.php index 5fa47db89..eed542deb 100644 --- a/library/Zend/Pdf/Annotation/Text.php +++ b/library/Zend/Pdf/Annotation/Text.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -37,7 +37,7 @@ * * @package Zend_Pdf * @subpackage Annotation - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Annotation_Text extends Zend_Pdf_Annotation diff --git a/library/Zend/Pdf/Canvas.php b/library/Zend/Pdf/Canvas.php index 3cc487a53..9acb3a5b1 100644 --- a/library/Zend/Pdf/Canvas.php +++ b/library/Zend/Pdf/Canvas.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -26,7 +26,7 @@ * page object at specified place. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Canvas extends Zend_Pdf_Canvas_Abstract diff --git a/library/Zend/Pdf/Canvas/Abstract.php b/library/Zend/Pdf/Canvas/Abstract.php index 59322610b..ec04fcb8d 100644 --- a/library/Zend/Pdf/Canvas/Abstract.php +++ b/library/Zend/Pdf/Canvas/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -31,6 +31,9 @@ // require_once 'Zend/Pdf/Element/Null.php'; // require_once 'Zend/Pdf/Element/Numeric.php'; // require_once 'Zend/Pdf/Element/String.php'; +// require_once 'Zend/Pdf/Resource/GraphicsState.php'; +// require_once 'Zend/Pdf/Resource/Font.php'; +// require_once 'Zend/Pdf/Resource/Image.php'; /** @@ -38,7 +41,7 @@ * page object at specified place. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Canvas_Abstract implements Zend_Pdf_Canvas_Interface diff --git a/library/Zend/Pdf/Canvas/Interface.php b/library/Zend/Pdf/Canvas/Interface.php index c84341556..88b20f49c 100644 --- a/library/Zend/Pdf/Canvas/Interface.php +++ b/library/Zend/Pdf/Canvas/Interface.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Style.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -25,7 +25,7 @@ * page object at specified place. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Pdf_Canvas_Interface diff --git a/library/Zend/Pdf/Cmap.php b/library/Zend/Pdf/Cmap.php index 3376cae38..10de02562 100644 --- a/library/Zend/Pdf/Cmap.php +++ b/library/Zend/Pdf/Cmap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cmap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cmap.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -47,7 +47,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Cmap diff --git a/library/Zend/Pdf/Cmap/ByteEncoding.php b/library/Zend/Pdf/Cmap/ByteEncoding.php index 1bfc9599a..c9b795be1 100644 --- a/library/Zend/Pdf/Cmap/ByteEncoding.php +++ b/library/Zend/Pdf/Cmap/ByteEncoding.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ByteEncoding.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ByteEncoding.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Cmap */ @@ -36,7 +36,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_ByteEncoding extends Zend_Pdf_Cmap diff --git a/library/Zend/Pdf/Cmap/ByteEncoding/Static.php b/library/Zend/Pdf/Cmap/ByteEncoding/Static.php index 905b6270d..e8bbe2160 100644 --- a/library/Zend/Pdf/Cmap/ByteEncoding/Static.php +++ b/library/Zend/Pdf/Cmap/ByteEncoding/Static.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Static.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Static.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Cmap_ByteEncoding */ @@ -32,7 +32,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_ByteEncoding_Static extends Zend_Pdf_Cmap_ByteEncoding diff --git a/library/Zend/Pdf/Cmap/SegmentToDelta.php b/library/Zend/Pdf/Cmap/SegmentToDelta.php index 09eabce18..336a765e9 100644 --- a/library/Zend/Pdf/Cmap/SegmentToDelta.php +++ b/library/Zend/Pdf/Cmap/SegmentToDelta.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentToDelta.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SegmentToDelta.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Cmap */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_SegmentToDelta extends Zend_Pdf_Cmap diff --git a/library/Zend/Pdf/Cmap/TrimmedTable.php b/library/Zend/Pdf/Cmap/TrimmedTable.php index 0f99e40c9..8bac2dd35 100644 --- a/library/Zend/Pdf/Cmap/TrimmedTable.php +++ b/library/Zend/Pdf/Cmap/TrimmedTable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrimmedTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrimmedTable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Cmap */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Cmap_TrimmedTable extends Zend_Pdf_Cmap diff --git a/library/Zend/Pdf/Color.php b/library/Zend/Pdf/Color.php index 652fca88e..bf13fa991 100644 --- a/library/Zend/Pdf/Color.php +++ b/library/Zend/Pdf/Color.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Color.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Color.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * others don't do it. That is defined in a subclasses. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Color diff --git a/library/Zend/Pdf/Color/Cmyk.php b/library/Zend/Pdf/Color/Cmyk.php index c67954e55..4edd0a041 100644 --- a/library/Zend/Pdf/Color/Cmyk.php +++ b/library/Zend/Pdf/Color/Cmyk.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cmyk.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cmyk.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_Cmyk extends Zend_Pdf_Color diff --git a/library/Zend/Pdf/Color/GrayScale.php b/library/Zend/Pdf/Color/GrayScale.php index a0705bd32..de71d9e7d 100644 --- a/library/Zend/Pdf/Color/GrayScale.php +++ b/library/Zend/Pdf/Color/GrayScale.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GrayScale.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GrayScale.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_GrayScale extends Zend_Pdf_Color diff --git a/library/Zend/Pdf/Color/Html.php b/library/Zend/Pdf/Color/Html.php index 7a6a85d29..c999e6271 100644 --- a/library/Zend/Pdf/Color/Html.php +++ b/library/Zend/Pdf/Color/Html.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Html.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Html.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Color */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_Html extends Zend_Pdf_Color diff --git a/library/Zend/Pdf/Color/Rgb.php b/library/Zend/Pdf/Color/Rgb.php index dc5df2502..03ad838d5 100644 --- a/library/Zend/Pdf/Color/Rgb.php +++ b/library/Zend/Pdf/Color/Rgb.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rgb.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Rgb.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Color_Rgb extends Zend_Pdf_Color diff --git a/library/Zend/Pdf/Destination.php b/library/Zend/Pdf/Destination.php index 29e7a1e93..2d205d05f 100644 --- a/library/Zend/Pdf/Destination.php +++ b/library/Zend/Pdf/Destination.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Destination.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Destination.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Destination extends Zend_Pdf_Target @@ -43,7 +43,7 @@ abstract class Zend_Pdf_Destination extends Zend_Pdf_Target * Load Destination object from a specified resource * * @internal - * @param $destinationArray + * @param Zend_Pdf_Element $resource * @return Zend_Pdf_Destination */ public static function load(Zend_Pdf_Element $resource) diff --git a/library/Zend/Pdf/Destination/Explicit.php b/library/Zend/Pdf/Destination/Explicit.php index 364ee0bac..4a2fe1b2d 100644 --- a/library/Zend/Pdf/Destination/Explicit.php +++ b/library/Zend/Pdf/Destination/Explicit.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Explicit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Explicit.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Destination_Explicit extends Zend_Pdf_Destination diff --git a/library/Zend/Pdf/Destination/Fit.php b/library/Zend/Pdf/Destination/Fit.php index 1b3172bbe..48243583a 100644 --- a/library/Zend/Pdf/Destination/Fit.php +++ b/library/Zend/Pdf/Destination/Fit.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fit.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Fit extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/FitBoundingBox.php b/library/Zend/Pdf/Destination/FitBoundingBox.php index 16f343cfc..b3d102453 100644 --- a/library/Zend/Pdf/Destination/FitBoundingBox.php +++ b/library/Zend/Pdf/Destination/FitBoundingBox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitBoundingBox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitBoundingBox.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitBoundingBox extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php b/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php index 781a8c4ad..494bcae7b 100644 --- a/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php +++ b/library/Zend/Pdf/Destination/FitBoundingBoxHorizontally.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitBoundingBoxHorizontally.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitBoundingBoxHorizontally.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -42,7 +42,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitBoundingBoxHorizontally extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php b/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php index accb02ab9..a16a0c52f 100644 --- a/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php +++ b/library/Zend/Pdf/Destination/FitBoundingBoxVertically.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitBoundingBoxVertically.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitBoundingBoxVertically.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -41,7 +41,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitBoundingBoxVertically extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/FitHorizontally.php b/library/Zend/Pdf/Destination/FitHorizontally.php index 1302e6323..4b1e2e053 100644 --- a/library/Zend/Pdf/Destination/FitHorizontally.php +++ b/library/Zend/Pdf/Destination/FitHorizontally.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitHorizontally.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitHorizontally.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -41,7 +41,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitHorizontally extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/FitRectangle.php b/library/Zend/Pdf/Destination/FitRectangle.php index 6d2acf42d..183846f52 100644 --- a/library/Zend/Pdf/Destination/FitRectangle.php +++ b/library/Zend/Pdf/Destination/FitRectangle.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitRectangle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitRectangle.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitRectangle extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/FitVertically.php b/library/Zend/Pdf/Destination/FitVertically.php index 763638bd7..e395133d5 100644 --- a/library/Zend/Pdf/Destination/FitVertically.php +++ b/library/Zend/Pdf/Destination/FitVertically.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FitVertically.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FitVertically.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -41,7 +41,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_FitVertically extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/Named.php b/library/Zend/Pdf/Destination/Named.php index be757c709..0397b5a21 100644 --- a/library/Zend/Pdf/Destination/Named.php +++ b/library/Zend/Pdf/Destination/Named.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Named.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Named.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -39,7 +39,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Named extends Zend_Pdf_Destination @@ -54,7 +54,7 @@ class Zend_Pdf_Destination_Named extends Zend_Pdf_Destination /** * Named destination object constructor * - * @param $resource + * @param Zend_Pdf_Element $resource * @throws Zend_Pdf_Exception */ public function __construct(Zend_Pdf_Element $resource) diff --git a/library/Zend/Pdf/Destination/Unknown.php b/library/Zend/Pdf/Destination/Unknown.php index dafb46a5b..2b2c11a16 100644 --- a/library/Zend/Pdf/Destination/Unknown.php +++ b/library/Zend/Pdf/Destination/Unknown.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Unknown.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Unknown.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Destination_Explicit */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Unknown extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Destination/Zoom.php b/library/Zend/Pdf/Destination/Zoom.php index ab9e82522..29aebb8eb 100644 --- a/library/Zend/Pdf/Destination/Zoom.php +++ b/library/Zend/Pdf/Destination/Zoom.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Zoom.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Zoom.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Destination - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Destination_Zoom extends Zend_Pdf_Destination_Explicit diff --git a/library/Zend/Pdf/Element.php b/library/Zend/Pdf/Element.php index 11d5b0ffc..c596e2f9e 100644 --- a/library/Zend/Pdf/Element.php +++ b/library/Zend/Pdf/Element.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Element.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Element.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -24,7 +24,7 @@ * PDF file element implementation * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Array.php b/library/Zend/Pdf/Element/Array.php index 6f4704ba5..3d9ba841f 100644 --- a/library/Zend/Pdf/Element/Array.php +++ b/library/Zend/Pdf/Element/Array.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Array.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Array extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Boolean.php b/library/Zend/Pdf/Element/Boolean.php index 1ad533259..94576c97b 100644 --- a/library/Zend/Pdf/Element/Boolean.php +++ b/library/Zend/Pdf/Element/Boolean.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Boolean extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Dictionary.php b/library/Zend/Pdf/Element/Dictionary.php index f3dff983c..3eccf728c 100644 --- a/library/Zend/Pdf/Element/Dictionary.php +++ b/library/Zend/Pdf/Element/Dictionary.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dictionary.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Dictionary.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Dictionary extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Name.php b/library/Zend/Pdf/Element/Name.php index c22ebefd8..51c8d9fbe 100644 --- a/library/Zend/Pdf/Element/Name.php +++ b/library/Zend/Pdf/Element/Name.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Name.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Name.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Name extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Null.php b/library/Zend/Pdf/Element/Null.php index 234c2d5db..af17c0b35 100644 --- a/library/Zend/Pdf/Element/Null.php +++ b/library/Zend/Pdf/Element/Null.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Null extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Numeric.php b/library/Zend/Pdf/Element/Numeric.php index e1a9fe35d..8eff474bc 100644 --- a/library/Zend/Pdf/Element/Numeric.php +++ b/library/Zend/Pdf/Element/Numeric.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Numeric.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Numeric.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Numeric extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Object.php b/library/Zend/Pdf/Element/Object.php index 93c85daa7..5dd7214a0 100644 --- a/library/Zend/Pdf/Element/Object.php +++ b/library/Zend/Pdf/Element/Object.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Object.php 22844 2010-08-16 15:38:53Z alexander $ + * @version $Id: Object.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Object extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Object/Stream.php b/library/Zend/Pdf/Element/Object/Stream.php index 7f2c5c2c4..7932bbb22 100644 --- a/library/Zend/Pdf/Element/Object/Stream.php +++ b/library/Zend/Pdf/Element/Object/Stream.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 22909 2010-08-27 19:57:48Z alexander $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Object_Stream extends Zend_Pdf_Element_Object diff --git a/library/Zend/Pdf/Element/Reference.php b/library/Zend/Pdf/Element/Reference.php index 298416ac5..e1a6fc700 100644 --- a/library/Zend/Pdf/Element/Reference.php +++ b/library/Zend/Pdf/Element/Reference.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reference.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Reference.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Reference extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/Reference/Context.php b/library/Zend/Pdf/Element/Reference/Context.php index 2d3cc1d89..24f80ee4c 100644 --- a/library/Zend/Pdf/Element/Reference/Context.php +++ b/library/Zend/Pdf/Element/Reference/Context.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Context.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Context.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Reference_Context diff --git a/library/Zend/Pdf/Element/Reference/Table.php b/library/Zend/Pdf/Element/Reference/Table.php index 4d268db51..ffaaecd44 100644 --- a/library/Zend/Pdf/Element/Reference/Table.php +++ b/library/Zend/Pdf/Element/Reference/Table.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Table.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Reference_Table diff --git a/library/Zend/Pdf/Element/Stream.php b/library/Zend/Pdf/Element/Stream.php index e139f211b..8e031225e 100644 --- a/library/Zend/Pdf/Element/Stream.php +++ b/library/Zend/Pdf/Element/Stream.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_Stream extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/String.php b/library/Zend/Pdf/Element/String.php index 834f2a064..6ccd94812 100644 --- a/library/Zend/Pdf/Element/String.php +++ b/library/Zend/Pdf/Element/String.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 21542 2010-03-18 08:56:40Z bate $ + * @version $Id: String.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_String extends Zend_Pdf_Element diff --git a/library/Zend/Pdf/Element/String/Binary.php b/library/Zend/Pdf/Element/String/Binary.php index d01ce1180..5a089b6cf 100644 --- a/library/Zend/Pdf/Element/String/Binary.php +++ b/library/Zend/Pdf/Element/String/Binary.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Binary.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Binary.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Element_String_Binary extends Zend_Pdf_Element_String diff --git a/library/Zend/Pdf/ElementFactory.php b/library/Zend/Pdf/ElementFactory.php index cf6e2154a..ec49dbeca 100644 --- a/library/Zend/Pdf/ElementFactory.php +++ b/library/Zend/Pdf/ElementFactory.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ElementFactory.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: ElementFactory.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * Responsibility is to log PDF changes * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_ElementFactory implements Zend_Pdf_ElementFactory_Interface diff --git a/library/Zend/Pdf/ElementFactory/Interface.php b/library/Zend/Pdf/ElementFactory/Interface.php index e9b65a5ee..e10efb1b9 100644 --- a/library/Zend/Pdf/ElementFactory/Interface.php +++ b/library/Zend/Pdf/ElementFactory/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * Responsibility is to log PDF changes * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Pdf_ElementFactory_Interface diff --git a/library/Zend/Pdf/ElementFactory/Proxy.php b/library/Zend/Pdf/ElementFactory/Proxy.php index 913590dba..1d92ad9b0 100644 --- a/library/Zend/Pdf/ElementFactory/Proxy.php +++ b/library/Zend/Pdf/ElementFactory/Proxy.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Proxy.php 22797 2010-08-06 15:02:12Z alexander $ + * @version $Id: Proxy.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_ElementFactory_Interface */ @@ -27,7 +27,7 @@ * Responsibility is to log PDF changes * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_ElementFactory_Proxy implements Zend_Pdf_ElementFactory_Interface diff --git a/library/Zend/Pdf/Exception.php b/library/Zend/Pdf/Exception.php index b4b664bbd..a16ccb900 100644 --- a/library/Zend/Pdf/Exception.php +++ b/library/Zend/Pdf/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Core - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Exception */ @@ -45,7 +45,7 @@ * * @package Zend_Pdf * @subpackage Core - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Exception extends Zend_Exception diff --git a/library/Zend/Pdf/FileParser.php b/library/Zend/Pdf/FileParser.php index 6bca63580..ccbe5d5f4 100644 --- a/library/Zend/Pdf/FileParser.php +++ b/library/Zend/Pdf/FileParser.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileParser.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileParser.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser diff --git a/library/Zend/Pdf/FileParser/Font.php b/library/Zend/Pdf/FileParser/Font.php index 76d8488bc..fc4402d78 100644 --- a/library/Zend/Pdf/FileParser/Font.php +++ b/library/Zend/Pdf/FileParser/Font.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Font.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Font.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -36,7 +36,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser_Font extends Zend_Pdf_FileParser diff --git a/library/Zend/Pdf/FileParser/Font/OpenType.php b/library/Zend/Pdf/FileParser/Font/OpenType.php index b51a396cd..52a4b3d44 100644 --- a/library/Zend/Pdf/FileParser/Font/OpenType.php +++ b/library/Zend/Pdf/FileParser/Font/OpenType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_FileParser_Font */ @@ -45,7 +45,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser_Font_OpenType extends Zend_Pdf_FileParser_Font diff --git a/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php b/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php index 39053ce24..1254833c3 100644 --- a/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php +++ b/library/Zend/Pdf/FileParser/Font/OpenType/TrueType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrueType.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParser_Font_OpenType_TrueType extends Zend_Pdf_FileParser_Font_OpenType diff --git a/library/Zend/Pdf/FileParser/Image.php b/library/Zend/Pdf/FileParser/Image.php index ebf635ec7..e6f43ec8f 100644 --- a/library/Zend/Pdf/FileParser/Image.php +++ b/library/Zend/Pdf/FileParser/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParser_Image extends Zend_Pdf_FileParser diff --git a/library/Zend/Pdf/FileParser/Image/Png.php b/library/Zend/Pdf/FileParser/Image/Png.php index 5b6921fea..41c67370c 100644 --- a/library/Zend/Pdf/FileParser/Image/Png.php +++ b/library/Zend/Pdf/FileParser/Image/Png.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Png.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Png.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Pdf_FileParser_Image */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParser_Image_Png extends Zend_Pdf_FileParser_Image diff --git a/library/Zend/Pdf/FileParserDataSource.php b/library/Zend/Pdf/FileParserDataSource.php index de2703409..ed5a90317 100644 --- a/library/Zend/Pdf/FileParserDataSource.php +++ b/library/Zend/Pdf/FileParserDataSource.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileParserDataSource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FileParserDataSource.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_FileParserDataSource diff --git a/library/Zend/Pdf/FileParserDataSource/File.php b/library/Zend/Pdf/FileParserDataSource/File.php index 762bd4fa5..715d58395 100644 --- a/library/Zend/Pdf/FileParserDataSource/File.php +++ b/library/Zend/Pdf/FileParserDataSource/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_FileParserDataSource */ @@ -34,7 +34,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParserDataSource_File extends Zend_Pdf_FileParserDataSource diff --git a/library/Zend/Pdf/FileParserDataSource/String.php b/library/Zend/Pdf/FileParserDataSource/String.php index da0c38d80..70f8619af 100644 --- a/library/Zend/Pdf/FileParserDataSource/String.php +++ b/library/Zend/Pdf/FileParserDataSource/String.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: String.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_FileParserDataSource */ @@ -29,7 +29,7 @@ * * @package Zend_Pdf * @subpackage FileParser - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_FileParserDataSource_String extends Zend_Pdf_FileParserDataSource diff --git a/library/Zend/Pdf/Filter/Ascii85.php b/library/Zend/Pdf/Filter/Ascii85.php index 4901d79eb..0ac2a55eb 100644 --- a/library/Zend/Pdf/Filter/Ascii85.php +++ b/library/Zend/Pdf/Filter/Ascii85.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ascii85.php 22653 2010-07-22 18:41:39Z mabe $ + * @version $Id: Ascii85.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * ASCII85 stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_Ascii85 implements Zend_Pdf_Filter_Interface diff --git a/library/Zend/Pdf/Filter/AsciiHex.php b/library/Zend/Pdf/Filter/AsciiHex.php index 406bf0cc7..4fa3c8a57 100644 --- a/library/Zend/Pdf/Filter/AsciiHex.php +++ b/library/Zend/Pdf/Filter/AsciiHex.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AsciiHex.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AsciiHex.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * AsciiHex stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_AsciiHex implements Zend_Pdf_Filter_Interface diff --git a/library/Zend/Pdf/Filter/Compression.php b/library/Zend/Pdf/Filter/Compression.php index 9c3686de3..2cfad09e5 100644 --- a/library/Zend/Pdf/Filter/Compression.php +++ b/library/Zend/Pdf/Filter/Compression.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Compression.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Compression.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * ASCII85 stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Filter_Compression implements Zend_Pdf_Filter_Interface diff --git a/library/Zend/Pdf/Filter/Compression/Flate.php b/library/Zend/Pdf/Filter/Compression/Flate.php index 5c691cf0a..ebe4b64be 100644 --- a/library/Zend/Pdf/Filter/Compression/Flate.php +++ b/library/Zend/Pdf/Filter/Compression/Flate.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Flate.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Flate.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * Flate stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_Compression_Flate extends Zend_Pdf_Filter_Compression diff --git a/library/Zend/Pdf/Filter/Compression/Lzw.php b/library/Zend/Pdf/Filter/Compression/Lzw.php index 69fe3ea03..8a0dc2423 100644 --- a/library/Zend/Pdf/Filter/Compression/Lzw.php +++ b/library/Zend/Pdf/Filter/Compression/Lzw.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lzw.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Lzw.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * LZW stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_Compression_Lzw extends Zend_Pdf_Filter_Compression diff --git a/library/Zend/Pdf/Filter/Interface.php b/library/Zend/Pdf/Filter/Interface.php index af5a4fe22..f3fa4de31 100644 --- a/library/Zend/Pdf/Filter/Interface.php +++ b/library/Zend/Pdf/Filter/Interface.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * PDF stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Pdf_Filter_Interface diff --git a/library/Zend/Pdf/Filter/RunLength.php b/library/Zend/Pdf/Filter/RunLength.php index 94b894def..98cb26097 100644 --- a/library/Zend/Pdf/Filter/RunLength.php +++ b/library/Zend/Pdf/Filter/RunLength.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RunLength.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: RunLength.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * RunLength stream filter * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Filter_RunLength implements Zend_Pdf_Filter_Interface diff --git a/library/Zend/Pdf/Font.php b/library/Zend/Pdf/Font.php index 408fa0398..86e26cd79 100644 --- a/library/Zend/Pdf/Font.php +++ b/library/Zend/Pdf/Font.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Font.php 20211 2010-01-12 02:14:29Z yoshida@zend.co.jp $ + * @version $Id: Font.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Font diff --git a/library/Zend/Pdf/Image.php b/library/Zend/Pdf/Image.php index 57b56878f..6f17a607e 100644 --- a/library/Zend/Pdf/Image.php +++ b/library/Zend/Pdf/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Images - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -30,7 +30,7 @@ * * @package Zend_Pdf * @subpackage Images - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Image diff --git a/library/Zend/Pdf/NameTree.php b/library/Zend/Pdf/NameTree.php index 81f1a747a..cf659c01d 100644 --- a/library/Zend/Pdf/NameTree.php +++ b/library/Zend/Pdf/NameTree.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NameTree.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NameTree.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -30,7 +30,7 @@ * @todo implement lazy resource loading so resources will be really loaded at access time * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_NameTree implements ArrayAccess, Iterator, Countable @@ -46,7 +46,7 @@ class Zend_Pdf_NameTree implements ArrayAccess, Iterator, Countable /** * Object constructor * - * @param $rootDictionary root of name dictionary + * @param Zend_Pdf_Element $rootDictionary root of name dictionary */ public function __construct(Zend_Pdf_Element $rootDictionary) { diff --git a/library/Zend/Pdf/Outline.php b/library/Zend/Pdf/Outline.php index f7b236449..f130c048a 100644 --- a/library/Zend/Pdf/Outline.php +++ b/library/Zend/Pdf/Outline.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Outline.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Outline.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * * @package Zend_Pdf * @subpackage Outlines - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Outline implements RecursiveIterator, Countable diff --git a/library/Zend/Pdf/Outline/Created.php b/library/Zend/Pdf/Outline/Created.php index 4d334d0ab..56bad22e8 100644 --- a/library/Zend/Pdf/Outline/Created.php +++ b/library/Zend/Pdf/Outline/Created.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Created.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Created.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * * @package Zend_Pdf * @subpackage Outlines - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Outline_Created extends Zend_Pdf_Outline diff --git a/library/Zend/Pdf/Outline/Loaded.php b/library/Zend/Pdf/Outline/Loaded.php index e9745ec91..1802afdd3 100644 --- a/library/Zend/Pdf/Outline/Loaded.php +++ b/library/Zend/Pdf/Outline/Loaded.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Loaded.php 23195 2010-10-21 10:12:12Z alexander $ + * @version $Id: Loaded.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -39,7 +39,7 @@ * * @package Zend_Pdf * @subpackage Outlines - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Outline_Loaded extends Zend_Pdf_Outline diff --git a/library/Zend/Pdf/Page.php b/library/Zend/Pdf/Page.php index 751efdbfb..7b4177254 100644 --- a/library/Zend/Pdf/Page.php +++ b/library/Zend/Pdf/Page.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 22909 2010-08-27 19:57:48Z alexander $ + * @version $Id: Page.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -38,7 +38,7 @@ * PDF Page * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Page extends Zend_Pdf_Canvas_Abstract diff --git a/library/Zend/Pdf/Parser.php b/library/Zend/Pdf/Parser.php index b630af787..30932b77f 100644 --- a/library/Zend/Pdf/Parser.php +++ b/library/Zend/Pdf/Parser.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parser.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Parser.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -32,7 +32,7 @@ * PDF file parser * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Parser diff --git a/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php b/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php index 456c58f5f..ac2c0abbe 100644 --- a/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php +++ b/library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecursivelyIteratableObjectsContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecursivelyIteratableObjectsContainer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * Iteratable objects container * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_RecursivelyIteratableObjectsContainer implements RecursiveIterator, Countable diff --git a/library/Zend/Pdf/Resource.php b/library/Zend/Pdf/Resource.php index d511aef13..34c74b3ec 100644 --- a/library/Zend/Pdf/Resource.php +++ b/library/Zend/Pdf/Resource.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 22909 2010-08-27 19:57:48Z alexander $ + * @version $Id: Resource.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -24,7 +24,7 @@ * PDF file Resource abstraction * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource diff --git a/library/Zend/Pdf/Resource/ContentStream.php b/library/Zend/Pdf/Resource/ContentStream.php index aefc5a8d4..e0ffb8156 100644 --- a/library/Zend/Pdf/Resource/ContentStream.php +++ b/library/Zend/Pdf/Resource/ContentStream.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ * Content stream (drawing instructions container) * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_ContentStream extends Zend_Pdf_Resource diff --git a/library/Zend/Pdf/Resource/Extractor.php b/library/Zend/Pdf/Resource/Extractor.php index caad5233e..8fec25cd6 100644 --- a/library/Zend/Pdf/Resource/Extractor.php +++ b/library/Zend/Pdf/Resource/Extractor.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: */ @@ -44,7 +44,7 @@ * must not be shared between target documents. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Extractor diff --git a/library/Zend/Pdf/Resource/Font.php b/library/Zend/Pdf/Resource/Font.php index 8b322cab8..cfb06608e 100644 --- a/library/Zend/Pdf/Resource/Font.php +++ b/library/Zend/Pdf/Resource/Font.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Font.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Font.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Pdf_Resource */ @@ -44,7 +44,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font extends Zend_Pdf_Resource diff --git a/library/Zend/Pdf/Resource/Font/CidFont.php b/library/Zend/Pdf/Resource/Font/CidFont.php index 0a6ff907d..18450b33d 100644 --- a/library/Zend/Pdf/Resource/Font/CidFont.php +++ b/library/Zend/Pdf/Resource/Font/CidFont.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CidFont.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CidFont.php 24665 2012-02-26 16:53:25Z adamlundrigan $ */ /** Internally used classes */ @@ -51,7 +51,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_CidFont extends Zend_Pdf_Resource_Font @@ -129,7 +129,9 @@ public function __construct(Zend_Pdf_FileParser_Font_OpenType $fontParser) $charGlyphs = $this->_cmap->getCoveredCharactersGlyphs(); $charWidths = array(); foreach ($charGlyphs as $charCode => $glyph) { - $charWidths[$charCode] = $glyphWidths[$glyph]; + if(isset($glyphWidths[$glyph]) && !is_null($glyphWidths[$glyph])) { + $charWidths[$charCode] = $glyphWidths[$glyph]; + } } $this->_charWidths = $charWidths; $this->_missingCharWidth = $glyphWidths[0]; diff --git a/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php b/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php index f141c6ab7..dd214ac1d 100644 --- a/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php +++ b/library/Zend/Pdf/Resource/Font/CidFont/TrueType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrueType.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -44,7 +44,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_CidFont_TrueType extends Zend_Pdf_Resource_Font_CidFont diff --git a/library/Zend/Pdf/Resource/Font/Extracted.php b/library/Zend/Pdf/Resource/Font/Extracted.php index c7c4f484d..4999bb18b 100644 --- a/library/Zend/Pdf/Resource/Font/Extracted.php +++ b/library/Zend/Pdf/Resource/Font/Extracted.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extracted.php 20866 2010-02-03 05:30:07Z yoshida@zend.co.jp $ + * @version $Id: Extracted.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Extracted extends Zend_Pdf_Resource_Font diff --git a/library/Zend/Pdf/Resource/Font/FontDescriptor.php b/library/Zend/Pdf/Resource/Font/FontDescriptor.php index 99151c4a8..796051e29 100644 --- a/library/Zend/Pdf/Resource/Font/FontDescriptor.php +++ b/library/Zend/Pdf/Resource/Font/FontDescriptor.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FontDescriptor.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FontDescriptor.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -42,7 +42,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_FontDescriptor diff --git a/library/Zend/Pdf/Resource/Font/Simple.php b/library/Zend/Pdf/Resource/Font/Simple.php index 1df76e189..fc1ac55a7 100644 --- a/library/Zend/Pdf/Resource/Font/Simple.php +++ b/library/Zend/Pdf/Resource/Font/Simple.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simple.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Simple.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -56,7 +56,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_Simple extends Zend_Pdf_Resource_Font diff --git a/library/Zend/Pdf/Resource/Font/Simple/Parsed.php b/library/Zend/Pdf/Resource/Font/Simple/Parsed.php index fe054633e..2e23c621b 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Parsed.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Parsed.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parsed.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parsed.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -37,7 +37,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_Simple_Parsed extends Zend_Pdf_Resource_Font_Simple diff --git a/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php b/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php index 4ca287b63..507777215 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Parsed/TrueType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TrueType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TrueType.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -39,7 +39,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Parsed_TrueType extends Zend_Pdf_Resource_Font_Simple_Parsed diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard.php b/library/Zend/Pdf/Resource/Font/Simple/Standard.php index dcc45385e..c05500437 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Standard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Standard.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -59,7 +59,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Font_Simple_Standard extends Zend_Pdf_Resource_Font_Simple diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php index 38d8dff91..debe67884 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/Courier.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Courier.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Courier.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_Courier extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php index b4c65b6cf..240bac131 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBold.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CourierBold.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CourierBold.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_CourierBold extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php index 1c819933f..531a9a5c8 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierBoldOblique.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CourierBoldOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CourierBoldOblique.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_CourierBoldOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php index 657aa5675..0b0402a1e 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/CourierOblique.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CourierOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CourierOblique.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_CourierOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php index ea0770605..f556ad297 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/Helvetica.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Helvetica.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Helvetica.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_Helvetica extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php index d3c886132..b7bc1fc55 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBold.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelveticaBold.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelveticaBold.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -42,7 +42,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBold extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php index 5d507e350..3c302edac 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaBoldOblique.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelveticaBoldOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelveticaBoldOblique.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaBoldOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php index 827963905..5a72cdac7 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/HelveticaOblique.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelveticaOblique.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelveticaOblique.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_HelveticaOblique extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php index 4341b2872..ac3bc447f 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/Symbol.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Symbol.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Symbol.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_Symbol extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php index 250c1cbf2..e64436a25 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBold.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesBold.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesBold.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesBold extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php index c5da69ac9..bf533051a 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesBoldItalic.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesBoldItalic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesBoldItalic.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesBoldItalic extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php index 75776b9df..72d616b75 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesItalic.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesItalic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesItalic.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesItalic extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php index 457b617f1..237af007e 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/TimesRoman.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimesRoman.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimesRoman.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_TimesRoman extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php b/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php index 744406640..26199f3bf 100644 --- a/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php +++ b/library/Zend/Pdf/Resource/Font/Simple/Standard/ZapfDingbats.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZapfDingbats.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ZapfDingbats.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Simple_Standard_ZapfDingbats extends Zend_Pdf_Resource_Font_Simple_Standard diff --git a/library/Zend/Pdf/Resource/Font/Type0.php b/library/Zend/Pdf/Resource/Font/Type0.php index 8b894f560..176b180ab 100644 --- a/library/Zend/Pdf/Resource/Font/Type0.php +++ b/library/Zend/Pdf/Resource/Font/Type0.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Type0.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Type0.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -57,7 +57,7 @@ * * @package Zend_Pdf * @subpackage Fonts - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Font_Type0 extends Zend_Pdf_Resource_Font diff --git a/library/Zend/Pdf/Resource/GraphicsState.php b/library/Zend/Pdf/Resource/GraphicsState.php index f9347e10c..06e2a0881 100644 --- a/library/Zend/Pdf/Resource/GraphicsState.php +++ b/library/Zend/Pdf/Resource/GraphicsState.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -39,7 +39,7 @@ * graphics state operator gs (PDF 1.2). * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_GraphicsState extends Zend_Pdf_Resource diff --git a/library/Zend/Pdf/Resource/Image.php b/library/Zend/Pdf/Resource/Image.php index bcc7b01db..c57082472 100644 --- a/library/Zend/Pdf/Resource/Image.php +++ b/library/Zend/Pdf/Resource/Image.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 22908 2010-08-25 20:52:47Z alexander $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * Image abstraction. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Resource_Image extends Zend_Pdf_Resource diff --git a/library/Zend/Pdf/Resource/Image/Jpeg.php b/library/Zend/Pdf/Resource/Image/Jpeg.php index 755962b7b..9df81ab8c 100644 --- a/library/Zend/Pdf/Resource/Image/Jpeg.php +++ b/library/Zend/Pdf/Resource/Image/Jpeg.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Jpeg.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Jpeg.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * JPEG image * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Image_Jpeg extends Zend_Pdf_Resource_Image diff --git a/library/Zend/Pdf/Resource/Image/Png.php b/library/Zend/Pdf/Resource/Image/Png.php index 52343a4e6..61babe38c 100644 --- a/library/Zend/Pdf/Resource/Image/Png.php +++ b/library/Zend/Pdf/Resource/Image/Png.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Png.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Png.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * PNG image * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Image_Png extends Zend_Pdf_Resource_Image diff --git a/library/Zend/Pdf/Resource/Image/Tiff.php b/library/Zend/Pdf/Resource/Image/Tiff.php index 4ff575d42..115029d10 100644 --- a/library/Zend/Pdf/Resource/Image/Tiff.php +++ b/library/Zend/Pdf/Resource/Image/Tiff.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tiff.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tiff.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Internally used classes */ @@ -32,7 +32,7 @@ * TIFF image * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Image_Tiff extends Zend_Pdf_Resource_Image diff --git a/library/Zend/Pdf/Resource/ImageFactory.php b/library/Zend/Pdf/Resource/ImageFactory.php index e001f1dae..5c07ca0c6 100644 --- a/library/Zend/Pdf/Resource/ImageFactory.php +++ b/library/Zend/Pdf/Resource/ImageFactory.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageFactory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageFactory.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * Helps manage the diverse set of supported image file types. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo Use Zend_Mime not file extension for type determination. */ diff --git a/library/Zend/Pdf/Resource/Unified.php b/library/Zend/Pdf/Resource/Unified.php index a3ae23f95..2820cd811 100644 --- a/library/Zend/Pdf/Resource/Unified.php +++ b/library/Zend/Pdf/Resource/Unified.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -29,7 +29,7 @@ * Class is used to represent any resource when resource type not actually important. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Resource_Unified extends Zend_Pdf_Resource diff --git a/library/Zend/Pdf/StringParser.php b/library/Zend/Pdf/StringParser.php index 3b27a2efc..6e37deac5 100644 --- a/library/Zend/Pdf/StringParser.php +++ b/library/Zend/Pdf/StringParser.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringParser.php 22311 2010-05-27 12:57:37Z padraic $ + * @version $Id: StringParser.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * PDF string parser * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_StringParser @@ -272,7 +272,7 @@ public function readLexeme() } $this->offset += strcspn($this->data, $compare, $this->offset); - + return substr($this->data, $start, $this->offset - $start); } } diff --git a/library/Zend/Pdf/Style.php b/library/Zend/Pdf/Style.php index 863909178..ccd880e2e 100644 --- a/library/Zend/Pdf/Style.php +++ b/library/Zend/Pdf/Style.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Style.php 22908 2010-08-25 20:52:47Z alexander $ + * @version $Id: Style.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * It's used by Zend_Pdf_Page class in draw operations. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Style diff --git a/library/Zend/Pdf/Target.php b/library/Zend/Pdf/Target.php index 65a5687c5..12773a9dc 100644 --- a/library/Zend/Pdf/Target.php +++ b/library/Zend/Pdf/Target.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Target.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Target.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * * @package Zend_Pdf * @subpackage Actions - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Target diff --git a/library/Zend/Pdf/Trailer.php b/library/Zend/Pdf/Trailer.php index 7ed62f5ed..38b169fdc 100644 --- a/library/Zend/Pdf/Trailer.php +++ b/library/Zend/Pdf/Trailer.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Trailer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Trailer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -24,7 +24,7 @@ * PDF file trailer * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Pdf_Trailer diff --git a/library/Zend/Pdf/Trailer/Generator.php b/library/Zend/Pdf/Trailer/Generator.php index 3f572a23e..ae79f3ae4 100644 --- a/library/Zend/Pdf/Trailer/Generator.php +++ b/library/Zend/Pdf/Trailer/Generator.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Generator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Generator.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * PDF file trailer generator (used for just created PDF) * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Trailer_Generator extends Zend_Pdf_Trailer diff --git a/library/Zend/Pdf/Trailer/Keeper.php b/library/Zend/Pdf/Trailer/Keeper.php index 6917041a9..4ffa46a93 100644 --- a/library/Zend/Pdf/Trailer/Keeper.php +++ b/library/Zend/Pdf/Trailer/Keeper.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Keeper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Keeper.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * Stores and provides access to the trailer parced from a PDF file * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_Trailer_Keeper extends Zend_Pdf_Trailer diff --git a/library/Zend/Pdf/UpdateInfoContainer.php b/library/Zend/Pdf/UpdateInfoContainer.php index bf8a8e68d..e4d21e42b 100644 --- a/library/Zend/Pdf/UpdateInfoContainer.php +++ b/library/Zend/Pdf/UpdateInfoContainer.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateInfoContainer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UpdateInfoContainer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -24,7 +24,7 @@ * Container which collects updated object info. * * @package Zend_Pdf - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Pdf_UpdateInfoContainer diff --git a/library/Zend/ProgressBar.php b/library/Zend/ProgressBar.php index 2f15f2a80..ebea6b632 100644 --- a/library/Zend/ProgressBar.php +++ b/library/Zend/ProgressBar.php @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProgressBar.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProgressBar.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -22,7 +22,7 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar diff --git a/library/Zend/ProgressBar/Adapter.php b/library/Zend/ProgressBar/Adapter.php index 7661a5a68..e1d92cbc5 100644 --- a/library/Zend/ProgressBar/Adapter.php +++ b/library/Zend/ProgressBar/Adapter.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Adapter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_ProgressBar_Adapter diff --git a/library/Zend/ProgressBar/Adapter/Console.php b/library/Zend/ProgressBar/Adapter/Console.php index fd854cb99..131711b4f 100644 --- a/library/Zend/ProgressBar/Adapter/Console.php +++ b/library/Zend/ProgressBar/Adapter/Console.php @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Console.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Console.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Adapter_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter diff --git a/library/Zend/ProgressBar/Adapter/Exception.php b/library/Zend/ProgressBar/Adapter/Exception.php index 07378cf79..38dee5628 100644 --- a/library/Zend/ProgressBar/Adapter/Exception.php +++ b/library/Zend/ProgressBar/Adapter/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_Exception extends Zend_ProgressBar_Exception diff --git a/library/Zend/ProgressBar/Adapter/JsPull.php b/library/Zend/ProgressBar/Adapter/JsPull.php index d3d3b4a6e..c376478a8 100644 --- a/library/Zend/ProgressBar/Adapter/JsPull.php +++ b/library/Zend/ProgressBar/Adapter/JsPull.php @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JsPull.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JsPull.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Adapter_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_JsPull extends Zend_ProgressBar_Adapter diff --git a/library/Zend/ProgressBar/Adapter/JsPush.php b/library/Zend/ProgressBar/Adapter/JsPush.php index 8653d18e2..e4e1bc415 100644 --- a/library/Zend/ProgressBar/Adapter/JsPush.php +++ b/library/Zend/ProgressBar/Adapter/JsPush.php @@ -12,9 +12,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JsPush.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JsPush.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_ProgressBar_Adapter_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Adapter_JsPush extends Zend_ProgressBar_Adapter diff --git a/library/Zend/ProgressBar/Exception.php b/library/Zend/ProgressBar/Exception.php index d1d30adb1..e0deff2af 100644 --- a/library/Zend/ProgressBar/Exception.php +++ b/library/Zend/ProgressBar/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_ProgressBar - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_ProgressBar * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_ProgressBar_Exception extends Zend_Exception diff --git a/library/Zend/Queue.php b/library/Zend/Queue.php index 307cdc8c7..155cd6f89 100644 --- a/library/Zend/Queue.php +++ b/library/Zend/Queue.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Queue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Queue.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue implements Countable diff --git a/library/Zend/Queue/Adapter/Activemq.php b/library/Zend/Queue/Adapter/Activemq.php index f690b5834..366dbe5f8 100644 --- a/library/Zend/Queue/Adapter/Activemq.php +++ b/library/Zend/Queue/Adapter/Activemq.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Activemq.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Activemq.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract @@ -55,6 +55,11 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract */ private $_client = null; + /** + * @var array + */ + private $_subscribed = array(); + /** * Constructor * @@ -176,6 +181,33 @@ public function getQueues() throw new Zend_Queue_Exception('getQueues() is not supported in this adapter'); } + /** + * Checks if the client is subscribed to the queue + * + * @param Zend_Queue $queue + * @return boolean + */ + protected function _isSubscribed(Zend_Queue $queue) + { + return isset($this->_subscribed[$queue->getName()]); + } + + /** + * Subscribes the client to the queue. + * + * @param Zend_Queue $queue + * @return void + */ + protected function _subscribe(Zend_Queue $queue) + { + $frame = $this->_client->createFrame(); + $frame->setCommand('SUBSCRIBE'); + $frame->setHeader('destination', $queue->getName()); + $frame->setHeader('ack', 'client'); + $this->_client->send($frame); + $this->_subscribed[$queue->getName()] = true; + } + /** * Return the first element in the queue * @@ -200,11 +232,9 @@ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null $data = array(); // signal that we are reading - $frame = $this->_client->createFrame(); - $frame->setCommand('SUBSCRIBE'); - $frame->setHeader('destination', $queue->getName()); - $frame->setHeader('ack','client'); - $this->_client->send($frame); + if (!$this->_isSubscribed($queue)){ + $this->_subscribe($queue); + } if ($maxMessages > 0) { if ($this->_client->canRead()) { diff --git a/library/Zend/Queue/Adapter/AdapterAbstract.php b/library/Zend/Queue/Adapter/AdapterAbstract.php index 83029a1a3..4c788131a 100644 --- a/library/Zend/Queue/Adapter/AdapterAbstract.php +++ b/library/Zend/Queue/Adapter/AdapterAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AdapterAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Queue_Adapter_AdapterAbstract diff --git a/library/Zend/Queue/Adapter/AdapterInterface.php b/library/Zend/Queue/Adapter/AdapterInterface.php index e4053a3f5..fcdecdeb4 100644 --- a/library/Zend/Queue/Adapter/AdapterInterface.php +++ b/library/Zend/Queue/Adapter/AdapterInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AdapterInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Queue_Adapter_AdapterInterface diff --git a/library/Zend/Queue/Adapter/Array.php b/library/Zend/Queue/Adapter/Array.php index 73317f260..072e08f56 100644 --- a/library/Zend/Queue/Adapter/Array.php +++ b/library/Zend/Queue/Adapter/Array.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Array.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract @@ -344,7 +344,7 @@ public function getData() * sets the underlying _data array * $queue->getAdapter()->setData($data); * - * @param $data array + * @param array $data * @return $this; */ public function setData($data) diff --git a/library/Zend/Queue/Adapter/Db.php b/library/Zend/Queue/Adapter/Db.php index 8bcc3fcfa..611bcc1e9 100644 --- a/library/Zend/Queue/Adapter/Db.php +++ b/library/Zend/Queue/Adapter/Db.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Db.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -51,7 +51,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract diff --git a/library/Zend/Queue/Adapter/Db/Message.php b/library/Zend/Queue/Adapter/Db/Message.php index 72bac341e..22c77a047 100644 --- a/library/Zend/Queue/Adapter/Db/Message.php +++ b/library/Zend/Queue/Adapter/Db/Message.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Db_Message extends Zend_Db_Table_Abstract diff --git a/library/Zend/Queue/Adapter/Db/Queue.php b/library/Zend/Queue/Adapter/Db/Queue.php index 04b8dd1b1..f5f1a5ce4 100644 --- a/library/Zend/Queue/Adapter/Db/Queue.php +++ b/library/Zend/Queue/Adapter/Db/Queue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Queue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Queue.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Db_Queue extends Zend_Db_Table_Abstract diff --git a/library/Zend/Queue/Adapter/Db/postgresql.sql b/library/Zend/Queue/Adapter/Db/postgresql.sql index eeccea594..333790f3a 100644 --- a/library/Zend/Queue/Adapter/Db/postgresql.sql +++ b/library/Zend/Queue/Adapter/Db/postgresql.sql @@ -1,49 +1,49 @@ -/* -Sample grant for PostgreSQL - -CREATE ROLE queue LOGIN - PASSWORD '[CHANGE ME]' - NOSUPERUSER NOINHERIT NOCREATEDB NOCREATEROLE; - -*/ - --- --- Table structure for table `queue` --- - -DROP TABLE IF EXISTS queue; - -CREATE TABLE queue -( - queue_id serial NOT NULL, - queue_name character varying(100) NOT NULL, - timeout smallint NOT NULL DEFAULT 30, - CONSTRAINT queue_pk PRIMARY KEY (queue_id) -) -WITH (OIDS=FALSE); -ALTER TABLE queue OWNER TO queue; - - --- -------------------------------------------------------- --- --- Table structure for table `message` --- - -DROP TABLE IF EXISTS message; - -CREATE TABLE message -( - message_id bigserial NOT NULL, - queue_id integer, - handle character(32), - body character varying(8192) NOT NULL, - md5 character(32) NOT NULL, - timeout real, - created integer, - CONSTRAINT message_pk PRIMARY KEY (message_id), - CONSTRAINT message_ibfk_1 FOREIGN KEY (queue_id) - REFERENCES queue (queue_id) MATCH SIMPLE - ON UPDATE CASCADE ON DELETE CASCADE -) -WITH (OIDS=FALSE); +/* +Sample grant for PostgreSQL + +CREATE ROLE queue LOGIN + PASSWORD '[CHANGE ME]' + NOSUPERUSER NOINHERIT NOCREATEDB NOCREATEROLE; + +*/ + +-- +-- Table structure for table `queue` +-- + +DROP TABLE IF EXISTS queue; + +CREATE TABLE queue +( + queue_id serial NOT NULL, + queue_name character varying(100) NOT NULL, + timeout smallint NOT NULL DEFAULT 30, + CONSTRAINT queue_pk PRIMARY KEY (queue_id) +) +WITH (OIDS=FALSE); +ALTER TABLE queue OWNER TO queue; + + +-- -------------------------------------------------------- +-- +-- Table structure for table `message` +-- + +DROP TABLE IF EXISTS message; + +CREATE TABLE message +( + message_id bigserial NOT NULL, + queue_id integer, + handle character(32), + body character varying(8192) NOT NULL, + md5 character(32) NOT NULL, + timeout real, + created integer, + CONSTRAINT message_pk PRIMARY KEY (message_id), + CONSTRAINT message_ibfk_1 FOREIGN KEY (queue_id) + REFERENCES queue (queue_id) MATCH SIMPLE + ON UPDATE CASCADE ON DELETE CASCADE +) +WITH (OIDS=FALSE); ALTER TABLE message OWNER TO queue; \ No newline at end of file diff --git a/library/Zend/Queue/Adapter/Db/sqlsrv.sql b/library/Zend/Queue/Adapter/Db/sqlsrv.sql index 8753d541c..240308c7e 100644 --- a/library/Zend/Queue/Adapter/Db/sqlsrv.sql +++ b/library/Zend/Queue/Adapter/Db/sqlsrv.sql @@ -1,44 +1,44 @@ - -CREATE TABLE [dbo].[queue]( - [queue_id] [int] IDENTITY(1,1) NOT NULL, - [queue_name] [varchar](100) NOT NULL, - [timeout] [int] NOT NULL, - CONSTRAINT [PK_queue] PRIMARY KEY CLUSTERED -( - [queue_id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[queue] ADD DEFAULT ((30)) FOR [timeout] -GO - - -CREATE TABLE [dbo].[message]( - [message_id] [bigint] IDENTITY(1,1) NOT NULL, - [queue_id] [int] NOT NULL, - [handle] [char](32) NULL, - [body] [varchar](max) NOT NULL, - [md5] [char](32) NOT NULL, - [timeout] [decimal](14, 4) NULL, - [created] [int] NOT NULL, - CONSTRAINT [PK_message] PRIMARY KEY CLUSTERED -( - [message_id] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[message] WITH CHECK ADD CONSTRAINT [fk_message_queue_id] FOREIGN KEY([queue_id]) -REFERENCES [dbo].[queue] ([queue_id]) -GO - -ALTER TABLE [dbo].[message] CHECK CONSTRAINT [fk_message_queue_id] -GO - - - - - + +CREATE TABLE [dbo].[queue]( + [queue_id] [int] IDENTITY(1,1) NOT NULL, + [queue_name] [varchar](100) NOT NULL, + [timeout] [int] NOT NULL, + CONSTRAINT [PK_queue] PRIMARY KEY CLUSTERED +( + [queue_id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[queue] ADD DEFAULT ((30)) FOR [timeout] +GO + + +CREATE TABLE [dbo].[message]( + [message_id] [bigint] IDENTITY(1,1) NOT NULL, + [queue_id] [int] NOT NULL, + [handle] [char](32) NULL, + [body] [varchar](max) NOT NULL, + [md5] [char](32) NOT NULL, + [timeout] [decimal](14, 4) NULL, + [created] [int] NOT NULL, + CONSTRAINT [PK_message] PRIMARY KEY CLUSTERED +( + [message_id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[message] WITH CHECK ADD CONSTRAINT [fk_message_queue_id] FOREIGN KEY([queue_id]) +REFERENCES [dbo].[queue] ([queue_id]) +GO + +ALTER TABLE [dbo].[message] CHECK CONSTRAINT [fk_message_queue_id] +GO + + + + + diff --git a/library/Zend/Queue/Adapter/Memcacheq.php b/library/Zend/Queue/Adapter/Memcacheq.php index 974ac3b13..49d03aef2 100644 --- a/library/Zend/Queue/Adapter/Memcacheq.php +++ b/library/Zend/Queue/Adapter/Memcacheq.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memcacheq.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Memcacheq.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract diff --git a/library/Zend/Queue/Adapter/Null.php b/library/Zend/Queue/Adapter/Null.php index 1dcd9b7a7..95201ce7a 100644 --- a/library/Zend/Queue/Adapter/Null.php +++ b/library/Zend/Queue/Adapter/Null.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Null.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Null.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract diff --git a/library/Zend/Queue/Adapter/PlatformJobQueue.php b/library/Zend/Queue/Adapter/PlatformJobQueue.php index 1019bdf95..d816e709e 100644 --- a/library/Zend/Queue/Adapter/PlatformJobQueue.php +++ b/library/Zend/Queue/Adapter/PlatformJobQueue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlatformJobQueue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlatformJobQueue.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbstract diff --git a/library/Zend/Queue/Exception.php b/library/Zend/Queue/Exception.php index 9b54244e8..bdc2c7d0a 100644 --- a/library/Zend/Queue/Exception.php +++ b/library/Zend/Queue/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Queue - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Exception extends Zend_Exception diff --git a/library/Zend/Queue/Message.php b/library/Zend/Queue/Message.php index 05e44f9e3..e5acc18bc 100644 --- a/library/Zend/Queue/Message.php +++ b/library/Zend/Queue/Message.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Message diff --git a/library/Zend/Queue/Message/Iterator.php b/library/Zend/Queue/Message/Iterator.php index f8847fa41..db25101b4 100644 --- a/library/Zend/Queue/Message/Iterator.php +++ b/library/Zend/Queue/Message/Iterator.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Iterator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Message_Iterator implements Iterator, Countable diff --git a/library/Zend/Queue/Message/PlatformJob.php b/library/Zend/Queue/Message/PlatformJob.php index b761b4d27..8a6f762d2 100644 --- a/library/Zend/Queue/Message/PlatformJob.php +++ b/library/Zend/Queue/Message/PlatformJob.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PlatformJob.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PlatformJob.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Message - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Message_PlatformJob extends Zend_Queue_Message diff --git a/library/Zend/Queue/Stomp/Client.php b/library/Zend/Queue/Stomp/Client.php index 9e811641a..380d3aaaa 100644 --- a/library/Zend/Queue/Stomp/Client.php +++ b/library/Zend/Queue/Stomp/Client.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Stomp_Client diff --git a/library/Zend/Queue/Stomp/Client/Connection.php b/library/Zend/Queue/Stomp/Client/Connection.php index f6e0b9711..51cf953cd 100644 --- a/library/Zend/Queue/Stomp/Client/Connection.php +++ b/library/Zend/Queue/Stomp/Client/Connection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Connection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Connection.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Stomp_Client_Connection diff --git a/library/Zend/Queue/Stomp/Client/ConnectionInterface.php b/library/Zend/Queue/Stomp/Client/ConnectionInterface.php index 3c1a8dccf..af72941ba 100644 --- a/library/Zend/Queue/Stomp/Client/ConnectionInterface.php +++ b/library/Zend/Queue/Stomp/Client/ConnectionInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConnectionInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ConnectionInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Queue_Stomp_Client_ConnectionInterface diff --git a/library/Zend/Queue/Stomp/Frame.php b/library/Zend/Queue/Stomp/Frame.php index 612c71132..f9d42b274 100644 --- a/library/Zend/Queue/Stomp/Frame.php +++ b/library/Zend/Queue/Stomp/Frame.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frame.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Frame.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Queue_Stomp_Frame diff --git a/library/Zend/Queue/Stomp/FrameInterface.php b/library/Zend/Queue/Stomp/FrameInterface.php index c653efb12..122b6d324 100644 --- a/library/Zend/Queue/Stomp/FrameInterface.php +++ b/library/Zend/Queue/Stomp/FrameInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FrameInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FrameInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Queue * @subpackage Stomp - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Queue_Stomp_FrameInterface diff --git a/library/Zend/Reflection/Class.php b/library/Zend/Reflection/Class.php index d47d5ae7c..c2f549047 100644 --- a/library/Zend/Reflection/Class.php +++ b/library/Zend/Reflection/Class.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Class.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Class extends ReflectionClass diff --git a/library/Zend/Reflection/Docblock.php b/library/Zend/Reflection/Docblock.php index 0ce45e805..9b7100399 100644 --- a/library/Zend/Reflection/Docblock.php +++ b/library/Zend/Reflection/Docblock.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docblock.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Docblock.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock implements Reflector diff --git a/library/Zend/Reflection/Docblock/Tag.php b/library/Zend/Reflection/Docblock/Tag.php index 63c40a0db..846eb635f 100644 --- a/library/Zend/Reflection/Docblock/Tag.php +++ b/library/Zend/Reflection/Docblock/Tag.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tag.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Loader */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock_Tag implements Reflector diff --git a/library/Zend/Reflection/Docblock/Tag/Param.php b/library/Zend/Reflection/Docblock/Tag/Param.php index d2a47b0f4..5f6e6552f 100644 --- a/library/Zend/Reflection/Docblock/Tag/Param.php +++ b/library/Zend/Reflection/Docblock/Tag/Param.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Param.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Param.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Reflection_Docblock_Tag */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock_Tag_Param extends Zend_Reflection_Docblock_Tag @@ -49,7 +49,7 @@ public function __construct($tagDocblockLine) { $matches = array(); - if (!preg_match('#^@(\w+)\s+([\w|\\\]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) { + if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) { // require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } diff --git a/library/Zend/Reflection/Docblock/Tag/Return.php b/library/Zend/Reflection/Docblock/Tag/Return.php index fdcb930fd..5fd9ddb70 100644 --- a/library/Zend/Reflection/Docblock/Tag/Return.php +++ b/library/Zend/Reflection/Docblock/Tag/Return.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Return.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Return.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Reflection_Docblock_Tag */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag @@ -39,11 +39,11 @@ class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag * Constructor * * @param string $tagDocblockLine - * @return void + * @return \Zend_Reflection_Docblock_Tag_Return */ public function __construct($tagDocblockLine) { - if (!preg_match('#^@(\w+)\s+([\w|\\\]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) { + if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) { // require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } diff --git a/library/Zend/Reflection/Exception.php b/library/Zend/Reflection/Exception.php index 449f4f1b0..c0f141c0b 100644 --- a/library/Zend/Reflection/Exception.php +++ b/library/Zend/Reflection/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Exception extends Zend_Exception diff --git a/library/Zend/Reflection/Extension.php b/library/Zend/Reflection/Extension.php index a1811fb28..5a02b4194 100644 --- a/library/Zend/Reflection/Extension.php +++ b/library/Zend/Reflection/Extension.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Extension.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Extension extends ReflectionExtension diff --git a/library/Zend/Reflection/File.php b/library/Zend/Reflection/File.php index c2d1cfd93..98e9761a7 100644 --- a/library/Zend/Reflection/File.php +++ b/library/Zend/Reflection/File.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20904 2010-02-04 16:18:18Z matthew $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_File implements Reflector diff --git a/library/Zend/Reflection/Function.php b/library/Zend/Reflection/Function.php index 7dc1a49eb..28d0ab931 100644 --- a/library/Zend/Reflection/Function.php +++ b/library/Zend/Reflection/Function.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Function.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Function extends ReflectionFunction diff --git a/library/Zend/Reflection/Method.php b/library/Zend/Reflection/Method.php index 172a1734e..5c2ba81a3 100644 --- a/library/Zend/Reflection/Method.php +++ b/library/Zend/Reflection/Method.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Method.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Method extends ReflectionMethod diff --git a/library/Zend/Reflection/Parameter.php b/library/Zend/Reflection/Parameter.php index 6ad92d3ba..ed9aabe93 100644 --- a/library/Zend/Reflection/Parameter.php +++ b/library/Zend/Reflection/Parameter.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parameter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Parameter extends ReflectionParameter diff --git a/library/Zend/Reflection/Property.php b/library/Zend/Reflection/Property.php index c69776bb4..02196a680 100644 --- a/library/Zend/Reflection/Property.php +++ b/library/Zend/Reflection/Property.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Property.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Property.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @todo implement line numbers * @category Zend * @package Zend_Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Reflection_Property extends ReflectionProperty diff --git a/library/Zend/Registry.php b/library/Zend/Registry.php index d41b4ad7c..824a8940f 100644 --- a/library/Zend/Registry.php +++ b/library/Zend/Registry.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Registry - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Registry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Registry - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Registry extends ArrayObject diff --git a/library/Zend/Rest/Client.php b/library/Zend/Rest/Client.php index cb9274cda..b7303b8de 100644 --- a/library/Zend/Rest/Client.php +++ b/library/Zend/Rest/Client.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client extends Zend_Service_Abstract @@ -98,7 +98,7 @@ public function getUri() * @throws Zend_Rest_Client_Exception * @return void */ - final private function _prepareRest($path) + private function _prepareRest($path) { // Get the URI object and configure it if (!$this->_uri instanceof Zend_Uri_Http) { @@ -129,7 +129,7 @@ final private function _prepareRest($path) * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restGet($path, array $query = null) + public function restGet($path, array $query = null) { $this->_prepareRest($path); $client = self::getHttpClient(); @@ -167,7 +167,7 @@ protected function _performPost($method, $data = null) * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restPost($path, $data = null) + public function restPost($path, $data = null) { $this->_prepareRest($path); return $this->_performPost('POST', $data); @@ -181,7 +181,7 @@ final public function restPost($path, $data = null) * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restPut($path, $data = null) + public function restPut($path, $data = null) { $this->_prepareRest($path); return $this->_performPost('PUT', $data); @@ -194,10 +194,10 @@ final public function restPut($path, $data = null) * @throws Zend_Http_Client_Exception * @return Zend_Http_Response */ - final public function restDelete($path) + public function restDelete($path, $data = null) { $this->_prepareRest($path); - return self::getHttpClient()->request('DELETE'); + return $this->_performPost('DELETE', $data); } /** diff --git a/library/Zend/Rest/Client/Exception.php b/library/Zend/Rest/Client/Exception.php index 6bcc420ec..7dc1eb850 100644 --- a/library/Zend/Rest/Client/Exception.php +++ b/library/Zend/Rest/Client/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Exception extends Zend_Rest_Exception diff --git a/library/Zend/Rest/Client/Result.php b/library/Zend/Rest/Client/Result.php index 2dd238db6..3d18bc6f5 100644 --- a/library/Zend/Rest/Client/Result.php +++ b/library/Zend/Rest/Client/Result.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Result implements IteratorAggregate { @@ -180,7 +180,8 @@ public function getIterator() public function getStatus() { $status = $this->_sxml->xpath('//status/text()'); - + if ( !isset($status[0]) ) return false; + $status = strtolower($status[0]); if (ctype_alpha($status) && $status == 'success') { diff --git a/library/Zend/Rest/Client/Result/Exception.php b/library/Zend/Rest/Client/Result/Exception.php index 474aad7ec..093ebeb26 100644 --- a/library/Zend/Rest/Client/Result/Exception.php +++ b/library/Zend/Rest/Client/Result/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Result_Exception extends Zend_Rest_Client_Exception{} diff --git a/library/Zend/Rest/Controller.php b/library/Zend/Rest/Controller.php index 257b6840c..78b467cae 100644 --- a/library/Zend/Rest/Controller.php +++ b/library/Zend/Rest/Controller.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Controller.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Controller.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Controller_Action */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Rest * @see Zend_Rest_Route - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Rest_Controller extends Zend_Controller_Action diff --git a/library/Zend/Rest/Exception.php b/library/Zend/Rest/Exception.php index 7553cded3..57156f6f1 100644 --- a/library/Zend/Rest/Exception.php +++ b/library/Zend/Rest/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Exception extends Zend_Exception diff --git a/library/Zend/Rest/Route.php b/library/Zend/Rest/Route.php index ef733158a..0c6cc8b19 100644 --- a/library/Zend/Rest/Route.php +++ b/library/Zend/Rest/Route.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Route.php 23421 2010-11-21 10:03:53Z wilmoore $ + * @version $Id: Route.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -46,7 +46,7 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module @@ -98,13 +98,13 @@ public static function getInstance(Zend_Config $config) $defaultsArray = array(); $restfulConfigArray = array(); foreach ($config as $key => $values) { - if ($key == 'type') { - // do nothing - } elseif ($key == 'defaults') { - $defaultsArray = $values->toArray(); - } else { - $restfulConfigArray[$key] = explode(',', $values); - } + if ($key == 'type') { + // do nothing + } elseif ($key == 'defaults') { + $defaultsArray = $values->toArray(); + } else { + $restfulConfigArray[$key] = explode(',', $values); + } } $instance = new self($frontController, $defaultsArray, $restfulConfigArray); return $instance; @@ -161,10 +161,10 @@ public function match($request, $partial = false) return false; } } elseif ($this->_checkRestfulController($moduleName, $controllerName)) { - $values[$this->_controllerKey] = $controllerName; - $values[$this->_actionKey] = 'get'; + $values[$this->_controllerKey] = $controllerName; + $values[$this->_actionKey] = 'get'; } else { - return false; + return false; } //Store path count for method mapping @@ -176,7 +176,7 @@ public function match($request, $partial = false) $specialGetTarget = array_shift($path); } elseif ($pathElementCount && $path[$pathElementCount-1] == 'edit') { $specialGetTarget = 'edit'; - $params['id'] = $path[$pathElementCount-2]; + $params['id'] = urldecode($path[$pathElementCount-2]); } elseif ($pathElementCount == 1) { $params['id'] = urldecode(array_shift($path)); } elseif ($pathElementCount == 0 && !isset($params['id'])) { @@ -187,8 +187,8 @@ public function match($request, $partial = false) if ($numSegs = count($path)) { for ($i = 0; $i < $numSegs; $i = $i + 2) { $key = urldecode($path[$i]); - $val = isset($path[$i + 1]) ? urldecode($path[$i + 1]) : null; - $params[$key] = $val; + $val = isset($path[$i + 1]) ? $path[$i + 1] : null; + $params[$key] = urldecode($val); } } diff --git a/library/Zend/Rest/Server.php b/library/Zend/Rest/Server.php index 34cd4923d..9c2e48f6a 100644 --- a/library/Zend/Rest/Server.php +++ b/library/Zend/Rest/Server.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Server.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Server implements Zend_Server_Interface diff --git a/library/Zend/Rest/Server/Exception.php b/library/Zend/Rest/Server/Exception.php index b8a8751ee..a6cbd6d43 100644 --- a/library/Zend/Rest/Server/Exception.php +++ b/library/Zend/Rest/Server/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Server_Exception extends Zend_Rest_Exception diff --git a/library/Zend/Search/Exception.php b/library/Zend/Search/Exception.php index 6b375ac91..db4e4d2a9 100644 --- a/library/Zend/Search/Exception.php +++ b/library/Zend/Search/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Exception extends Zend_Exception diff --git a/library/Zend/Search/Lucene.php b/library/Zend/Search/Lucene.php index e493df864..dc55e93b2 100644 --- a/library/Zend/Search/Lucene.php +++ b/library/Zend/Search/Lucene.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lucene.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: Lucene.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -89,7 +89,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene implements Zend_Search_Lucene_Interface diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer.php b/library/Zend/Search/Lucene/Analysis/Analyzer.php index 8283782cd..5daf0985a 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Analyzer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Analyzer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -63,7 +63,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php index 9c5d3c998..5ec0e4f40 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Common.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Common.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Analysis_Analyzer_Common extends Zend_Search_Lucene_Analysis_Analyzer diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php index 94a5146e6..d1b9060d6 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Text.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Text.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php index 564b99c0b..ccc38ad63 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php index 4a4fb9635..f6816e155 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TextNum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TextNum.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php index 3e3222b09..2ef9a5cc0 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php index 6d5324e30..3d6e12ea0 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utf8.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Utf8.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php index e6dfe2601..f354723a0 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8/CaseInsensitive.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php index 24cf67bbf..068e39512 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utf8Num.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Utf8Num.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php index b03da7606..c3091d65e 100644 --- a/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php +++ b/library/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num/CaseInsensitive.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CaseInsensitive.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CaseInsensitive.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/Token.php b/library/Zend/Search/Lucene/Analysis/Token.php index b31513595..bae661554 100644 --- a/library/Zend/Search/Lucene/Analysis/Token.php +++ b/library/Zend/Search/Lucene/Analysis/Token.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Token.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Token.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Analysis_Token diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter.php b/library/Zend/Search/Lucene/Analysis/TokenFilter.php index a93544dc3..02074e76a 100644 --- a/library/Zend/Search/Lucene/Analysis/TokenFilter.php +++ b/library/Zend/Search/Lucene/Analysis/TokenFilter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TokenFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TokenFilter.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Analysis_TokenFilter diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php index e4d50f53f..bc2c3979e 100644 --- a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php +++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LowerCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LowerCase.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php index dfd062f60..99c70dbd0 100644 --- a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php +++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LowerCaseUtf8.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LowerCaseUtf8.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php index 0dc316cd8..dbca1cd42 100644 --- a/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php +++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ShortWords.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ShortWords.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php index 3b3f71ade..ea883e633 100644 --- a/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php +++ b/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StopWords.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StopWords.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Analysis_TokenFilter */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Analysis - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Search/Lucene/Document.php b/library/Zend/Search/Lucene/Document.php index 2478496a9..2cb409cf9 100644 --- a/library/Zend/Search/Lucene/Document.php +++ b/library/Zend/Search/Lucene/Document.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Document.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Document.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document @@ -57,7 +57,7 @@ class Zend_Search_Lucene_Document * Proxy method for getFieldValue(), provides more convenient access to * the string value of a field. * - * @param $offset + * @param string $offset * @return string */ public function __get($offset) diff --git a/library/Zend/Search/Lucene/Document/Docx.php b/library/Zend/Search/Lucene/Document/Docx.php index 4374419c5..f11808872 100644 --- a/library/Zend/Search/Lucene/Document/Docx.php +++ b/library/Zend/Search/Lucene/Document/Docx.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Docx.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Document_OpenXml */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Docx extends Zend_Search_Lucene_Document_OpenXml { diff --git a/library/Zend/Search/Lucene/Document/Exception.php b/library/Zend/Search/Lucene/Document/Exception.php index e35ce46fc..1dd6a8624 100644 --- a/library/Zend/Search/Lucene/Document/Exception.php +++ b/library/Zend/Search/Lucene/Document/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Exception extends Zend_Search_Lucene_Exception diff --git a/library/Zend/Search/Lucene/Document/Html.php b/library/Zend/Search/Lucene/Document/Html.php index b1b422541..6718a8a78 100644 --- a/library/Zend/Search/Lucene/Document/Html.php +++ b/library/Zend/Search/Lucene/Document/Html.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Html.php 23392 2010-11-19 09:53:16Z ramon $ + * @version $Id: Html.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Html extends Zend_Search_Lucene_Document @@ -438,7 +438,7 @@ public function highlightExtended($words, $callback, $params = array()) if (!is_callable($callback)) { // require_once 'Zend/Search/Lucene/Exception.php'; - throw new Zend_Search_Lucene_Exception('$viewHelper parameter mast be a View Helper name, View Helper object or callback.'); + throw new Zend_Search_Lucene_Exception('$viewHelper parameter must be a View Helper name, View Helper object or callback.'); } $xpath = new DOMXPath($this->_doc); diff --git a/library/Zend/Search/Lucene/Document/OpenXml.php b/library/Zend/Search/Lucene/Document/OpenXml.php index 812b9ee17..6f72438a1 100644 --- a/library/Zend/Search/Lucene/Document/OpenXml.php +++ b/library/Zend/Search/Lucene/Document/OpenXml.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenXml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OpenXml.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Document_OpenXml extends Zend_Search_Lucene_Document diff --git a/library/Zend/Search/Lucene/Document/Pptx.php b/library/Zend/Search/Lucene/Document/Pptx.php index 43499d919..9d63809ff 100644 --- a/library/Zend/Search/Lucene/Document/Pptx.php +++ b/library/Zend/Search/Lucene/Document/Pptx.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pptx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pptx.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Pptx extends Zend_Search_Lucene_Document_OpenXml diff --git a/library/Zend/Search/Lucene/Document/Xlsx.php b/library/Zend/Search/Lucene/Document/Xlsx.php index b1aed3168..5dab842d3 100644 --- a/library/Zend/Search/Lucene/Document/Xlsx.php +++ b/library/Zend/Search/Lucene/Document/Xlsx.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xlsx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Xlsx.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Document_Xlsx extends Zend_Search_Lucene_Document_OpenXml diff --git a/library/Zend/Search/Lucene/Exception.php b/library/Zend/Search/Lucene/Exception.php index 2d86edcef..d15e880af 100644 --- a/library/Zend/Search/Lucene/Exception.php +++ b/library/Zend/Search/Lucene/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Exception extends Zend_Search_Exception diff --git a/library/Zend/Search/Lucene/FSM.php b/library/Zend/Search/Lucene/FSM.php index fde4df46b..4a89aef5c 100644 --- a/library/Zend/Search/Lucene/FSM.php +++ b/library/Zend/Search/Lucene/FSM.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FSM.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FSM.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_FSMAction */ @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_FSM diff --git a/library/Zend/Search/Lucene/FSMAction.php b/library/Zend/Search/Lucene/FSMAction.php index 54fa2b38f..d8a45acd4 100644 --- a/library/Zend/Search/Lucene/FSMAction.php +++ b/library/Zend/Search/Lucene/FSMAction.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FSMAction.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FSMAction.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_FSMAction diff --git a/library/Zend/Search/Lucene/Field.php b/library/Zend/Search/Lucene/Field.php index 3e2679810..16a9bfdda 100644 --- a/library/Zend/Search/Lucene/Field.php +++ b/library/Zend/Search/Lucene/Field.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Field.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Field.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Document - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Field diff --git a/library/Zend/Search/Lucene/Index/DictionaryLoader.php b/library/Zend/Search/Lucene/Index/DictionaryLoader.php index 4ce9a3528..af0a12f39 100644 --- a/library/Zend/Search/Lucene/Index/DictionaryLoader.php +++ b/library/Zend/Search/Lucene/Index/DictionaryLoader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DictionaryLoader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DictionaryLoader.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_DictionaryLoader diff --git a/library/Zend/Search/Lucene/Index/DocsFilter.php b/library/Zend/Search/Lucene/Index/DocsFilter.php index bd5262321..8b24299f6 100644 --- a/library/Zend/Search/Lucene/Index/DocsFilter.php +++ b/library/Zend/Search/Lucene/Index/DocsFilter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocsFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocsFilter.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_DocsFilter diff --git a/library/Zend/Search/Lucene/Index/FieldInfo.php b/library/Zend/Search/Lucene/Index/FieldInfo.php index 47b2d2149..defab619a 100644 --- a/library/Zend/Search/Lucene/Index/FieldInfo.php +++ b/library/Zend/Search/Lucene/Index/FieldInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FieldInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FieldInfo.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_FieldInfo diff --git a/library/Zend/Search/Lucene/Index/SegmentInfo.php b/library/Zend/Search/Lucene/Index/SegmentInfo.php index f379e0fd5..c3b682582 100644 --- a/library/Zend/Search/Lucene/Index/SegmentInfo.php +++ b/library/Zend/Search/Lucene/Index/SegmentInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentInfo.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: SegmentInfo.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Index_TermsStream_Interface */ @@ -40,7 +40,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentInfo implements Zend_Search_Lucene_Index_TermsStream_Interface diff --git a/library/Zend/Search/Lucene/Index/SegmentMerger.php b/library/Zend/Search/Lucene/Index/SegmentMerger.php index 684ee838c..3689563a4 100644 --- a/library/Zend/Search/Lucene/Index/SegmentMerger.php +++ b/library/Zend/Search/Lucene/Index/SegmentMerger.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentMerger.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SegmentMerger.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Index_SegmentInfo */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentMerger diff --git a/library/Zend/Search/Lucene/Index/SegmentWriter.php b/library/Zend/Search/Lucene/Index/SegmentWriter.php index ce7d8a315..7de3a149d 100644 --- a/library/Zend/Search/Lucene/Index/SegmentWriter.php +++ b/library/Zend/Search/Lucene/Index/SegmentWriter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SegmentWriter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SegmentWriter.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Index_SegmentWriter diff --git a/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php b/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php index b38de6eca..0bd599359 100644 --- a/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php +++ b/library/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocumentWriter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocumentWriter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Index_SegmentWriter */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentWriter_DocumentWriter extends Zend_Search_Lucene_Index_SegmentWriter diff --git a/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php b/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php index c79a383f8..1de344491 100644 --- a/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php +++ b/library/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StreamWriter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StreamWriter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Index_SegmentWriter */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_SegmentWriter_StreamWriter extends Zend_Search_Lucene_Index_SegmentWriter diff --git a/library/Zend/Search/Lucene/Index/Term.php b/library/Zend/Search/Lucene/Index/Term.php index 333e4a5f1..b531e6ec5 100644 --- a/library/Zend/Search/Lucene/Index/Term.php +++ b/library/Zend/Search/Lucene/Index/Term.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_Term diff --git a/library/Zend/Search/Lucene/Index/TermInfo.php b/library/Zend/Search/Lucene/Index/TermInfo.php index 679211430..ada102154 100644 --- a/library/Zend/Search/Lucene/Index/TermInfo.php +++ b/library/Zend/Search/Lucene/Index/TermInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TermInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TermInfo.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_TermInfo diff --git a/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php b/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php index dd0dcfdd4..3dc357052 100644 --- a/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php +++ b/library/Zend/Search/Lucene/Index/TermsPriorityQueue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TermsPriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TermsPriorityQueue.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_PriorityQueue */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_TermsPriorityQueue extends Zend_Search_Lucene_PriorityQueue diff --git a/library/Zend/Search/Lucene/Index/TermsStream/Interface.php b/library/Zend/Search/Lucene/Index/TermsStream/Interface.php index 64d246c30..118d6a7b2 100644 --- a/library/Zend/Search/Lucene/Index/TermsStream/Interface.php +++ b/library/Zend/Search/Lucene/Index/TermsStream/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Search_Lucene_Index_TermsStream_Interface diff --git a/library/Zend/Search/Lucene/Index/Writer.php b/library/Zend/Search/Lucene/Index/Writer.php index 75220a9d8..1b8a6f429 100644 --- a/library/Zend/Search/Lucene/Index/Writer.php +++ b/library/Zend/Search/Lucene/Index/Writer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Writer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Writer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Index_Writer diff --git a/library/Zend/Search/Lucene/Interface.php b/library/Zend/Search/Lucene/Interface.php index 53891efdd..0353ab88b 100644 --- a/library/Zend/Search/Lucene/Interface.php +++ b/library/Zend/Search/Lucene/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -39,7 +39,7 @@ /** * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Search_Lucene_Interface extends Zend_Search_Lucene_Index_TermsStream_Interface diff --git a/library/Zend/Search/Lucene/LockManager.php b/library/Zend/Search/Lucene/LockManager.php index 59e1a1a9a..1d7562a29 100644 --- a/library/Zend/Search/Lucene/LockManager.php +++ b/library/Zend/Search/Lucene/LockManager.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LockManager.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LockManager.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Storage_Directory */ @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_LockManager diff --git a/library/Zend/Search/Lucene/MultiSearcher.php b/library/Zend/Search/Lucene/MultiSearcher.php index af90093fe..2246558fc 100644 --- a/library/Zend/Search/Lucene/MultiSearcher.php +++ b/library/Zend/Search/Lucene/MultiSearcher.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiSearcher.php 22967 2010-09-18 18:53:58Z ramon $ + * @version $Id: MultiSearcher.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_Interface diff --git a/library/Zend/Search/Lucene/PriorityQueue.php b/library/Zend/Search/Lucene/PriorityQueue.php index a34913635..1ac0cb206 100644 --- a/library/Zend/Search/Lucene/PriorityQueue.php +++ b/library/Zend/Search/Lucene/PriorityQueue.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PriorityQueue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PriorityQueue.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_PriorityQueue diff --git a/library/Zend/Search/Lucene/Proxy.php b/library/Zend/Search/Lucene/Proxy.php index 33960428a..529eba6f8 100644 --- a/library/Zend/Search/Lucene/Proxy.php +++ b/library/Zend/Search/Lucene/Proxy.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Proxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Proxy.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Interface */ @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Search_Lucene - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface diff --git a/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php b/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php index ea63d0c31..64d2637ec 100644 --- a/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php +++ b/library/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BooleanExpressionRecognizer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BooleanExpressionRecognizer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_BooleanExpressionRecognizer extends Zend_Search_Lucene_FSM diff --git a/library/Zend/Search/Lucene/Search/Highlighter/Default.php b/library/Zend/Search/Lucene/Search/Highlighter/Default.php index 1ef411aaf..1397c0f66 100644 --- a/library/Zend/Search/Lucene/Search/Highlighter/Default.php +++ b/library/Zend/Search/Lucene/Search/Highlighter/Default.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Search_Lucene_Search_Highlighter_Interface */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Highlighter_Default implements Zend_Search_Lucene_Search_Highlighter_Interface diff --git a/library/Zend/Search/Lucene/Search/Highlighter/Interface.php b/library/Zend/Search/Lucene/Search/Highlighter/Interface.php index f12e2d3f1..68d71998e 100644 --- a/library/Zend/Search/Lucene/Search/Highlighter/Interface.php +++ b/library/Zend/Search/Lucene/Search/Highlighter/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Search_Lucene_Search_Highlighter_Interface diff --git a/library/Zend/Search/Lucene/Search/Query.php b/library/Zend/Search/Lucene/Search/Query.php index f58803cb1..4b571f65f 100644 --- a/library/Zend/Search/Lucene/Search/Query.php +++ b/library/Zend/Search/Lucene/Search/Query.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Boolean.php b/library/Zend/Search/Lucene/Search/Query/Boolean.php index d6e341805..f0dfcf233 100644 --- a/library/Zend/Search/Lucene/Search/Query/Boolean.php +++ b/library/Zend/Search/Lucene/Search/Query/Boolean.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Boolean extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Empty.php b/library/Zend/Search/Lucene/Search/Query/Empty.php index 02a055581..91f6c05c7 100644 --- a/library/Zend/Search/Lucene/Search/Query/Empty.php +++ b/library/Zend/Search/Lucene/Search/Query/Empty.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Empty.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Empty.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Empty extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Fuzzy.php b/library/Zend/Search/Lucene/Search/Query/Fuzzy.php index 7e646e936..9bd922540 100644 --- a/library/Zend/Search/Lucene/Search/Query/Fuzzy.php +++ b/library/Zend/Search/Lucene/Search/Query/Fuzzy.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fuzzy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fuzzy.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Fuzzy extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Insignificant.php b/library/Zend/Search/Lucene/Search/Query/Insignificant.php index acdd21fcd..2d40cdec0 100644 --- a/library/Zend/Search/Lucene/Search/Query/Insignificant.php +++ b/library/Zend/Search/Lucene/Search/Query/Insignificant.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Insignificant.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Insignificant.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Insignificant extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/MultiTerm.php b/library/Zend/Search/Lucene/Search/Query/MultiTerm.php index 4f83d294f..f0a83eb2f 100644 --- a/library/Zend/Search/Lucene/Search/Query/MultiTerm.php +++ b/library/Zend/Search/Lucene/Search/Query/MultiTerm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiTerm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MultiTerm.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_MultiTerm extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Phrase.php b/library/Zend/Search/Lucene/Search/Query/Phrase.php index a0889d149..68c089a28 100644 --- a/library/Zend/Search/Lucene/Search/Query/Phrase.php +++ b/library/Zend/Search/Lucene/Search/Query/Phrase.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Phrase extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing.php index abd994fed..91189e7c9 100644 --- a/library/Zend/Search/Lucene/Search/Query/Preprocessing.php +++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Preprocessing.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Preprocessing.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Query_Preprocessing extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php index 237f1da9d..68226395a 100644 --- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php +++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Fuzzy.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fuzzy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fuzzy.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Preprocessing_Fuzzy extends Zend_Search_Lucene_Search_Query_Preprocessing diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php index 2503f581f..92503bcaa 100644 --- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php +++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Phrase.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Preprocessing_Phrase extends Zend_Search_Lucene_Search_Query_Preprocessing diff --git a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php index 9b955edc1..ba7f40ef3 100644 --- a/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php +++ b/library/Zend/Search/Lucene/Search/Query/Preprocessing/Term.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @package Zend_Search_Lucene * @subpackage Search * @internal - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Preprocessing_Term extends Zend_Search_Lucene_Search_Query_Preprocessing diff --git a/library/Zend/Search/Lucene/Search/Query/Range.php b/library/Zend/Search/Lucene/Search/Query/Range.php index 358fc7b99..6227a3042 100644 --- a/library/Zend/Search/Lucene/Search/Query/Range.php +++ b/library/Zend/Search/Lucene/Search/Query/Range.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Range.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: Range.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Range extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Term.php b/library/Zend/Search/Lucene/Search/Query/Term.php index 228b3ba43..b6a79704f 100644 --- a/library/Zend/Search/Lucene/Search/Query/Term.php +++ b/library/Zend/Search/Lucene/Search/Query/Term.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Term extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/Query/Wildcard.php b/library/Zend/Search/Lucene/Search/Query/Wildcard.php index 703452330..a0d877d45 100644 --- a/library/Zend/Search/Lucene/Search/Query/Wildcard.php +++ b/library/Zend/Search/Lucene/Search/Query/Wildcard.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Wildcard.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Wildcard.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Query_Wildcard extends Zend_Search_Lucene_Search_Query diff --git a/library/Zend/Search/Lucene/Search/QueryEntry.php b/library/Zend/Search/Lucene/Search/QueryEntry.php index 41c03aeb7..a686af147 100644 --- a/library/Zend/Search/Lucene/Search/QueryEntry.php +++ b/library/Zend/Search/Lucene/Search/QueryEntry.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryEntry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryEntry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_QueryEntry diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php b/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php index 43bd47b87..3dc959903 100644 --- a/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php +++ b/library/Zend/Search/Lucene/Search/QueryEntry/Phrase.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Search_QueryEntry */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryEntry_Phrase extends Zend_Search_Lucene_Search_QueryEntry diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php b/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php index 072881ad7..47402e78b 100644 --- a/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php +++ b/library/Zend/Search/Lucene/Search/QueryEntry/Subquery.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Subquery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Subquery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Search_QueryEntry */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryEntry_Subquery extends Zend_Search_Lucene_Search_QueryEntry diff --git a/library/Zend/Search/Lucene/Search/QueryEntry/Term.php b/library/Zend/Search/Lucene/Search/QueryEntry/Term.php index e11a80b79..cd86bf1a1 100644 --- a/library/Zend/Search/Lucene/Search/QueryEntry/Term.php +++ b/library/Zend/Search/Lucene/Search/QueryEntry/Term.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Search_QueryEntry */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryEntry_Term extends Zend_Search_Lucene_Search_QueryEntry diff --git a/library/Zend/Search/Lucene/Search/QueryHit.php b/library/Zend/Search/Lucene/Search/QueryHit.php index fb1a53e14..718b7417b 100644 --- a/library/Zend/Search/Lucene/Search/QueryHit.php +++ b/library/Zend/Search/Lucene/Search/QueryHit.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryHit.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryHit.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryHit diff --git a/library/Zend/Search/Lucene/Search/QueryLexer.php b/library/Zend/Search/Lucene/Search/QueryLexer.php index c07a87b7d..cf9fb4f6b 100644 --- a/library/Zend/Search/Lucene/Search/QueryLexer.php +++ b/library/Zend/Search/Lucene/Search/QueryLexer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryLexer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryLexer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_FSM */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryLexer extends Zend_Search_Lucene_FSM diff --git a/library/Zend/Search/Lucene/Search/QueryParser.php b/library/Zend/Search/Lucene/Search/QueryParser.php index f784d174b..07975ba37 100644 --- a/library/Zend/Search/Lucene/Search/QueryParser.php +++ b/library/Zend/Search/Lucene/Search/QueryParser.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryParser.php 21637 2010-03-24 17:52:04Z alexander $ + * @version $Id: QueryParser.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryParser extends Zend_Search_Lucene_FSM diff --git a/library/Zend/Search/Lucene/Search/QueryParserContext.php b/library/Zend/Search/Lucene/Search/QueryParserContext.php index 0d8f6c1e6..b3809bcec 100644 --- a/library/Zend/Search/Lucene/Search/QueryParserContext.php +++ b/library/Zend/Search/Lucene/Search/QueryParserContext.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryParserContext.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryParserContext.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Search_QueryToken */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryParserContext diff --git a/library/Zend/Search/Lucene/Search/QueryParserException.php b/library/Zend/Search/Lucene/Search/QueryParserException.php index 200b8bba2..be86901bd 100644 --- a/library/Zend/Search/Lucene/Search/QueryParserException.php +++ b/library/Zend/Search/Lucene/Search/QueryParserException.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryParserException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryParserException.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * * Special exception type, which may be used to intercept wrong user input diff --git a/library/Zend/Search/Lucene/Search/QueryToken.php b/library/Zend/Search/Lucene/Search/QueryToken.php index ba3126c13..5eb0953f3 100644 --- a/library/Zend/Search/Lucene/Search/QueryToken.php +++ b/library/Zend/Search/Lucene/Search/QueryToken.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryToken.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryToken.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_QueryToken diff --git a/library/Zend/Search/Lucene/Search/Similarity.php b/library/Zend/Search/Lucene/Search/Similarity.php index 6240cb2d3..2f36dffbf 100644 --- a/library/Zend/Search/Lucene/Search/Similarity.php +++ b/library/Zend/Search/Lucene/Search/Similarity.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Similarity.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Similarity.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Similarity diff --git a/library/Zend/Search/Lucene/Search/Similarity/Default.php b/library/Zend/Search/Lucene/Search/Similarity/Default.php index 0f1b2db39..1d2251268 100644 --- a/library/Zend/Search/Lucene/Search/Similarity/Default.php +++ b/library/Zend/Search/Lucene/Search/Similarity/Default.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Default.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Default.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Similarity_Default extends Zend_Search_Lucene_Search_Similarity diff --git a/library/Zend/Search/Lucene/Search/Weight.php b/library/Zend/Search/Lucene/Search/Weight.php index bcaf76624..dfd9e9968 100644 --- a/library/Zend/Search/Lucene/Search/Weight.php +++ b/library/Zend/Search/Lucene/Search/Weight.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weight.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weight.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Search_Weight @@ -78,7 +78,7 @@ abstract public function sumOfSquaredWeights(); /** * Assigns the query normalization factor to this. * - * @param $norm + * @param float $norm */ abstract public function normalize($norm); } diff --git a/library/Zend/Search/Lucene/Search/Weight/Boolean.php b/library/Zend/Search/Lucene/Search/Weight/Boolean.php index 1e5c9556f..1962e44d1 100644 --- a/library/Zend/Search/Lucene/Search/Weight/Boolean.php +++ b/library/Zend/Search/Lucene/Search/Weight/Boolean.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Boolean extends Zend_Search_Lucene_Search_Weight diff --git a/library/Zend/Search/Lucene/Search/Weight/Empty.php b/library/Zend/Search/Lucene/Search/Weight/Empty.php index b27b8ad4a..4b48be938 100644 --- a/library/Zend/Search/Lucene/Search/Weight/Empty.php +++ b/library/Zend/Search/Lucene/Search/Weight/Empty.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Empty.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Empty.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Empty extends Zend_Search_Lucene_Search_Weight diff --git a/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php b/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php index b643098f6..ada246aa6 100644 --- a/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php +++ b/library/Zend/Search/Lucene/Search/Weight/MultiTerm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiTerm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MultiTerm.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_MultiTerm extends Zend_Search_Lucene_Search_Weight diff --git a/library/Zend/Search/Lucene/Search/Weight/Phrase.php b/library/Zend/Search/Lucene/Search/Weight/Phrase.php index 265040688..c342ff2b0 100644 --- a/library/Zend/Search/Lucene/Search/Weight/Phrase.php +++ b/library/Zend/Search/Lucene/Search/Weight/Phrase.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phrase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phrase.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Phrase extends Zend_Search_Lucene_Search_Weight diff --git a/library/Zend/Search/Lucene/Search/Weight/Term.php b/library/Zend/Search/Lucene/Search/Weight/Term.php index 00cab3e09..06a79c028 100644 --- a/library/Zend/Search/Lucene/Search/Weight/Term.php +++ b/library/Zend/Search/Lucene/Search/Weight/Term.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Term.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Term.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Search - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Search_Weight_Term extends Zend_Search_Lucene_Search_Weight diff --git a/library/Zend/Search/Lucene/Storage/Directory.php b/library/Zend/Search/Lucene/Storage/Directory.php index c83c253a4..3c2a7e450 100644 --- a/library/Zend/Search/Lucene/Storage/Directory.php +++ b/library/Zend/Search/Lucene/Storage/Directory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Directory.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Storage_Directory diff --git a/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php b/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php index 57b0e2549..340352c42 100644 --- a/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php +++ b/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filesystem.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Filesystem.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Storage_Directory_Filesystem extends Zend_Search_Lucene_Storage_Directory @@ -206,7 +206,8 @@ public function deleteFile($filename) unset($this->_fileHandlers[$filename]); global $php_errormsg; - $trackErrors = ini_get('track_errors'); ini_set('track_errors', '1'); + $trackErrors = ini_get('track_errors'); + ini_set('track_errors', '1'); if (!@unlink($this->_dirPath . '/' . $filename)) { ini_set('track_errors', $trackErrors); // require_once 'Zend/Search/Lucene/Exception.php'; diff --git a/library/Zend/Search/Lucene/Storage/File.php b/library/Zend/Search/Lucene/Storage/File.php index 92542a290..d194a8614 100644 --- a/library/Zend/Search/Lucene/Storage/File.php +++ b/library/Zend/Search/Lucene/Storage/File.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Search_Lucene_Storage_File diff --git a/library/Zend/Search/Lucene/Storage/File/Filesystem.php b/library/Zend/Search/Lucene/Storage/File/Filesystem.php index 46492d8fd..1d9ab9c93 100644 --- a/library/Zend/Search/Lucene/Storage/File/Filesystem.php +++ b/library/Zend/Search/Lucene/Storage/File/Filesystem.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Filesystem.php 23395 2010-11-19 15:30:47Z alexander $ + * @version $Id: Filesystem.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Storage_File */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Storage_File_Filesystem extends Zend_Search_Lucene_Storage_File diff --git a/library/Zend/Search/Lucene/Storage/File/Memory.php b/library/Zend/Search/Lucene/Storage/File/Memory.php index 8f0b96e3a..f638fa618 100644 --- a/library/Zend/Search/Lucene/Storage/File/Memory.php +++ b/library/Zend/Search/Lucene/Storage/File/Memory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Memory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Storage_File */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_Storage_File_Memory extends Zend_Search_Lucene_Storage_File diff --git a/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php b/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php index 50b81c5f7..304153651 100644 --- a/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php +++ b/library/Zend/Search/Lucene/TermStreamsPriorityQueue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TermStreamsPriorityQueue.php 22987 2010-09-21 10:39:53Z alexander $ + * @version $Id: TermStreamsPriorityQueue.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Search_Lucene_Index_TermsStream_Interface */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Search_Lucene * @subpackage Index - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Search_Lucene_TermStreamsPriorityQueue implements Zend_Search_Lucene_Index_TermsStream_Interface diff --git a/library/Zend/Serializer.php b/library/Zend/Serializer.php index ba40bef44..cb1bf15a3 100644 --- a/library/Zend/Serializer.php +++ b/library/Zend/Serializer.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Serializer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Loader_PluginLoader */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer @@ -51,7 +51,7 @@ class Zend_Serializer * @param array |Zend_Config $opts Serializer options * @return Zend_Serializer_Adapter_AdapterInterface */ - public static function factory($adapterName, $opts = array()) + public static function factory($adapterName, $opts = array()) { if ($adapterName instanceof Zend_Serializer_Adapter_AdapterInterface) { return $adapterName; // $adapterName is already an adapter object @@ -80,7 +80,7 @@ public static function factory($adapterName, $opts = array()) * * @return Zend_Loader_PluginLoader */ - public static function getAdapterLoader() + public static function getAdapterLoader() { if (self::$_adapterLoader === null) { self::$_adapterLoader = self::_getDefaultAdapterLoader(); @@ -94,11 +94,11 @@ public static function getAdapterLoader() * @param Zend_Loader_PluginLoader $pluginLoader * @return void */ - public static function setAdapterLoader(Zend_Loader_PluginLoader $pluginLoader) + public static function setAdapterLoader(Zend_Loader_PluginLoader $pluginLoader) { self::$_adapterLoader = $pluginLoader; } - + /** * Resets the internal adapter plugin loader * @@ -109,7 +109,7 @@ public static function resetAdapterLoader() self::$_adapterLoader = self::_getDefaultAdapterLoader(); return self::$_adapterLoader; } - + /** * Returns a default adapter plugin loader * @@ -128,7 +128,7 @@ protected static function _getDefaultAdapterLoader() * @param string|Zend_Serializer_Adapter_AdapterInterface $adapter * @param array|Zend_Config $options */ - public static function setDefaultAdapter($adapter, $options = array()) + public static function setDefaultAdapter($adapter, $options = array()) { self::$_defaultAdapter = self::factory($adapter, $options); } @@ -138,7 +138,7 @@ public static function setDefaultAdapter($adapter, $options = array()) * * @return Zend_Serializer_Adapter_AdapterInterface */ - public static function getDefaultAdapter() + public static function getDefaultAdapter() { if (!self::$_defaultAdapter instanceof Zend_Serializer_Adapter_AdapterInterface) { self::setDefaultAdapter(self::$_defaultAdapter); @@ -154,7 +154,7 @@ public static function getDefaultAdapter() * @return string * @throws Zend_Serializer_Exception */ - public static function serialize($value, array $options = array()) + public static function serialize($value, array $options = array()) { if (isset($options['adapter'])) { $adapter = self::factory($options['adapter']); @@ -174,7 +174,7 @@ public static function serialize($value, array $options = array()) * @return mixed * @throws Zend_Serializer_Exception */ - public static function unserialize($serialized, array $options = array()) + public static function unserialize($serialized, array $options = array()) { if (isset($options['adapter'])) { $adapter = self::factory($options['adapter']); diff --git a/library/Zend/Serializer/Adapter/AdapterAbstract.php b/library/Zend/Serializer/Adapter/AdapterAbstract.php index f14370595..6c91c20c4 100644 --- a/library/Zend/Serializer/Adapter/AdapterAbstract.php +++ b/library/Zend/Serializer/Adapter/AdapterAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAbstract.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: AdapterAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterInterface */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Serializer_Adapter_AdapterAbstract implements Zend_Serializer_Adapter_AdapterInterface @@ -44,7 +44,7 @@ abstract class Zend_Serializer_Adapter_AdapterAbstract implements Zend_Serialize * * @param array|Zend_Config $opts Serializer options */ - public function __construct($opts = array()) + public function __construct($opts = array()) { $this->setOptions($opts); } @@ -55,7 +55,7 @@ public function __construct($opts = array()) * @param array|Zend_Config $opts Serializer options * @return Zend_Serializer_Adapter_AdapterAbstract */ - public function setOptions($opts) + public function setOptions($opts) { if ($opts instanceof Zend_Config) { $opts = $opts->toArray(); @@ -76,7 +76,7 @@ public function setOptions($opts) * @param mixed $value Option value * @return Zend_Serializer_Adapter_AdapterAbstract */ - public function setOption($name, $value) + public function setOption($name, $value) { $this->_options[(string) $name] = $value; return $this; @@ -87,7 +87,7 @@ public function setOption($name, $value) * * @return array */ - public function getOptions() + public function getOptions() { return $this->_options; } @@ -99,7 +99,7 @@ public function getOptions() * @return mixed * @throws Zend_Serializer_Exception */ - public function getOption($name) + public function getOption($name) { $name = (string) $name; if (!array_key_exists($name, $this->_options)) { diff --git a/library/Zend/Serializer/Adapter/AdapterInterface.php b/library/Zend/Serializer/Adapter/AdapterInterface.php index fdfb6052a..d5535cdcc 100644 --- a/library/Zend/Serializer/Adapter/AdapterInterface.php +++ b/library/Zend/Serializer/Adapter/AdapterInterface.php @@ -15,19 +15,19 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: AdapterInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -interface Zend_Serializer_Adapter_AdapterInterface +interface Zend_Serializer_Adapter_AdapterInterface { /** * Constructor diff --git a/library/Zend/Serializer/Adapter/Amf0.php b/library/Zend/Serializer/Adapter/Amf0.php index 1347d249d..56e8e5b97 100644 --- a/library/Zend/Serializer/Adapter/Amf0.php +++ b/library/Zend/Serializer/Adapter/Amf0.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Amf0.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Amf0.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -39,16 +39,16 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Amf0 extends Zend_Serializer_Adapter_AdapterAbstract { /** * Serialize a PHP value to AMF0 format - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception */ @@ -67,9 +67,9 @@ public function serialize($value, array $opts = array()) /** * Unserialize an AMF0 value to PHP - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return void * @throws Zend_Serializer_Exception */ diff --git a/library/Zend/Serializer/Adapter/Amf3.php b/library/Zend/Serializer/Adapter/Amf3.php index f9077cc60..f2e0a1fd5 100644 --- a/library/Zend/Serializer/Adapter/Amf3.php +++ b/library/Zend/Serializer/Adapter/Amf3.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Amf3.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Amf3.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -39,16 +39,16 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Amf3 extends Zend_Serializer_Adapter_AdapterAbstract { /** * Serialize a PHP value to AMF3 format - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception */ @@ -67,9 +67,9 @@ public function serialize($value, array $opts = array()) /** * Deserialize an AMF3 value to PHP - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception */ diff --git a/library/Zend/Serializer/Adapter/Igbinary.php b/library/Zend/Serializer/Adapter/Igbinary.php index 07d9e96be..248448ef2 100644 --- a/library/Zend/Serializer/Adapter/Igbinary.php +++ b/library/Zend/Serializer/Adapter/Igbinary.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Igbinary.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Igbinary.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Igbinary extends Zend_Serializer_Adapter_AdapterAbstract @@ -39,12 +39,12 @@ class Zend_Serializer_Adapter_Igbinary extends Zend_Serializer_Adapter_AdapterAb /** * Constructor - * - * @param array|Zend_Config $opts + * + * @param array|Zend_Config $opts * @return void * @throws Zend_Serializer_Exception If igbinary extension is not present */ - public function __construct($opts = array()) + public function __construct($opts = array()) { if (!extension_loaded('igbinary')) { // require_once 'Zend/Serializer/Exception.php'; @@ -60,9 +60,9 @@ public function __construct($opts = array()) /** * Serialize PHP value to igbinary - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception on igbinary error */ @@ -79,9 +79,9 @@ public function serialize($value, array $opts = array()) /** * Deserialize igbinary string to PHP value - * - * @param string|binary $serialized - * @param array $opts + * + * @param string|binary $serialized + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on igbinary error */ diff --git a/library/Zend/Serializer/Adapter/Json.php b/library/Zend/Serializer/Adapter/Json.php index 2b90fbf3c..45ea31b50 100644 --- a/library/Zend/Serializer/Adapter/Json.php +++ b/library/Zend/Serializer/Adapter/Json.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Json.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Json extends Zend_Serializer_Adapter_AdapterAbstract @@ -46,9 +46,9 @@ class Zend_Serializer_Adapter_Json extends Zend_Serializer_Adapter_AdapterAbstra /** * Serialize PHP value to JSON - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception on JSON encoding exception */ @@ -66,9 +66,9 @@ public function serialize($value, array $opts = array()) /** * Deserialize JSON to PHP value - * - * @param string $json - * @param array $opts + * + * @param string $json + * @param array $opts * @return mixed */ public function unserialize($json, array $opts = array()) diff --git a/library/Zend/Serializer/Adapter/PhpCode.php b/library/Zend/Serializer/Adapter/PhpCode.php index b5ea6f75b..7aa5a2197 100644 --- a/library/Zend/Serializer/Adapter/PhpCode.php +++ b/library/Zend/Serializer/Adapter/PhpCode.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhpCode.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: PhpCode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -27,16 +27,16 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_PhpCode extends Zend_Serializer_Adapter_AdapterAbstract { /** * Serialize PHP using var_export - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string */ public function serialize($value, array $opts = array()) @@ -48,9 +48,9 @@ public function serialize($value, array $opts = array()) * Deserialize PHP string * * Warning: this uses eval(), and should likely be avoided. - * - * @param string $code - * @param array $opts + * + * @param string $code + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on eval error */ diff --git a/library/Zend/Serializer/Adapter/PhpSerialize.php b/library/Zend/Serializer/Adapter/PhpSerialize.php index 06a128d3f..36770bc81 100644 --- a/library/Zend/Serializer/Adapter/PhpSerialize.php +++ b/library/Zend/Serializer/Adapter/PhpSerialize.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PhpSerialize.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: PhpSerialize.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_PhpSerialize extends Zend_Serializer_Adapter_AdapterAbstract @@ -39,11 +39,11 @@ class Zend_Serializer_Adapter_PhpSerialize extends Zend_Serializer_Adapter_Adapt /** * Constructor - * - * @param array|Zend_Config $opts + * + * @param array|Zend_Config $opts * @return void */ - public function __construct($opts = array()) + public function __construct($opts = array()) { parent::__construct($opts); @@ -54,9 +54,9 @@ public function __construct($opts = array()) /** * Serialize using serialize() - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception On serialize error */ @@ -73,10 +73,10 @@ public function serialize($value, array $opts = array()) /** * Unserialize - * + * * @todo Allow integration with unserialize_callback_func - * @param string $serialized - * @param array $opts + * @param string $serialized + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on unserialize error */ diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php index aa0fbaaac..c34efd0a5 100644 --- a/library/Zend/Serializer/Adapter/PythonPickle.php +++ b/library/Zend/Serializer/Adapter/PythonPickle.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PythonPickle.php 21187 2010-02-24 01:22:01Z stas $ + * @version $Id: PythonPickle.php 24816 2012-05-24 08:58:32Z mabe $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_AdapterAbstract @@ -296,11 +296,11 @@ protected function _writeGet($id) $this->_pickle .= self::OP_BINGET . chr($id); } else { // LONG_BINGET + pack("_pickle .= self::OP_LONG_BINGET . $idBin; + $this->_pickle .= self::OP_LONG_BINGET . $bin; } } else { $this->_pickle .= self::OP_GET . $id . "\r\n"; @@ -321,11 +321,11 @@ protected function _writePut($id) $this->_pickle .= self::OP_BINPUT . chr($id); } else { // LONG_BINPUT + pack("_pickle .= self::OP_LONG_BINPUT . $idBin; + $this->_pickle .= self::OP_LONG_BINPUT . $bin; } } else { $this->_pickle .= self::OP_PUT . $id . "\r\n"; diff --git a/library/Zend/Serializer/Adapter/Wddx.php b/library/Zend/Serializer/Adapter/Wddx.php index b9d27896f..82a5974d5 100644 --- a/library/Zend/Serializer/Adapter/Wddx.php +++ b/library/Zend/Serializer/Adapter/Wddx.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Wddx.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Wddx.php 25032 2012-08-17 19:45:06Z matthew $ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Serializer * @subpackage Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstract @@ -43,8 +43,8 @@ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstra /** * Constructor - * - * @param array $opts + * + * @param array $opts * @return void * @throws Zend_Serializer_Exception if wddx extension not found */ @@ -60,9 +60,9 @@ public function __construct($opts = array()) /** * Serialize PHP to WDDX - * - * @param mixed $value - * @param array $opts + * + * @param mixed $value + * @param array $opts * @return string * @throws Zend_Serializer_Exception on wddx error */ @@ -86,9 +86,9 @@ public function serialize($value, array $opts = array()) /** * Unserialize from WDDX to PHP - * - * @param string $wddx - * @param array $opts + * + * @param string $wddx + * @param array $opts * @return mixed * @throws Zend_Serializer_Exception on wddx error */ @@ -100,7 +100,19 @@ public function unserialize($wddx, array $opts = array()) // check if the returned NULL is valid // or based on an invalid wddx string try { - $simpleXml = new SimpleXMLElement($wddx); + $oldLibxmlDisableEntityLoader = libxml_disable_entity_loader(true); + $dom = new DOMDocument; + $dom->loadXML($wddx); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + // require_once 'Zend/Serializer/Exception.php'; + throw new Zend_Serializer_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + $simpleXml = simplexml_import_dom($dom); + libxml_disable_entity_loader($oldLibxmlDisableEntityLoader); if (isset($simpleXml->data[0]->null[0])) { return null; // valid null } diff --git a/library/Zend/Serializer/Exception.php b/library/Zend/Serializer/Exception.php index 0cb166b15..45ba27d67 100644 --- a/library/Zend/Serializer/Exception.php +++ b/library/Zend/Serializer/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20574 2010-01-24 17:39:14Z mabe $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Exception */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Serializer - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Serializer_Exception extends Zend_Exception diff --git a/library/Zend/Server/Abstract.php b/library/Zend/Server/Abstract.php index dbf49ecfc..c42a54dfb 100644 --- a/library/Zend/Server/Abstract.php +++ b/library/Zend/Server/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -51,9 +51,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ abstract class Zend_Server_Abstract implements Zend_Server_Interface { diff --git a/library/Zend/Server/Cache.php b/library/Zend/Server/Cache.php index 2857bf649..e25c24b81 100644 --- a/library/Zend/Server/Cache.php +++ b/library/Zend/Server/Cache.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cache.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Cache diff --git a/library/Zend/Server/Definition.php b/library/Zend/Server/Definition.php index fce2db425..353985de5 100644 --- a/library/Zend/Server/Definition.php +++ b/library/Zend/Server/Definition.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Definition.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * @todo Implement iterator * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Definition implements Countable, Iterator diff --git a/library/Zend/Server/Exception.php b/library/Zend/Server/Exception.php index 750a0e654..a38e5cf00 100644 --- a/library/Zend/Server/Exception.php +++ b/library/Zend/Server/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Server * @subpackage Reflection - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Exception extends Zend_Exception { diff --git a/library/Zend/Server/Interface.php b/library/Zend/Server/Interface.php index f40caa5d2..0580d333e 100644 --- a/library/Zend/Server/Interface.php +++ b/library/Zend/Server/Interface.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,9 +23,9 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ interface Zend_Server_Interface { diff --git a/library/Zend/Server/Method/Callback.php b/library/Zend/Server/Method/Callback.php index 7ba180788..824f11a82 100644 --- a/library/Zend/Server/Method/Callback.php +++ b/library/Zend/Server/Method/Callback.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Callback.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Callback diff --git a/library/Zend/Server/Method/Definition.php b/library/Zend/Server/Method/Definition.php index fef526c3b..221eec675 100644 --- a/library/Zend/Server/Method/Definition.php +++ b/library/Zend/Server/Method/Definition.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Definition.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Definition diff --git a/library/Zend/Server/Method/Parameter.php b/library/Zend/Server/Method/Parameter.php index 6163b0bc0..3a54deb5f 100644 --- a/library/Zend/Server/Method/Parameter.php +++ b/library/Zend/Server/Method/Parameter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parameter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Parameter diff --git a/library/Zend/Server/Method/Prototype.php b/library/Zend/Server/Method/Prototype.php index 9b54c48c5..904f759b3 100644 --- a/library/Zend/Server/Method/Prototype.php +++ b/library/Zend/Server/Method/Prototype.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Prototype.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Prototype.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Prototype diff --git a/library/Zend/Server/Reflection.php b/library/Zend/Server/Reflection.php index e019f5cf3..f465f097c 100644 --- a/library/Zend/Server/Reflection.php +++ b/library/Zend/Server/Reflection.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,9 +34,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reflection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reflection.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection { diff --git a/library/Zend/Server/Reflection/Class.php b/library/Zend/Server/Reflection/Class.php index 833db963a..71c5cd7b5 100644 --- a/library/Zend/Server/Reflection/Class.php +++ b/library/Zend/Server/Reflection/Class.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Class.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_Class { diff --git a/library/Zend/Server/Reflection/Exception.php b/library/Zend/Server/Reflection/Exception.php index e4b13018a..b7475b54a 100644 --- a/library/Zend/Server/Reflection/Exception.php +++ b/library/Zend/Server/Reflection/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_Exception extends Zend_Server_Exception { diff --git a/library/Zend/Server/Reflection/Function.php b/library/Zend/Server/Reflection/Function.php index 61885de24..278ee659f 100644 --- a/library/Zend/Server/Reflection/Function.php +++ b/library/Zend/Server/Reflection/Function.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Function.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_Function extends Zend_Server_Reflection_Function_Abstract { diff --git a/library/Zend/Server/Reflection/Function/Abstract.php b/library/Zend/Server/Reflection/Function/Abstract.php index fe367ec87..44fb2f374 100644 --- a/library/Zend/Server/Reflection/Function/Abstract.php +++ b/library/Zend/Server/Reflection/Function/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,9 +46,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23320 2010-11-12 21:57:29Z alexander $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ abstract class Zend_Server_Reflection_Function_Abstract { diff --git a/library/Zend/Server/Reflection/Method.php b/library/Zend/Server/Reflection/Method.php index 9b0c048c9..016aa5258 100644 --- a/library/Zend/Server/Reflection/Method.php +++ b/library/Zend/Server/Reflection/Method.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Method.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_Method extends Zend_Server_Reflection_Function_Abstract { diff --git a/library/Zend/Server/Reflection/Node.php b/library/Zend/Server/Reflection/Node.php index 6c902053a..e36a817f5 100644 --- a/library/Zend/Server/Reflection/Node.php +++ b/library/Zend/Server/Reflection/Node.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -24,8 +24,8 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @version $Id: Node.php 20096 2010-01-06 02:05:09Z bkarwin $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Node.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Reflection_Node diff --git a/library/Zend/Server/Reflection/Parameter.php b/library/Zend/Server/Reflection/Parameter.php index 54fa766b5..75aa64eb9 100644 --- a/library/Zend/Server/Reflection/Parameter.php +++ b/library/Zend/Server/Reflection/Parameter.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Parameter.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_Parameter { diff --git a/library/Zend/Server/Reflection/Prototype.php b/library/Zend/Server/Reflection/Prototype.php index 100986a50..a17ffdf07 100644 --- a/library/Zend/Server/Reflection/Prototype.php +++ b/library/Zend/Server/Reflection/Prototype.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,9 +36,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Prototype.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Prototype.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_Prototype { diff --git a/library/Zend/Server/Reflection/ReturnValue.php b/library/Zend/Server/Reflection/ReturnValue.php index 65c60484c..f4b4a80a3 100644 --- a/library/Zend/Server/Reflection/ReturnValue.php +++ b/library/Zend/Server/Reflection/ReturnValue.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReturnValue.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReturnValue.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Server_Reflection_ReturnValue { diff --git a/library/Zend/Service/Abstract.php b/library/Zend/Service/Abstract.php index 4febeb704..f4f3c066c 100644 --- a/library/Zend/Service/Abstract.php +++ b/library/Zend/Service/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Abstract diff --git a/library/Zend/Service/Akismet.php b/library/Zend/Service/Akismet.php index 35baa89aa..3c2e53efd 100644 --- a/library/Zend/Service/Akismet.php +++ b/library/Zend/Service/Akismet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Akismet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Akismet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Akismet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage Akismet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Akismet extends Zend_Service_Abstract diff --git a/library/Zend/Service/Amazon.php b/library/Zend/Service/Amazon.php index aab7d41c0..f8fa4be4d 100644 --- a/library/Zend/Service/Amazon.php +++ b/library/Zend/Service/Amazon.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Amazon.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Amazon.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon diff --git a/library/Zend/Service/Amazon/Abstract.php b/library/Zend/Service/Amazon/Abstract.php index b09b7172c..f4d373423 100644 --- a/library/Zend/Service/Amazon/Abstract.php +++ b/library/Zend/Service/Amazon/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract diff --git a/library/Zend/Service/Amazon/Accessories.php b/library/Zend/Service/Amazon/Accessories.php index 8e1eb2cda..a2b61a7c5 100644 --- a/library/Zend/Service/Amazon/Accessories.php +++ b/library/Zend/Service/Amazon/Accessories.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Accessories.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Accessories.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Accessories diff --git a/library/Zend/Service/Amazon/Authentication.php b/library/Zend/Service/Amazon/Authentication.php index b46e41624..3809952aa 100644 --- a/library/Zend/Service/Amazon/Authentication.php +++ b/library/Zend/Service/Amazon/Authentication.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Authentication @@ -31,13 +31,13 @@ abstract class Zend_Service_Amazon_Authentication protected $_accessKey; protected $_secretKey; protected $_apiVersion; - + /** * Constructor - * - * @param string $accessKey - * @param string $secretKey - * @param string $apiVersion + * + * @param string $accessKey + * @param string $secretKey + * @param string $apiVersion * @return void */ public function __construct($accessKey, $secretKey, $apiVersion) @@ -46,36 +46,36 @@ public function __construct($accessKey, $secretKey, $apiVersion) $this->setSecretKey($secretKey); $this->setApiVersion($apiVersion); } - + /** * Set access key - * - * @param string $accessKey + * + * @param string $accessKey * @return void */ - public function setAccessKey($accessKey) + public function setAccessKey($accessKey) { $this->_accessKey = $accessKey; } - + /** * Set secret key - * - * @param string $secretKey + * + * @param string $secretKey * @return void */ - public function setSecretKey($secretKey) + public function setSecretKey($secretKey) { $this->_secretKey = $secretKey; } - + /** * Set API version - * - * @param string $apiVersion + * + * @param string $apiVersion * @return void */ - public function setApiVersion($apiVersion) + public function setApiVersion($apiVersion) { $this->_apiVersion = $apiVersion; } diff --git a/library/Zend/Service/Amazon/Authentication/Exception.php b/library/Zend/Service/Amazon/Authentication/Exception.php index 20a5ecab2..57f531e74 100644 --- a/library/Zend/Service/Amazon/Authentication/Exception.php +++ b/library/Zend/Service/Amazon/Authentication/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_Exception extends Zend_Service_Amazon_Exception diff --git a/library/Zend/Service/Amazon/Authentication/S3.php b/library/Zend/Service/Amazon/Authentication/S3.php index f1d31c468..cb6cfbf30 100644 --- a/library/Zend/Service/Amazon/Authentication/S3.php +++ b/library/Zend/Service/Amazon/Authentication/S3.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_S3 extends Zend_Service_Amazon_Authentication @@ -52,9 +52,9 @@ public function generateSignature($method, $path, &$headers) if (! is_array($headers)) { $headers = array($headers); } - + $type = $md5 = $date = ''; - + // Search for the Content-type, Content-MD5 and Date headers foreach ($headers as $key => $val) { if (strcasecmp($key, 'content-type') == 0) { @@ -65,12 +65,12 @@ public function generateSignature($method, $path, &$headers) $date = $val; } } - + // If we have an x-amz-date header, use that instead of the normal Date if (isset($headers['x-amz-date']) && isset($date)) { $date = ''; } - + $sig_str = "$method\n$md5\n$type\n$date\n"; // For x-amz- headers, combine like keys, lowercase them, sort them @@ -92,18 +92,18 @@ public function generateSignature($method, $path, &$headers) $sig_str .= $key . ':' . implode(',', $val) . "\n"; } } - + $sig_str .= '/'.parse_url($path, PHP_URL_PATH); if (strpos($path, '?location') !== false) { $sig_str .= '?location'; - } else + } else if (strpos($path, '?acl') !== false) { $sig_str .= '?acl'; - } else + } else if (strpos($path, '?torrent') !== false) { $sig_str .= '?torrent'; } - + $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_secretKey, 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY)); $headers['Authorization'] = 'AWS ' . $this->_accessKey . ':' . $signature; diff --git a/library/Zend/Service/Amazon/Authentication/V1.php b/library/Zend/Service/Amazon/Authentication/V1.php index f98f4163b..b55b0b136 100644 --- a/library/Zend/Service/Amazon/Authentication/V1.php +++ b/library/Zend/Service/Amazon/Authentication/V1.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_V1 extends Zend_Service_Amazon_Authentication @@ -47,7 +47,7 @@ class Zend_Service_Amazon_Authentication_V1 extends Zend_Service_Amazon_Authenti * Signature Encoding Method */ protected $_signatureMethod = 'HmacSHA256'; - + /** * Generate the required attributes for the signature * @param string $url @@ -64,7 +64,7 @@ public function generateSignature($url, array &$parameters) } $data = $this->_signParameters($url, $parameters); - + return $data; } @@ -102,7 +102,7 @@ protected function _signParameters($url, array &$paramaters) $hmac = Zend_Crypt_Hmac::compute($this->_secretKey, 'SHA1', $data, Zend_Crypt_Hmac::BINARY); $paramaters['Signature'] = base64_encode($hmac); - + return $data; } } diff --git a/library/Zend/Service/Amazon/Authentication/V2.php b/library/Zend/Service/Amazon/Authentication/V2.php index 0a20b0304..f4d032779 100644 --- a/library/Zend/Service/Amazon/Authentication/V2.php +++ b/library/Zend/Service/Amazon/Authentication/V2.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Authentication - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Authentication_V2 extends Zend_Service_Amazon_Authentication @@ -47,7 +47,7 @@ class Zend_Service_Amazon_Authentication_V2 extends Zend_Service_Amazon_Authenti * Signature Encoding Method */ protected $_signatureMethod = 'HmacSHA256'; - + /** * Type of http request * @var string @@ -71,18 +71,18 @@ public function generateSignature($url, array &$parameters) } $data = $this->_signParameters($url, $parameters); - + return $data; } - + /** * Set http request type to POST or GET - * @param $method string + * @param string $method */ public function setHttpMethod($method = "POST") { $this->_httpMethod = strtoupper($method); } - + /** * Get the current http request type * @return string diff --git a/library/Zend/Service/Amazon/CustomerReview.php b/library/Zend/Service/Amazon/CustomerReview.php index 02331b31c..a95c6f25a 100644 --- a/library/Zend/Service/Amazon/CustomerReview.php +++ b/library/Zend/Service/Amazon/CustomerReview.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CustomerReview.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CustomerReview.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_CustomerReview diff --git a/library/Zend/Service/Amazon/Ec2.php b/library/Zend/Service/Amazon/Ec2.php index 099fbcae4..11dcb5834 100644 --- a/library/Zend/Service/Amazon/Ec2.php +++ b/library/Zend/Service/Amazon/Ec2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ec2.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ec2.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2 diff --git a/library/Zend/Service/Amazon/Ec2/Abstract.php b/library/Zend/Service/Amazon/Ec2/Abstract.php index 63fedc4a6..72c599fdb 100644 --- a/library/Zend/Service/Amazon/Ec2/Abstract.php +++ b/library/Zend/Service/Amazon/Ec2/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Availabilityzones.php b/library/Zend/Service/Amazon/Ec2/Availabilityzones.php index d4badab30..41ede8475 100644 --- a/library/Zend/Service/Amazon/Ec2/Availabilityzones.php +++ b/library/Zend/Service/Amazon/Ec2/Availabilityzones.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Availabilityzones.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Availabilityzones.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Availabilityzones extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/CloudWatch.php b/library/Zend/Service/Amazon/Ec2/CloudWatch.php index dd76ea112..22681ad6f 100644 --- a/library/Zend/Service/Amazon/Ec2/CloudWatch.php +++ b/library/Zend/Service/Amazon/Ec2/CloudWatch.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CloudWatch.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CloudWatch.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstract @@ -261,16 +261,16 @@ public function getMetricStatistics(array $options) if(isset($options['StartTime'])) { if(!is_numeric($options['StartTime'])) $options['StartTime'] = strtotime($options['StartTime']); - $options['StartTime'] = gmdate("Y-m-d H:i:s", $options['StartTime']); + $options['StartTime'] = gmdate('c', $options['StartTime']); } else { - $options['StartTime'] = gmdate("Y-m-d H:i:s", strtotime('-1 hour')); + $options['StartTime'] = gmdate('c', strtotime('-1 hour')); } if(isset($options['EndTime'])) { if(!is_numeric($options['EndTime'])) $options['EndTime'] = strtotime($options['EndTime']); - $options['EndTime'] = gmdate("Y-m-d H:i:s", $options['EndTime']); + $options['EndTime'] = gmdate('c', $options['EndTime']); } else { - $options['EndTime'] = gmdate("Y-m-d H:i:s"); + $options['EndTime'] = gmdate('c'); } if(isset($options['Dimensions'])) { @@ -281,7 +281,7 @@ public function getMetricStatistics(array $options) $options['Dimensions.member.' . $x . '.Value'] = $dimVal; $x++; } - + unset($options['Dimensions']); } diff --git a/library/Zend/Service/Amazon/Ec2/Ebs.php b/library/Zend/Service/Amazon/Ec2/Ebs.php index 1723146ea..701b3b173 100644 --- a/library/Zend/Service/Amazon/Ec2/Ebs.php +++ b/library/Zend/Service/Amazon/Ec2/Ebs.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ebs.php 22047 2010-04-28 22:14:51Z shahar $ + * @version $Id: Ebs.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Elasticip.php b/library/Zend/Service/Amazon/Ec2/Elasticip.php index d27c28134..92f414fe6 100644 --- a/library/Zend/Service/Amazon/Ec2/Elasticip.php +++ b/library/Zend/Service/Amazon/Ec2/Elasticip.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Elasticip.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Elasticip.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Elasticip extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Exception.php b/library/Zend/Service/Amazon/Ec2/Exception.php index 65ea74dbd..fbf531b17 100644 --- a/library/Zend/Service/Amazon/Ec2/Exception.php +++ b/library/Zend/Service/Amazon/Ec2/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Exception extends Zend_Service_Amazon_Exception diff --git a/library/Zend/Service/Amazon/Ec2/Image.php b/library/Zend/Service/Amazon/Ec2/Image.php index d50e0343e..d549d798c 100644 --- a/library/Zend/Service/Amazon/Ec2/Image.php +++ b/library/Zend/Service/Amazon/Ec2/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Image extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Instance.php b/library/Zend/Service/Amazon/Ec2/Instance.php index c982ac48f..c94249c62 100644 --- a/library/Zend/Service/Amazon/Ec2/Instance.php +++ b/library/Zend/Service/Amazon/Ec2/Instance.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Instance.php 22046 2010-04-28 22:12:32Z shahar $ + * @version $Id: Instance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php b/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php index a0aa8fa7a..c3539570f 100644 --- a/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php +++ b/library/Zend/Service/Amazon/Ec2/Instance/Reserved.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Reserved.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Reserved.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance_Reserved extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Instance/Windows.php b/library/Zend/Service/Amazon/Ec2/Instance/Windows.php index 5644b0e84..d9a90bf06 100644 --- a/library/Zend/Service/Amazon/Ec2/Instance/Windows.php +++ b/library/Zend/Service/Amazon/Ec2/Instance/Windows.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Windows.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Windows.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,7 +42,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance_Windows extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Keypair.php b/library/Zend/Service/Amazon/Ec2/Keypair.php index a27228bab..11c3778ee 100644 --- a/library/Zend/Service/Amazon/Ec2/Keypair.php +++ b/library/Zend/Service/Amazon/Ec2/Keypair.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Keypair.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Keypair.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Keypair extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Region.php b/library/Zend/Service/Amazon/Ec2/Region.php index 00bea0dbf..c36f97df2 100644 --- a/library/Zend/Service/Amazon/Ec2/Region.php +++ b/library/Zend/Service/Amazon/Ec2/Region.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Region.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Region.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Region extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/Ec2/Response.php b/library/Zend/Service/Amazon/Ec2/Response.php index 1eef6842a..1f5d3b4d9 100644 --- a/library/Zend/Service/Amazon/Ec2/Response.php +++ b/library/Zend/Service/Amazon/Ec2/Response.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Response { diff --git a/library/Zend/Service/Amazon/Ec2/Securitygroups.php b/library/Zend/Service/Amazon/Ec2/Securitygroups.php index 96944cdd3..cd29c10ab 100644 --- a/library/Zend/Service/Amazon/Ec2/Securitygroups.php +++ b/library/Zend/Service/Amazon/Ec2/Securitygroups.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Securitygroups.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Securitygroups.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_Abstract diff --git a/library/Zend/Service/Amazon/EditorialReview.php b/library/Zend/Service/Amazon/EditorialReview.php index 2eedc9042..74fb426ec 100644 --- a/library/Zend/Service/Amazon/EditorialReview.php +++ b/library/Zend/Service/Amazon/EditorialReview.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EditorialReview.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EditorialReview.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_EditorialReview diff --git a/library/Zend/Service/Amazon/Exception.php b/library/Zend/Service/Amazon/Exception.php old mode 100644 new mode 100755 index bc333780d..b740467f5 --- a/library/Zend/Service/Amazon/Exception.php +++ b/library/Zend/Service/Amazon/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/Amazon/Image.php b/library/Zend/Service/Amazon/Image.php index c03b308c9..a6e93887c 100644 --- a/library/Zend/Service/Amazon/Image.php +++ b/library/Zend/Service/Amazon/Image.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Image diff --git a/library/Zend/Service/Amazon/Item.php b/library/Zend/Service/Amazon/Item.php index 0f3ce0780..5d21d8d79 100644 --- a/library/Zend/Service/Amazon/Item.php +++ b/library/Zend/Service/Amazon/Item.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Item.php 21883 2010-04-16 14:57:07Z dragonbe $ + * @version $Id: Item.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Item @@ -114,20 +114,20 @@ class Zend_Service_Amazon_Item * * @param null|DOMElement $dom * @return void - * @throws Zend_Service_Amazon_Exception - * + * @throws Zend_Service_Amazon_Exception + * * @group ZF-9547 */ public function __construct($dom) { - if (null === $dom) { - // require_once 'Zend/Service/Amazon/Exception.php'; - throw new Zend_Service_Amazon_Exception('Item element is empty'); - } - if (!$dom instanceof DOMElement) { - // require_once 'Zend/Service/Amazon/Exception.php'; - throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element'); - } + if (null === $dom) { + // require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Item element is empty'); + } + if (!$dom instanceof DOMElement) { + // require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element'); + } $xpath = new DOMXPath($dom->ownerDocument); $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); $this->ASIN = $xpath->query('./az:ASIN/text()', $dom)->item(0)->data; diff --git a/library/Zend/Service/Amazon/ListmaniaList.php b/library/Zend/Service/Amazon/ListmaniaList.php index d13f02733..754e5f6a1 100644 --- a/library/Zend/Service/Amazon/ListmaniaList.php +++ b/library/Zend/Service/Amazon/ListmaniaList.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ListmaniaList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ListmaniaList.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_ListmaniaList diff --git a/library/Zend/Service/Amazon/Offer.php b/library/Zend/Service/Amazon/Offer.php index 0a35eb5ea..a8123318f 100644 --- a/library/Zend/Service/Amazon/Offer.php +++ b/library/Zend/Service/Amazon/Offer.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Offer.php 21154 2010-02-23 17:10:34Z matthew $ + * @version $Id: Offer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Offer diff --git a/library/Zend/Service/Amazon/OfferSet.php b/library/Zend/Service/Amazon/OfferSet.php index c0ad915d2..599620b45 100644 --- a/library/Zend/Service/Amazon/OfferSet.php +++ b/library/Zend/Service/Amazon/OfferSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OfferSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OfferSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_OfferSet diff --git a/library/Zend/Service/Amazon/Query.php b/library/Zend/Service/Amazon/Query.php index 18e7ea5ea..97aaf718d 100644 --- a/library/Zend/Service/Amazon/Query.php +++ b/library/Zend/Service/Amazon/Query.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Query.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Query extends Zend_Service_Amazon diff --git a/library/Zend/Service/Amazon/ResultSet.php b/library/Zend/Service/Amazon/ResultSet.php index 278160979..66fb3ac7a 100644 --- a/library/Zend/Service/Amazon/ResultSet.php +++ b/library/Zend/Service/Amazon/ResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_ResultSet implements SeekableIterator diff --git a/library/Zend/Service/Amazon/S3.php b/library/Zend/Service/Amazon/S3.php old mode 100644 new mode 100755 index 5355c0317..00bc69cdf --- a/library/Zend/Service/Amazon/S3.php +++ b/library/Zend/Service/Amazon/S3.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: S3.php 23224 2010-10-22 13:45:57Z matthew $ + * @version $Id: S3.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/ */ @@ -157,14 +157,15 @@ public function _validBucketName($bucket) public function createBucket($bucket, $location = null) { $this->_validBucketName($bucket); - + $headers=array(); if($location) { $data = ''.$location.''; - } - else { + $headers['Content-type']= 'text/plain'; + $headers['Contne-size']= strlen($data); + } else { $data = null; } - $response = $this->_makeRequest('PUT', $bucket, null, array(), $data); + $response = $this->_makeRequest('PUT', $bucket, null, $headers, $data); return ($response->getStatus() == 200); } @@ -273,9 +274,16 @@ public function cleanBucket($bucket) return false; } - foreach ($objects as $object) { - $this->removeObject("$bucket/$object"); + while (!empty($objects)) { + foreach ($objects as $object) { + $this->removeObject("$bucket/$object"); + } + $params= array ( + 'marker' => $objects[count($objects)-1] + ); + $objects = $this->getObjectsByBucket($bucket,$params); } + return true; } @@ -482,7 +490,7 @@ public function putFileStream($path, $object, $meta=null) } if(!isset($meta['Content-MD5'])) { - $headers['Content-MD5'] = base64_encode(md5_file($path, true)); + $meta['Content-MD5'] = base64_encode(md5_file($path, true)); } return $this->putObject($object, $data, $meta); @@ -557,11 +565,11 @@ public function moveObject($sourceObject, $destObject, $meta = null) /** * Make a request to Amazon S3 * - * @param string $method Request method - * @param string $path Path to requested object - * @param array $params Request parameters - * @param array $headers HTTP headers - * @param string|resource $data Request data + * @param string $method Request method + * @param string $path Path to requested object + * @param array $params Request parameters + * @param array $headers HTTP headers + * @param string|resource $data Request data * @return Zend_Http_Response */ public function _makeRequest($method, $path='', $params=null, $headers=array(), $data=null) @@ -590,7 +598,11 @@ public function _makeRequest($method, $path='', $params=null, $headers=array(), $endpoint->setHost($parts[0].'.'.$endpoint->getHost()); } if (!empty($parts[1])) { - $endpoint->setPath('/'.$parts[1]); + // ZF-10218, ZF-10122 + $pathparts = explode('?',$parts[1]); + $endpath = $pathparts[0]; + $endpoint->setPath('/'.$endpath); + } else { $endpoint->setPath('/'); @@ -598,16 +610,16 @@ public function _makeRequest($method, $path='', $params=null, $headers=array(), $path = $parts[0].'/'; } } - self::addSignature($method, $path, $headers); $client = self::getHttpClient(); - $client->resetParameters(); + $client->resetParameters(true); $client->setUri($endpoint); $client->setAuth(false); // Work around buglet in HTTP client - it doesn't clean headers // Remove when ZHC is fixed + /* $client->setHeaders(array('Content-MD5' => null, 'Content-Encoding' => null, 'Expect' => null, @@ -615,7 +627,7 @@ public function _makeRequest($method, $path='', $params=null, $headers=array(), 'x-amz-acl' => null, 'x-amz-copy-source' => null, 'x-amz-metadata-directive' => null)); - + */ $client->setHeaders($headers); if (is_array($params)) { @@ -629,7 +641,7 @@ public function _makeRequest($method, $path='', $params=null, $headers=array(), $headers['Content-type'] = self::getMimeType($path); } $client->setRawData($data, $headers['Content-type']); - } + } do { $retry = false; @@ -720,6 +732,9 @@ protected function addSignature($method, $path, &$headers) else if (strpos($path, '?torrent') !== false) { $sig_str .= '?torrent'; } + else if (strpos($path, '?versions') !== false) { + $sig_str .= '?versions'; + } $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY)); $headers['Authorization'] = 'AWS '.$this->_getAccessKey().':'.$signature; diff --git a/library/Zend/Service/Amazon/S3/Exception.php b/library/Zend/Service/Amazon/S3/Exception.php old mode 100644 new mode 100755 index 8bbbd0fa3..3da5fba51 --- a/library/Zend/Service/Amazon/S3/Exception.php +++ b/library/Zend/Service/Amazon/S3/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_S3_Exception extends Zend_Service_Amazon_Exception diff --git a/library/Zend/Service/Amazon/S3/Stream.php b/library/Zend/Service/Amazon/S3/Stream.php old mode 100644 new mode 100755 index b9bb84883..c6abdc106 --- a/library/Zend/Service/Amazon/S3/Stream.php +++ b/library/Zend/Service/Amazon/S3/Stream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 22621 2010-07-18 00:35:48Z torio $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_S3_Stream @@ -140,8 +140,7 @@ public function stream_open($path, $mode, $options, $opened_path) $this->_writeBuffer = true; $this->_getS3Client($path); return true; - } - else { + } else { // Otherwise, just see if the file exists or not $info = $this->_getS3Client($path)->getInfo($name); if ($info) { @@ -175,9 +174,9 @@ public function stream_close() /** * Read from the stream * - * http://bugs.php.net/21641 - stream_read() is always passed PHP's - * internal read buffer size (8192) no matter what is passed as $count - * parameter to fread(). + * http://bugs.php.net/21641 - stream_read() is always passed PHP's + * internal read buffer size (8192) no matter what is passed as $count + * parameter to fread(). * * @param integer $count * @return string @@ -194,14 +193,12 @@ public function stream_read($count) } $range_start = $this->_position; - $range_end = $this->_position+$count; + $range_end = $this->_position + $count - 1; // Only fetch more data from S3 if we haven't fetched any data yet (postion=0) - // OR, the range end position is greater than the size of the current object - // buffer AND if the range end position is less than or equal to the object's - // size returned by S3 - if (($this->_position == 0) || (($range_end > strlen($this->_objectBuffer)) && ($range_end <= $this->_objectSize))) { - + // OR, the range end position plus 1 is greater than the size of the current + // object buffer + if ($this->_objectBuffer === null || $range_end >= strlen($this->_objectBuffer)) { $headers = array( 'Range' => "bytes=$range_start-$range_end" ); diff --git a/library/Zend/Service/Amazon/SimilarProduct.php b/library/Zend/Service/Amazon/SimilarProduct.php index 9f42c0a92..9c7296adc 100644 --- a/library/Zend/Service/Amazon/SimilarProduct.php +++ b/library/Zend/Service/Amazon/SimilarProduct.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimilarProduct.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimilarProduct.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimilarProduct diff --git a/library/Zend/Service/Amazon/SimpleDb.php b/library/Zend/Service/Amazon/SimpleDb.php index f0f1283a6..5843d6be4 100644 --- a/library/Zend/Service/Amazon/SimpleDb.php +++ b/library/Zend/Service/Amazon/SimpleDb.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -53,7 +53,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb extends Zend_Service_Amazon_Abstract @@ -100,7 +100,7 @@ public function __construct($accessKey, $secretKey) $this->setEndpoint("https://" . $this->_sdbEndpoint); } - /** + /** * Set SimpleDB endpoint to use * * @param string|Zend_Uri_Http $endpoint @@ -108,15 +108,15 @@ public function __construct($accessKey, $secretKey) */ public function setEndpoint($endpoint) { - if(!($endpoint instanceof Zend_Uri_Http)) { - $endpoint = Zend_Uri::factory($endpoint); - } - if(!$endpoint->valid()) { - // require_once 'Zend/Service/Amazon/SimpleDb/Exception.php'; - throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid endpoint supplied"); - } - $this->_endpoint = $endpoint; - return $this; + if(!($endpoint instanceof Zend_Uri_Http)) { + $endpoint = Zend_Uri::factory($endpoint); + } + if(!$endpoint->valid()) { + // require_once 'Zend/Service/Amazon/SimpleDb/Exception.php'; + throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid endpoint supplied"); + } + $this->_endpoint = $endpoint; + return $this; } /** @@ -124,30 +124,30 @@ public function setEndpoint($endpoint) * * @return Zend_Uri_Http */ - public function getEndpoint() + public function getEndpoint() { - return $this->_endpoint; + return $this->_endpoint; } /** * Get attributes API method * * @param string $domainName Domain name within database - * @param string + * @param string */ public function getAttributes( $domainName, $itemName, $attributeName = null ) { $params = array(); - $params['Action'] = 'GetAttributes'; - $params['DomainName'] = $domainName; - $params['ItemName'] = $itemName; + $params['Action'] = 'GetAttributes'; + $params['DomainName'] = $domainName; + $params['ItemName'] = $itemName; - if (isset($attributeName)) { - $params['AttributeName'] = $attributeName; - } + if (isset($attributeName)) { + $params['AttributeName'] = $attributeName; + } - $response = $this->_sendRequest($params); + $response = $this->_sendRequest($params); $document = $response->getSimpleXMLDocument(); $attributeNodes = $document->GetAttributesResult->Attribute; @@ -167,7 +167,7 @@ public function getAttributes( $data = (string)$valueNodes; } if (isset($attributes[$name])) { - $attributes[$name]->addValue($data); + $attributes[$name]->addValue($data); } else { $attributes[$name] = new Zend_Service_Amazon_SimpleDb_Attribute($itemName, $name, $data); } @@ -188,38 +188,38 @@ public function putAttributes( $domainName, $itemName, $attributes, $replace = array() ) { $params = array(); - $params['Action'] = 'PutAttributes'; - $params['DomainName'] = $domainName; - $params['ItemName'] = $itemName; + $params['Action'] = 'PutAttributes'; + $params['DomainName'] = $domainName; + $params['ItemName'] = $itemName; - $index = 0; - foreach ($attributes as $attribute) { - $attributeName = $attribute->getName(); + $index = 0; + foreach ($attributes as $attribute) { + $attributeName = $attribute->getName(); foreach ($attribute->getValues() as $value) { - $params['Attribute.' . $index . '.Name'] = $attributeName; + $params['Attribute.' . $index . '.Name'] = $attributeName; $params['Attribute.' . $index . '.Value'] = $value; - // Check if it should be replaced + // Check if it should be replaced if(array_key_exists($attributeName, $replace) && $replace[$attributeName]) { $params['Attribute.' . $index . '.Replace'] = 'true'; } $index++; } - } + } - // Exception should get thrown if there's an error + // Exception should get thrown if there's an error $response = $this->_sendRequest($params); } /** * Add many attributes at once - * - * @param array $items - * @param string $domainName - * @param array $replace + * + * @param array $items + * @param string $domainName + * @param array $replace * @return void */ - public function batchPutAttributes($items, $domainName, array $replace = array()) + public function batchPutAttributes($items, $domainName, array $replace = array()) { $params = array(); @@ -236,8 +236,8 @@ public function batchPutAttributes($items, $domainName, array $replace = array() foreach($attribute->getValues() as $value) { $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Name'] = $attribute->getName(); $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Value'] = $value; - if (isset($replace[$name]) - && isset($replace[$name][$attribute->getName()]) + if (isset($replace[$name]) + && isset($replace[$name][$attribute->getName()]) && $replace[$name][$attribute->getName()] ) { $params['Item.' . $itemIndex . '.Attribute.' . $attributeIndex . '.Replace'] = 'true'; @@ -253,27 +253,27 @@ public function batchPutAttributes($items, $domainName, array $replace = array() /** * Delete attributes - * - * @param string $domainName - * @param string $itemName - * @param array $attributes + * + * @param string $domainName + * @param string $itemName + * @param array $attributes * @return void */ - public function deleteAttributes($domainName, $itemName, array $attributes = array()) + public function deleteAttributes($domainName, $itemName, array $attributes = array()) { $params = array(); - $params['Action'] = 'DeleteAttributes'; - $params['DomainName'] = $domainName; - $params['ItemName'] = $itemName; + $params['Action'] = 'DeleteAttributes'; + $params['DomainName'] = $domainName; + $params['ItemName'] = $itemName; - $attributeIndex = 0; - foreach ($attributes as $attribute) { - foreach ($attribute->getValues() as $value) { - $params['Attribute.' . $attributeIndex . '.Name'] = $attribute->getName(); - $params['Attribute.' . $attributeIndex . '.Value'] = $value; + $attributeIndex = 0; + foreach ($attributes as $attribute) { + foreach ($attribute->getValues() as $value) { + $params['Attribute.' . $attributeIndex . '.Name'] = $attribute->getName(); + $params['Attribute.' . $attributeIndex . '.Value'] = $value; $attributeIndex++; - } - } + } + } $response = $this->_sendRequest($params); @@ -283,19 +283,19 @@ public function deleteAttributes($domainName, $itemName, array $attributes = arr /** * List domains * - * @param $maxNumberOfDomains int - * @param $nextToken int + * @param int $maxNumberOfDomains + * @param int $nextToken * @return array 0 or more domain names */ - public function listDomains($maxNumberOfDomains = 100, $nextToken = null) + public function listDomains($maxNumberOfDomains = 100, $nextToken = null) { $params = array(); - $params['Action'] = 'ListDomains'; - $params['MaxNumberOfDomains'] = $maxNumberOfDomains; + $params['Action'] = 'ListDomains'; + $params['MaxNumberOfDomains'] = $maxNumberOfDomains; - if (null !== $nextToken) { - $params['NextToken'] = $nextToken; - } + if (null !== $nextToken) { + $params['NextToken'] = $nextToken; + } $response = $this->_sendRequest($params); $domainNodes = $response->getSimpleXMLDocument()->ListDomainsResult->DomainName; @@ -315,14 +315,14 @@ public function listDomains($maxNumberOfDomains = 100, $nextToken = null) /** * Retrieve domain metadata * - * @param $domainName string Name of the domain for which metadata will be requested + * @param string $domainName Name of the domain for which metadata will be requested * @return array Key/value array of metadatum names and values. */ - public function domainMetadata($domainName) + public function domainMetadata($domainName) { $params = array(); - $params['Action'] = 'DomainMetadata'; - $params['DomainName'] = $domainName; + $params['Action'] = 'DomainMetadata'; + $params['DomainName'] = $domainName; $response = $this->_sendRequest($params); $document = $response->getSimpleXMLDocument(); @@ -340,14 +340,14 @@ public function domainMetadata($domainName) /** * Create a new domain * - * @param $domainName string Valid domain name of the domain to create - * @return boolean True if successful, false if not + * @param string $domainName Valid domain name of the domain to create + * @return boolean True if successful, false if not */ - public function createDomain($domainName) + public function createDomain($domainName) { $params = array(); - $params['Action'] = 'CreateDomain'; - $params['DomainName'] = $domainName; + $params['Action'] = 'CreateDomain'; + $params['DomainName'] = $domainName; $response = $this->_sendRequest($params); return $response->getHttpResponse()->isSuccessful(); } @@ -355,10 +355,10 @@ public function createDomain($domainName) /** * Delete a domain * - * @param $domainName string Valid domain name of the domain to delete - * @return boolean True if successful, false if not + * @param string $domainName Valid domain name of the domain to delete + * @return boolean True if successful, false if not */ - public function deleteDomain($domainName) + public function deleteDomain($domainName) { $params = array(); $params['Action'] = 'DeleteDomain'; @@ -374,15 +374,15 @@ public function deleteDomain($domainName) * @param null|string $nextToken * @return Zend_Service_Amazon_SimpleDb_Page */ - public function select($selectExpression, $nextToken = null) + public function select($selectExpression, $nextToken = null) { $params = array(); - $params['Action'] = 'Select'; - $params['SelectExpression'] = $selectExpression; + $params['Action'] = 'Select'; + $params['SelectExpression'] = $selectExpression; - if (null !== $nextToken) { - $params['NextToken'] = $nextToken; - } + if (null !== $nextToken) { + $params['NextToken'] = $nextToken; + } $response = $this->_sendRequest($params); $xml = $response->getSimpleXMLDocument(); @@ -406,36 +406,36 @@ public function select($selectExpression, $nextToken = null) return new Zend_Service_Amazon_SimpleDb_Page($attributes, $nextToken); } - + /** * Quote SDB value - * + * * Wraps it in '' - * + * * @param string $value * @return string */ public function quote($value) { - // wrap in single quotes and convert each ' inside to '' - return "'" . str_replace("'", "''", $value) . "'"; + // wrap in single quotes and convert each ' inside to '' + return "'" . str_replace("'", "''", $value) . "'"; } - + /** * Quote SDB column or table name - * + * * Wraps it in `` * @param string $name * @return string */ public function quoteName($name) { - if (preg_match('/^[a-z_$][a-z0-9_$-]*$/i', $name) == false) { - throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid name: can contain only alphanumeric characters, \$ and _"); - } - return "`$name`"; + if (preg_match('/^[a-z_$][a-z0-9_$-]*$/i', $name) == false) { + throw new Zend_Service_Amazon_SimpleDb_Exception("Invalid name: can contain only alphanumeric characters, \$ and _"); + } + return "`$name`"; } - + /** * Sends a HTTP request to the SimpleDB service using Zend_Http_Client * @@ -502,7 +502,7 @@ protected function _addRequiredParameters(array $parameters) { $parameters['AWSAccessKeyId'] = $this->_getAccessKey(); $parameters['SignatureVersion'] = $this->_signatureVersion; - $parameters['Timestamp'] = gmdate("Y-m-d H:i:s"); + $parameters['Timestamp'] = gmdate('c'); $parameters['Version'] = $this->_sdbApiVersion; $parameters['SignatureMethod'] = $this->_signatureMethod; $parameters['Signature'] = $this->_signParameters($parameters); diff --git a/library/Zend/Service/Amazon/SimpleDb/Attribute.php b/library/Zend/Service/Amazon/SimpleDb/Attribute.php index ae558e0ac..17d301c03 100644 --- a/library/Zend/Service/Amazon/SimpleDb/Attribute.php +++ b/library/Zend/Service/Amazon/SimpleDb/Attribute.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Response.php 17539 2009-08-10 22:51:26Z mikaelkael $ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb_Attribute @@ -35,13 +35,13 @@ class Zend_Service_Amazon_SimpleDb_Attribute /** * Constructor - * - * @param string $itemName - * @param string $name - * @param array $values + * + * @param string $itemName + * @param string $name + * @param array $values * @return void */ - function __construct($itemName, $name, $values) + function __construct($itemName, $name, $values) { $this->_itemName = $itemName; $this->_name = $name; @@ -53,7 +53,7 @@ function __construct($itemName, $name, $values) } } - /** + /** * Return the item name to which the attribute belongs * * @return string @@ -63,7 +63,7 @@ public function getItemName () return $this->_itemName; } - /** + /** * Retrieve attribute values * * @return array @@ -73,7 +73,7 @@ public function getValues() return $this->_values; } - /** + /** * Retrieve the attribute name * * @return string @@ -82,17 +82,17 @@ public function getName () { return $this->_name; } - + /** * Add value - * - * @param mixed $value + * + * @param mixed $value * @return void */ public function addValue($value) { if (is_array($value)) { - $this->_values += $value; + $this->_values += $value; } else { $this->_values[] = $value; } diff --git a/library/Zend/Service/Amazon/SimpleDb/Exception.php b/library/Zend/Service/Amazon/SimpleDb/Exception.php index 27f2eb2f2..6c5a75ee9 100644 --- a/library/Zend/Service/Amazon/SimpleDb/Exception.php +++ b/library/Zend/Service/Amazon/SimpleDb/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb_Exception extends Zend_Service_Amazon_Exception @@ -42,10 +42,10 @@ class Zend_Service_Amazon_SimpleDb_Exception extends Zend_Service_Amazon_Excepti /** * Constructor - * - * @param string $message - * @param int $code - * @param string $awsErrorCode + * + * @param string $message + * @param int $code + * @param string $awsErrorCode * @return void */ public function __construct($message, $code = 0, $awsErrorCode = '') @@ -56,7 +56,7 @@ public function __construct($message, $code = 0, $awsErrorCode = '') /** * Get AWS error code - * + * * @return string */ public function getErrorCode() diff --git a/library/Zend/Service/Amazon/SimpleDb/Page.php b/library/Zend/Service/Amazon/SimpleDb/Page.php index 636f635d6..3d30649fa 100644 --- a/library/Zend/Service/Amazon/SimpleDb/Page.php +++ b/library/Zend/Service/Amazon/SimpleDb/Page.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimpleDb_Page @@ -43,12 +43,12 @@ class Zend_Service_Amazon_SimpleDb_Page /** * Constructor - * - * @param string $data - * @param string|null $token + * + * @param string $data + * @param string|null $token * @return void */ - public function __construct($data, $token = null) + public function __construct($data, $token = null) { $this->_data = $data; $this->_token = $token; @@ -56,42 +56,42 @@ public function __construct($data, $token = null) /** * Retrieve page data - * + * * @return string */ - public function getData() + public function getData() { return $this->_data; } /** * Retrieve token - * + * * @return string|null */ - public function getToken() + public function getToken() { return $this->_token; } /** * Determine whether this is the last page of data - * + * * @return void */ - public function isLast() + public function isLast() { return (null === $this->_token); } /** * Cast to string - * + * * @return string */ - public function __toString() + public function __toString() { - return "Page with token: " . $this->_token + return "Page with token: " . $this->_token . "\n and data: " . $this->_data; } } diff --git a/library/Zend/Service/Amazon/SimpleDb/Response.php b/library/Zend/Service/Amazon/SimpleDb/Response.php index c4ff11e69..971638e75 100644 --- a/library/Zend/Service/Amazon/SimpleDb/Response.php +++ b/library/Zend/Service/Amazon/SimpleDb/Response.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,10 +28,10 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage SimpleDb - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Service_Amazon_SimpleDb_Response +class Zend_Service_Amazon_SimpleDb_Response { /** * XML namespace used for SimpleDB responses. @@ -120,20 +120,20 @@ public function getSimpleXMLDocument() $body = false; } - + return simplexml_load_string($body); } - + /** * Get HTTP response object - * + * * @return Zend_Http_Response */ - public function getHttpResponse() + public function getHttpResponse() { return $this->_httpResponse; } - + /** * Gets the document object for this response * @@ -156,7 +156,7 @@ public function getDocument() if (!$this->_document->loadXML($body)) { $this->_document = false; } - + // reset libxml error handling libxml_clear_errors(); libxml_use_internal_errors($errors); diff --git a/library/Zend/Service/Amazon/Sqs.php b/library/Zend/Service/Amazon/Sqs.php index 0c0ecc00c..53c40483e 100644 --- a/library/Zend/Service/Amazon/Sqs.php +++ b/library/Zend/Service/Amazon/Sqs.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqs.php 22984 2010-09-21 02:52:48Z matthew $ + * @version $Id: Sqs.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://aws.amazon.com/sqs/ Amazon Simple Queue Service */ @@ -67,9 +67,17 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract */ protected $_sqsSignatureMethod = 'HmacSHA256'; + protected $_sqsEndpoints = array('us-east-1' => 'sqs.us-east-1.amazonaws.com', + 'us-west-1' => 'sqs.us-west-1.amazonaws.com', + 'eu-west-1' => 'sqs.eu-west-1.amazonaws.com', + 'ap-southeast-1' => 'sqs.ap-southeast-1.amazonaws.com', + 'ap-northeast-1' => 'sqs.ap-northeast-1.amazonaws.com'); /** * Constructor * + * The default region is us-east-1. Use the region to set it to one of the regions that is build-in into ZF. + * To add a new AWS region use the setEndpoint() method. + * * @param string $accessKey * @param string $secretKey * @param string $region @@ -77,8 +85,77 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract public function __construct($accessKey = null, $secretKey = null, $region = null) { parent::__construct($accessKey, $secretKey, $region); + + if (null !== $region) { + $this->_setEndpoint($region); + } + } + + /** + * Set SQS endpoint + * + * Checks and sets endpoint if region exists in $_sqsEndpoints. If a new SQS region is added by amazon, + * please use the setEndpoint function to set it. + * + * @param string $region region + * @throws Zend_Service_Amazon_Sqs_Exception + */ + protected function _setEndpoint($region) + { + if (array_key_exists($region, $this->_sqsEndpoints)) { + $this->_sqsEndpoint = $this->_sqsEndpoints[$region]; + } else { + throw new Zend_Service_Amazon_Sqs_Exception('Invalid SQS region specified.'); + } + } + + /** + * Set SQS endpoint + * + * You can set SQS to on of the build-in regions. If the region does not exsist it will be added. + * + * @param string $region region + * @throws Zend_Service_Amazon_Sqs_Exception + */ + public function setEndpoint($region) + { + if (!empty($region)) { + if (array_key_exists($region, $this->_sqsEndpoints)) { + $this->_sqsEndpoint = $this->_sqsEndpoints[$region]; + } else { + $this->_sqsEndpoints[$region] = "sqs.$region.amazonaws.com"; + $this->_sqsEndpoint = $this->_sqsEndpoints[$region]; + } + } else { + throw new Zend_Service_Amazon_Sqs_Exception('Empty region specified.'); + } + } + + /** + * Get the SQS endpoint + * + * @return string + */ + public function getEndpoint() + { + return $this->_sqsEndpoint; } + /** + * Get possible SQS endpoints + * + * Since there is not an SQS webserive to get all possible endpoints, a hardcoded list is available. + * For the actual region list please check: + * http://docs.amazonwebservices.com/AWSSimpleQueueService/2009-02-01/APIReference/index.html?QueueServiceWsdlArticle.html + * + * @param string $region region + * @return array + */ + public function getEndpoints() + { + return $this->_sqsEndpoints; + } + /** * Create a new queue * @@ -288,7 +365,7 @@ public function deleteMessage($queue_url, $handle) $result = $this->_makeRequest($queue_url, 'DeleteMessage', $params); - if (isset($result->Error->Code) + if (isset($result->Error->Code) && !empty($result->Error->Code) ) { return false; @@ -319,7 +396,7 @@ public function getAttribute($queue_url, $attribute = 'All') // require_once 'Zend/Service/Amazon/Sqs/Exception.php'; throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code); } - + if(count($result->GetQueueAttributesResult->Attribute) > 1) { $attr_result = array(); foreach($result->GetQueueAttributesResult->Attribute as $attribute) { diff --git a/library/Zend/Service/Amazon/Sqs/Exception.php b/library/Zend/Service/Amazon/Sqs/Exception.php index 41ff4423b..999be36b6 100644 --- a/library/Zend/Service/Amazon/Sqs/Exception.php +++ b/library/Zend/Service/Amazon/Sqs/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Sqs_Exception extends Zend_Service_Amazon_Exception diff --git a/library/Zend/Service/Audioscrobbler.php b/library/Zend/Service/Audioscrobbler.php index 765c6b20d..214bdf68c 100644 --- a/library/Zend/Service/Audioscrobbler.php +++ b/library/Zend/Service/Audioscrobbler.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Audioscrobbler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Audioscrobbler.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Audioscrobbler.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Audioscrobbler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Audioscrobbler @@ -69,9 +69,15 @@ public function __construct() { $this->set('version', '1.0'); - iconv_set_encoding('output_encoding', 'UTF-8'); - iconv_set_encoding('input_encoding', 'UTF-8'); - iconv_set_encoding('internal_encoding', 'UTF-8'); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('output_encoding', 'UTF-8'); + iconv_set_encoding('input_encoding', 'UTF-8'); + iconv_set_encoding('internal_encoding', 'UTF-8'); + } else { + ini_set('output_encoding', 'UTF-8'); + ini_set('input_encoding', 'UTF-8'); + ini_set('default_charset', 'UTF-8'); + } } /** diff --git a/library/Zend/Service/Delicious.php b/library/Zend/Service/Delicious.php index 6b7bcd9fa..f87ac8cab 100644 --- a/library/Zend/Service/Delicious.php +++ b/library/Zend/Service/Delicious.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Delicious.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Delicious.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious diff --git a/library/Zend/Service/Delicious/Exception.php b/library/Zend/Service/Delicious/Exception.php index 4a98a3984..be5da9a2b 100644 --- a/library/Zend/Service/Delicious/Exception.php +++ b/library/Zend/Service/Delicious/Exception.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/Delicious/Post.php b/library/Zend/Service/Delicious/Post.php index b77efcd4c..0be04f724 100644 --- a/library/Zend/Service/Delicious/Post.php +++ b/library/Zend/Service/Delicious/Post.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Post.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Post.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_Post extends Zend_Service_Delicious_SimplePost diff --git a/library/Zend/Service/Delicious/PostList.php b/library/Zend/Service/Delicious/PostList.php index a7c4946ab..cc1739152 100644 --- a/library/Zend/Service/Delicious/PostList.php +++ b/library/Zend/Service/Delicious/PostList.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PostList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PostList.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_PostList implements Countable, Iterator, ArrayAccess diff --git a/library/Zend/Service/Delicious/SimplePost.php b/library/Zend/Service/Delicious/SimplePost.php index f1ac37744..1f1613cc9 100644 --- a/library/Zend/Service/Delicious/SimplePost.php +++ b/library/Zend/Service/Delicious/SimplePost.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimplePost.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimplePost.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_SimplePost diff --git a/library/Zend/Service/DeveloperGarden/BaseUserService.php b/library/Zend/Service/DeveloperGarden/BaseUserService.php index 756ed8fcf..ebd3e7192 100644 --- a/library/Zend/Service/DeveloperGarden/BaseUserService.php +++ b/library/Zend/Service/DeveloperGarden/BaseUserService.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseUserService.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: BaseUserService.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -64,7 +64,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php b/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php index bbc5f4140..f81880ef3 100644 --- a/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php +++ b/library/Zend/Service/DeveloperGarden/BaseUserService/AccountBalance.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccountBalance.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AccountBalance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php b/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php index 726ca59fa..2482ea13c 100644 --- a/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Client/ClientAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ClientAbstract.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: ClientAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Client/Exception.php b/library/Zend/Service/DeveloperGarden/Client/Exception.php index 005b941c2..9b55726b8 100644 --- a/library/Zend/Service/DeveloperGarden/Client/Exception.php +++ b/library/Zend/Service/DeveloperGarden/Client/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Client/Soap.php b/library/Zend/Service/DeveloperGarden/Client/Soap.php index 869bb6603..df915f032 100644 --- a/library/Zend/Service/DeveloperGarden/Client/Soap.php +++ b/library/Zend/Service/DeveloperGarden/Client/Soap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Soap.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Soap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall.php b/library/Zend/Service/DeveloperGarden/ConferenceCall.php index 6275df151..1ab9fecc1 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceCall.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -319,7 +319,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php index 89b26790c..80d940f7b 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceAccount.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceAccount.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceAccount.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php index 823274f89..ab12cd3cf 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceDetail.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceDetail.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceDetail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -90,7 +90,7 @@ public function getDuration() /** * set the description of this conference * - * @param $description the $description to set + * @param string $description the $description to set * @return Zend_Service_DeveloperGarden_ConferenceCall_ConferenceDetail */ public function setDescription($description) diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php index 46f94f262..b72bd6cff 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ConferenceSchedule.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceSchedule.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceSchedule.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php index df4245787..514fda4ba 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php index 53532eeb6..b69462802 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Participant.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Participant.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php index b05a98550..7a98cb2c3 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ParticipantDetail.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ParticipantDetail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @see Zend_Validate_EmailAddress @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php index 6903c9938..ac18b3544 100644 --- a/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php +++ b/library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ParticipantStatus.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ParticipantStatus.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Credential.php b/library/Zend/Service/DeveloperGarden/Credential.php index 632632dbf..2e429bf9d 100644 --- a/library/Zend/Service/DeveloperGarden/Credential.php +++ b/library/Zend/Service/DeveloperGarden/Credential.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Credential.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Credential.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -134,7 +134,7 @@ public function setUsername($username = null) * if $withRealm == true we combine username and realm like * username@realm * - * @param $boolean withRealm + * @param bool $withRealm * @return string|null */ public function getUsername($withRealm = false) diff --git a/library/Zend/Service/DeveloperGarden/Exception.php b/library/Zend/Service/DeveloperGarden/Exception.php index 4d62fcc6d..2ef36008f 100644 --- a/library/Zend/Service/DeveloperGarden/Exception.php +++ b/library/Zend/Service/DeveloperGarden/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/IpLocation.php b/library/Zend/Service/DeveloperGarden/IpLocation.php index fede53866..c99e12c67 100644 --- a/library/Zend/Service/DeveloperGarden/IpLocation.php +++ b/library/Zend/Service/DeveloperGarden/IpLocation.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IpLocation.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: IpLocation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -64,11 +64,11 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Service_DeveloperGarden_IpLocation +class Zend_Service_DeveloperGarden_IpLocation extends Zend_Service_DeveloperGarden_Client_ClientAbstract { /** diff --git a/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php b/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php index bd4f93f58..4618cb60d 100644 --- a/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php +++ b/library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IpAddress.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: IpAddress.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/LocalSearch.php b/library/Zend/Service/DeveloperGarden/LocalSearch.php index ac50d8dc4..5ced2901a 100644 --- a/library/Zend/Service/DeveloperGarden/LocalSearch.php +++ b/library/Zend/Service/DeveloperGarden/LocalSearch.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearch.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearch.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php b/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php index b522717c4..5785c63ed 100644 --- a/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php +++ b/library/Zend/Service/DeveloperGarden/LocalSearch/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php b/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php index 85b1df53e..e73f02122 100644 --- a/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php +++ b/library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchParameters.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: SearchParameters.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -294,10 +294,10 @@ public function setRadius($radius) * rx = longitude right bottom * ry = latitude right bottom * - * @param $lx - * @param $ly - * @param $rx - * @param $ry + * @param float $lx + * @param float $ly + * @param float $rx + * @param float $ry * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters */ public function setRectangle($lx, $ly, $rx, $ry) @@ -416,8 +416,8 @@ public function setOpeningTime($time = null) * sets a category filter * * @see http://www.suchen.de/kategorie-katalog - * @param $category - * @return unknown_type + * @param string $category + * @return Zend_Service_DeveloperGarden_LocalSearch_SearchParameters */ public function setCategory($category = null) { diff --git a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php index a620a7628..d467732d9 100644 --- a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php +++ b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/ChangeQuotaPool.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChangeQuotaPool.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ChangeQuotaPool.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php index 2c98cafb7..45baa5bc5 100644 --- a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php +++ b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetAccountBalance.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetAccountBalance.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetAccountBalance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php index 4f5bbb884..87da758e2 100644 --- a/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php +++ b/library/Zend/Service/DeveloperGarden/Request/BaseUserService/GetQuotaInformation.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetQuotaInformation.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetQuotaInformation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php index 478b325b8..8378c70be 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/AddConferenceTemplateParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AddConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AddConferenceTemplateParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php index 7947822ce..a0357686f 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CommitConferenceRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommitConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CommitConferenceRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php index bdc2d75fb..a1ce6bc6c 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -125,7 +125,7 @@ public function setOwnerId($ownerId) /** * sets $account * - * @param $account + * @param int $account * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest */ public function setAccount($account = null) diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php index 1a1290b3d..fecf51d1d 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/CreateConferenceTemplateRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceTemplateRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php index 795fe9bab..904e49a65 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceListRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceListRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceListRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -93,7 +93,7 @@ public function setWhat($what) /** * sets $ownerId * - * @param $ownerId + * @param int $ownerId * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceListRequest */ public function setOwnerId($ownerId) diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php index 308e773ad..c9aa4f705 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceStatusRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceStatusRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceStatusRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php index ea6924099..fcc64a815 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateListRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateListRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateListRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -58,7 +58,7 @@ public function __construct($environment, $ownerId = null) /** * sets $ownerId * - * @param $ownerId + * @param int $ownerId * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_GetConferenceTemplateListRequest */ public function setOwnerId($ownerId) diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php index 664cfd986..4e27bda58 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php index cb33df11c..7cab890e8 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetConferenceTemplateRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php index 7ec9fb1d1..bea95db87 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetParticipantStatusRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetParticipantStatusRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetParticipantStatusRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php index f9fae4a03..8f19c8941 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/GetRunningConferenceRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetRunningConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetRunningConferenceRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php index a1cd9d95a..092965dc9 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/NewParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php index 01285f445..ee63a12f1 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php index 269a4ea6d..f9ee19bb2 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php index 2caf64f22..a6f163515 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveConferenceTemplateRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php index 02585372a..168fd3eed 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/RemoveParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php index fc1a310c7..4c7e060d0 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -147,7 +147,7 @@ public function setOwnerId($ownerId = null) /** * sets $account * - * @param $account + * @param int $account * @return Zend_Service_DeveloperGarden_Request_ConferenceCall_CreateConferenceRequest */ public function setAccount($account = null) diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php index bb754d2b3..c5e105334 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php index 61eb7a205..dd5f98a81 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateConferenceTemplateRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php index 63311df46..95bb23ad9 100644 --- a/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/ConferenceCall/UpdateParticipantRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateParticipantRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateParticipantRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/Exception.php b/library/Zend/Service/DeveloperGarden/Request/Exception.php index 7b822c290..b4b7a3b8e 100644 --- a/library/Zend/Service/DeveloperGarden/Request/Exception.php +++ b/library/Zend/Service/DeveloperGarden/Request/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php b/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php index 0d77e8bd0..eebbdb5bd 100644 --- a/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/IpLocation/LocateIPRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocateIPRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocateIPRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php b/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php index f32a2430f..fb4c933bb 100644 --- a/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php +++ b/library/Zend/Service/DeveloperGarden/Request/LocalSearch/LocalSearchRequest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearchRequest.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearchRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -65,8 +65,8 @@ class Zend_Service_DeveloperGarden_Request_LocalSearch_LocalSearchRequest * @param integer $account * @return Zend_Service_DeveloperGarden_Request_RequestAbstract */ - public function __construct($environment, - Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters, + public function __construct($environment, + Zend_Service_DeveloperGarden_LocalSearch_SearchParameters $searchParameters, $account = null ) { parent::__construct($environment); diff --git a/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php b/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php index 21eed4638..d160ad485 100644 --- a/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Request/RequestAbstract.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RequestAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RequestAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php index f4a20b12f..16e1e67cf 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php +++ b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendFlashSMS.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendFlashSMS.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendFlashSMS.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php index f552a1900..69c2fa2c0 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php +++ b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSMS.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSMS.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSMS.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php index a34e7f8c6..cddb8467a 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSmsAbstract.php 20418 2010-01-19 11:43:30Z bate $ + * @version $Id: SendSmsAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -72,14 +72,14 @@ abstract class Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract * @var array */ private $_specialChars = array( - '|', - '^', - '{', - '}', - '[', - ']', - '~', - '\\', + '|', + '^', + '{', + '}', + '[', + ']', + '~', + '\\', "\n", // '€', removed because its counted in utf8 correctly ); @@ -207,7 +207,7 @@ public function getAccount() /** * sets a new accounts * - * @param $account the $account to set + * @param int $account the $account to set * @return Zend_Service_DeveloperGarden_Request_SendSms_SendSmsAbstract */ public function setAccount($account) diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php index 12326b969..95f6c035b 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php +++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/GetValidatedNumbers.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetValidatedNumbers.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetValidatedNumbers.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php index dbad54852..9a46a0c8f 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php +++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Invalidate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Invalidate.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Invalidate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php index 4939fa9ce..f6b80f213 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php +++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/SendValidationKeyword.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendValidationKeyword.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendValidationKeyword.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php index bb92e5e33..954071fdd 100644 --- a/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php +++ b/library/Zend/Service/DeveloperGarden/Request/SmsValidation/Validate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Validate.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Validate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php index 0fad23970..b14025f90 100644 --- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php +++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/CallStatus.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallStatus.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CallStatus.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php index e12f2023a..4aef1364c 100644 --- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php +++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCall.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCall.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php index e1c74baad..afd5f7e57 100644 --- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php +++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/NewCallSequenced.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCallSequenced.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCallSequenced.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php index c35035037..44cfca081 100644 --- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php +++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/TearDownCall.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TearDownCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: TearDownCall.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php index 113852356..9d925df54 100644 --- a/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Request/VoiceButler/VoiceButlerAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VoiceButlerAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: VoiceButlerAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseType.php b/library/Zend/Service/DeveloperGarden/Response/BaseType.php index 01471eb52..103a21604 100644 --- a/library/Zend/Service/DeveloperGarden/Response/BaseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/BaseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BaseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: BaseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php index 6febbc93b..662637a5f 100644 --- a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/ChangeQuotaPoolResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChangeQuotaPoolResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ChangeQuotaPoolResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php index 93603ace3..448910a17 100644 --- a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetAccountBalanceResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetAccountBalanceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetAccountBalanceResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php index 50b3ed65f..0a7ccaeb3 100644 --- a/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/BaseUserService/GetQuotaInformationResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetQuotaInformationResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetQuotaInformationResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php index bfd6b684f..705086a60 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AddConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AddConferenceTemplateParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php index 0adbfb644..34b6383b2 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/AddConferenceTemplateParticipantResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AddConferenceTemplateParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: AddConferenceTemplateParticipantResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php index c36fd8cda..64710a7af 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CCSResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CCSResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CCSResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php index 3b67da974..f2d2dd030 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CommitConferenceResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommitConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CommitConferenceResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php index d2ffde197..2c3ea26a3 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/ConferenceCallAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConferenceCallAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ConferenceCallAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php index ef5ceb3ab..bdc0b917d 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php index 2d1686009..65f025b68 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php index 4c0f6c21e..8035a84ee 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceTemplateResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php index e8dcecb98..7e9faa393 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/CreateConferenceTemplateResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreateConferenceTemplateResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CreateConferenceTemplateResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php index dc0748c7d..57567f99e 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceListResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceListResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php index 11e02c2db..4021302f1 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceListResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceListResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceListResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php index 21a4cc4cb..4eb3bdbc7 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceStatusResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php index 34980a652..dc0275947 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceStatusResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceStatusResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceStatusResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php index 262004292..19c2da1d8 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateListResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateListResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php index 0bb0b180c..98bbfe9de 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateListResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateListResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateListResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php index 662efeaf5..d5d6fa0f3 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php index c7e67c146..0c8c059bd 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateParticipantResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateParticipantResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php index 8cbc3dc70..7294cdbfe 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php index e5e585325..2f90cade5 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetConferenceTemplateResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetConferenceTemplateResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetConferenceTemplateResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php index ba370c5d2..1ede17b6b 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetParticipantStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetParticipantStatusResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php index cbb452786..e3bc78bab 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetParticipantStatusResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetParticipantStatusResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetParticipantStatusResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php index 90b168489..9fa83d7d4 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetRunningConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetRunningConferenceResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php index 67ae2368a..6d751a633 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/GetRunningConferenceResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetRunningConferenceResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetRunningConferenceResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php index d7832acab..0a5e652ce 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php index fa7271a0a..712c6f899 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/NewParticipantResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewParticipantResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewParticipantResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php index b0b367c9e..44af9f7d0 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php index c538355f8..797012147 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php index 10a149af2..8caabefe0 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveConferenceTemplateResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveConferenceTemplateResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php index b11d88989..8d1403e74 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/RemoveParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemoveParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RemoveParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php index 40d843ddf..43e87c0e9 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php index a837eb88c..27d3adee7 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php index 77239a03f..7e16aa54b 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateConferenceTemplateResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateConferenceTemplateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateConferenceTemplateResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php index 8d0a8c28c..be4245939 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/ConferenceCall/UpdateParticipantResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UpdateParticipantResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: UpdateParticipantResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/Exception.php b/library/Zend/Service/DeveloperGarden/Response/Exception.php index 0fc40fe82..78af209c0 100644 --- a/library/Zend/Service/DeveloperGarden/Response/Exception.php +++ b/library/Zend/Service/DeveloperGarden/Response/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php index 7cb3a4e46..b4315c4f4 100644 --- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php +++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/CityType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CityType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CityType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php index 7ba426980..bea936137 100644 --- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php +++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/GeoCoordinatesType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GeoCoordinatesType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GeoCoordinatesType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php index e33628e5f..4e8ca3bcb 100644 --- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php +++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/IPAddressLocationType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IPAddressLocationType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: IPAddressLocationType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php index 002d2906a..cda0ce3a6 100644 --- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocateIPResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocateIPResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php index 154c043b8..2be5b92fa 100644 --- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/LocateIPResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocateIPResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocateIPResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php b/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php index 6c64f9aed..e76ff6fe4 100644 --- a/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php +++ b/library/Zend/Service/DeveloperGarden/Response/IpLocation/RegionType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RegionType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: RegionType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php index 5cc7a913c..cc446c714 100644 --- a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearchResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearchResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php index 0253ad264..9e460e404 100644 --- a/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php +++ b/library/Zend/Service/DeveloperGarden/Response/LocalSearch/LocalSearchResponseType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalSearchResponseType.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: LocalSearchResponseType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php b/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php index 09c06cc19..cf7a5d571 100644 --- a/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Response/ResponseAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResponseAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ResponseAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php index db05936c9..f72c60c49 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php +++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php index 4e8754068..42a0b511c 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/GetTokensResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetTokensResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetTokensResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php index 36808998e..cdee02b9f 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php +++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/Interface.php @@ -16,16 +16,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php index 2aef39415..6b801e180 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SecurityTokenResponse.php 21189 2010-02-24 01:50:33Z stas $ + * @version $Id: SecurityTokenResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php index 7f8314773..99b8f84f1 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendFlashSMSResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendFlashSMSResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendFlashSMSResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php index 7bfb5c639..67c8ae8d8 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSMSResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSMSResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSMSResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php index cc0291050..7d0946922 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Response/SendSms/SendSmsAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSmsAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSmsAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php index 9949768a5..1728b1a53 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/GetValidatedNumbersResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetValidatedNumbersResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: GetValidatedNumbersResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php index 8d1bc57e1..b1d567feb 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/InvalidateResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InvalidateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: InvalidateResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php index 8ae3a60b7..c5737fb01 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/SendValidationKeywordResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendValidationKeywordResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendValidationKeywordResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php index 7885a884b..4464a18ef 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidateResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidateResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ValidateResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php index 015697565..43394a06f 100644 --- a/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php +++ b/library/Zend/Service/DeveloperGarden/Response/SmsValidation/ValidatedNumber.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidatedNumber.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: ValidatedNumber.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php index 5355578bd..6883c6a6f 100644 --- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php +++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatus2Response.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallStatus2Response.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CallStatus2Response.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php index 79752bca7..ae54a2d01 100644 --- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/CallStatusResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CallStatusResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: CallStatusResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php index f53335eb0..826f59da0 100644 --- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCallResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCallResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php index b70a1871b..316a8db42 100644 --- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/NewCallSequencedResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewCallSequencedResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: NewCallSequencedResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php index 202e23af7..aad961e1c 100644 --- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php +++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/TearDownCallResponse.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TearDownCallResponse.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: TearDownCallResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php index d1f34d18c..31f1fc30d 100644 --- a/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php +++ b/library/Zend/Service/DeveloperGarden/Response/VoiceButler/VoiceButlerAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VoiceButlerAbstract.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: VoiceButlerAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php b/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php index 7205520a6..8ab2ed58f 100644 --- a/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php +++ b/library/Zend/Service/DeveloperGarden/SecurityTokenServer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SecurityTokenServer.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SecurityTokenServer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php b/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php index 137b8468e..488cad0f1 100644 --- a/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php +++ b/library/Zend/Service/DeveloperGarden/SecurityTokenServer/Cache.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: Cache.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/SendSms.php b/library/Zend/Service/DeveloperGarden/SendSms.php index e4d1617b9..f0e357ac5 100644 --- a/library/Zend/Service/DeveloperGarden/SendSms.php +++ b/library/Zend/Service/DeveloperGarden/SendSms.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SendSms.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SendSms.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -49,7 +49,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/SmsValidation.php b/library/Zend/Service/DeveloperGarden/SmsValidation.php index 03c55d99f..16b952ba2 100644 --- a/library/Zend/Service/DeveloperGarden/SmsValidation.php +++ b/library/Zend/Service/DeveloperGarden/SmsValidation.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SmsValidation.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: SmsValidation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -74,7 +74,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/VoiceCall.php b/library/Zend/Service/DeveloperGarden/VoiceCall.php index 6d66f4625..6c5d96d5b 100644 --- a/library/Zend/Service/DeveloperGarden/VoiceCall.php +++ b/library/Zend/Service/DeveloperGarden/VoiceCall.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VoiceCall.php 20166 2010-01-09 19:00:17Z bkarwin $ + * @version $Id: VoiceCall.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -74,7 +74,7 @@ * @category Zend * @package Zend_Service * @subpackage DeveloperGarden - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @author Marco Kaiser * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl b/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl index c20b49238..e630ea3d3 100644 --- a/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl +++ b/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.wsdl @@ -1,104 +1,104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd b/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd index a2a8901ce..e263b2199 100644 --- a/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd +++ b/library/Zend/Service/DeveloperGarden/Wsdl/ODGBaseUserService.xsd @@ -1,72 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl b/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl index c17a50ffd..aad614e31 100644 --- a/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl +++ b/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.wsdl @@ -1,164 +1,164 @@ - - VoiceButlerService - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + VoiceButlerService + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd b/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd index ef724672d..e14ba5a48 100644 --- a/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd +++ b/library/Zend/Service/DeveloperGarden/Wsdl/VoiceButlerService.xsd @@ -1,264 +1,264 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd b/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd index d9c30670d..149ba6910 100644 --- a/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd +++ b/library/Zend/Service/DeveloperGarden/Wsdl/ccsPort.xsd @@ -61,13 +61,13 @@ - - - - - - - + + + + + + + @@ -88,7 +88,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -367,7 +367,7 @@ - + diff --git a/library/Zend/Service/Ebay/Abstract.php b/library/Zend/Service/Ebay/Abstract.php index a95a5e3f3..b47cca1d0 100644 --- a/library/Zend/Service/Ebay/Abstract.php +++ b/library/Zend/Service/Ebay/Abstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Ebay_Abstract diff --git a/library/Zend/Service/Ebay/Exception.php b/library/Zend/Service/Ebay/Exception.php index 964b36699..bdcd1f98d 100644 --- a/library/Zend/Service/Ebay/Exception.php +++ b/library/Zend/Service/Ebay/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Exception */ diff --git a/library/Zend/Service/Ebay/Finding.php b/library/Zend/Service/Ebay/Finding.php index dafdcbeef..c69b2e9ad 100644 --- a/library/Zend/Service/Ebay/Finding.php +++ b/library/Zend/Service/Ebay/Finding.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Finding.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Abstract.php b/library/Zend/Service/Ebay/Finding/Abstract.php index a95e78703..2890da128 100644 --- a/library/Zend/Service/Ebay/Finding/Abstract.php +++ b/library/Zend/Service/Ebay/Finding/Abstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Ebay_Finding_Abstract diff --git a/library/Zend/Service/Ebay/Finding/Aspect.php b/library/Zend/Service/Ebay/Finding/Aspect.php index f6cbd66fc..7c2a687b4 100644 --- a/library/Zend/Service/Ebay/Finding/Aspect.php +++ b/library/Zend/Service/Ebay/Finding/Aspect.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Aspect.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php b/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php index 8a25822de..289f64c0c 100644 --- a/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php +++ b/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Container.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php b/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php index 94dfcef08..ba06e568d 100644 --- a/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php +++ b/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Value.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php b/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php index a9e35cd05..f45107eba 100644 --- a/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php +++ b/library/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Aspect/Set.php b/library/Zend/Service/Ebay/Finding/Aspect/Set.php index b32ebbd5d..66d3ca441 100644 --- a/library/Zend/Service/Ebay/Finding/Aspect/Set.php +++ b/library/Zend/Service/Ebay/Finding/Aspect/Set.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Category.php b/library/Zend/Service/Ebay/Finding/Category.php index 9a3fdf186..1363aaf06 100644 --- a/library/Zend/Service/Ebay/Finding/Category.php +++ b/library/Zend/Service/Ebay/Finding/Category.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Category.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Category/Histogram.php b/library/Zend/Service/Ebay/Finding/Category/Histogram.php index fd27c88c0..674e89d67 100644 --- a/library/Zend/Service/Ebay/Finding/Category/Histogram.php +++ b/library/Zend/Service/Ebay/Finding/Category/Histogram.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Histogram.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Category */ diff --git a/library/Zend/Service/Ebay/Finding/Category/Histogram/Container.php b/library/Zend/Service/Ebay/Finding/Category/Histogram/Container.php index 781a1b7a9..f524d5ac9 100644 --- a/library/Zend/Service/Ebay/Finding/Category/Histogram/Container.php +++ b/library/Zend/Service/Ebay/Finding/Category/Histogram/Container.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Container.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Category/Histogram/Set.php b/library/Zend/Service/Ebay/Finding/Category/Histogram/Set.php index 30b8607e9..41c47a7d2 100644 --- a/library/Zend/Service/Ebay/Finding/Category/Histogram/Set.php +++ b/library/Zend/Service/Ebay/Finding/Category/Histogram/Set.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Error/Data.php b/library/Zend/Service/Ebay/Finding/Error/Data.php index 3c2dbcce7..65d7ff862 100644 --- a/library/Zend/Service/Ebay/Finding/Error/Data.php +++ b/library/Zend/Service/Ebay/Finding/Error/Data.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Data.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Error/Data/Set.php b/library/Zend/Service/Ebay/Finding/Error/Data/Set.php index 94e6a2c6b..49bd737b1 100644 --- a/library/Zend/Service/Ebay/Finding/Error/Data/Set.php +++ b/library/Zend/Service/Ebay/Finding/Error/Data/Set.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Error/Message.php b/library/Zend/Service/Ebay/Finding/Error/Message.php index c29a89840..ed118dfa0 100644 --- a/library/Zend/Service/Ebay/Finding/Error/Message.php +++ b/library/Zend/Service/Ebay/Finding/Error/Message.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Message.php 22802 2010-08-07 19:27:37Z ramon $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Exception.php b/library/Zend/Service/Ebay/Finding/Exception.php index f780f8a33..5e706e59a 100644 --- a/library/Zend/Service/Ebay/Finding/Exception.php +++ b/library/Zend/Service/Ebay/Finding/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Exception */ diff --git a/library/Zend/Service/Ebay/Finding/ListingInfo.php b/library/Zend/Service/Ebay/Finding/ListingInfo.php index 2c727a21b..7c2cab654 100644 --- a/library/Zend/Service/Ebay/Finding/ListingInfo.php +++ b/library/Zend/Service/Ebay/Finding/ListingInfo.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: ListingInfo.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/PaginationOutput.php b/library/Zend/Service/Ebay/Finding/PaginationOutput.php index 12c5afa50..061b88e44 100644 --- a/library/Zend/Service/Ebay/Finding/PaginationOutput.php +++ b/library/Zend/Service/Ebay/Finding/PaginationOutput.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: PaginationOutput.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Response/Abstract.php b/library/Zend/Service/Ebay/Finding/Response/Abstract.php index 5d5292ba1..8d3be8b0c 100644 --- a/library/Zend/Service/Ebay/Finding/Response/Abstract.php +++ b/library/Zend/Service/Ebay/Finding/Response/Abstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Response/Histograms.php b/library/Zend/Service/Ebay/Finding/Response/Histograms.php index 3281c4b9b..6f880e09b 100644 --- a/library/Zend/Service/Ebay/Finding/Response/Histograms.php +++ b/library/Zend/Service/Ebay/Finding/Response/Histograms.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Histograms.php 22804 2010-08-08 05:08:05Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Response_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Response/Items.php b/library/Zend/Service/Ebay/Finding/Response/Items.php index 288cf6b75..cc41bee70 100644 --- a/library/Zend/Service/Ebay/Finding/Response/Items.php +++ b/library/Zend/Service/Ebay/Finding/Response/Items.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Items.php 22804 2010-08-08 05:08:05Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Response_Histograms */ diff --git a/library/Zend/Service/Ebay/Finding/Response/Keywords.php b/library/Zend/Service/Ebay/Finding/Response/Keywords.php index cd27f92fb..0b973c1f4 100644 --- a/library/Zend/Service/Ebay/Finding/Response/Keywords.php +++ b/library/Zend/Service/Ebay/Finding/Response/Keywords.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Keywords.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Response_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Search/Item.php b/library/Zend/Service/Ebay/Finding/Search/Item.php index fd43726cf..e831fdecd 100644 --- a/library/Zend/Service/Ebay/Finding/Search/Item.php +++ b/library/Zend/Service/Ebay/Finding/Search/Item.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http:framework.zend.com/license/new-bsd New BSD License * @version $Id: Item.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http:framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Search/Item/Set.php b/library/Zend/Service/Ebay/Finding/Search/Item/Set.php index 1c331c495..f62916df9 100644 --- a/library/Zend/Service/Ebay/Finding/Search/Item/Set.php +++ b/library/Zend/Service/Ebay/Finding/Search/Item/Set.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Set.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Set_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Search/Result.php b/library/Zend/Service/Ebay/Finding/Search/Result.php index 1f22d2b82..b3ef24fcb 100644 --- a/library/Zend/Service/Ebay/Finding/Search/Result.php +++ b/library/Zend/Service/Ebay/Finding/Search/Result.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Result.php 22804 2010-08-08 05:08:05Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/SellerInfo.php b/library/Zend/Service/Ebay/Finding/SellerInfo.php index b21a246d4..db43c3ac5 100644 --- a/library/Zend/Service/Ebay/Finding/SellerInfo.php +++ b/library/Zend/Service/Ebay/Finding/SellerInfo.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: SellerInfo.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/SellingStatus.php b/library/Zend/Service/Ebay/Finding/SellingStatus.php index 8fb4eb9f6..6c8c073d0 100644 --- a/library/Zend/Service/Ebay/Finding/SellingStatus.php +++ b/library/Zend/Service/Ebay/Finding/SellingStatus.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: SellingStatus.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Set/Abstract.php b/library/Zend/Service/Ebay/Finding/Set/Abstract.php index 04c75a0db..5d62a837b 100644 --- a/library/Zend/Service/Ebay/Finding/Set/Abstract.php +++ b/library/Zend/Service/Ebay/Finding/Set/Abstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Abstract.php 20166 2010-01-09 19:00:17Z bkarwin $ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Ebay_Finding_Set_Abstract implements SeekableIterator, Countable diff --git a/library/Zend/Service/Ebay/Finding/ShippingInfo.php b/library/Zend/Service/Ebay/Finding/ShippingInfo.php index f3c43a1ed..0c9be3296 100644 --- a/library/Zend/Service/Ebay/Finding/ShippingInfo.php +++ b/library/Zend/Service/Ebay/Finding/ShippingInfo.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: ShippingInfo.php 22791 2010-08-04 16:11:47Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Ebay/Finding/Storefront.php b/library/Zend/Service/Ebay/Finding/Storefront.php index 946966c06..92547f42f 100644 --- a/library/Zend/Service/Ebay/Finding/Storefront.php +++ b/library/Zend/Service/Ebay/Finding/Storefront.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Storefront.php 22824 2010-08-09 18:59:54Z renanbr $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Ebay - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @uses Zend_Service_Ebay_Finding_Abstract */ diff --git a/library/Zend/Service/Exception.php b/library/Zend/Service/Exception.php index df70c4363..9cfc374c6 100644 --- a/library/Zend/Service/Exception.php +++ b/library/Zend/Service/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Exception extends Zend_Exception diff --git a/library/Zend/Service/Flickr.php b/library/Zend/Service/Flickr.php index adfc7bd53..8d41350dc 100644 --- a/library/Zend/Service/Flickr.php +++ b/library/Zend/Service/Flickr.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Flickr.php 22598 2010-07-16 21:24:14Z mikaelkael $ + * @version $Id: Flickr.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr diff --git a/library/Zend/Service/Flickr/Image.php b/library/Zend/Service/Flickr/Image.php index 90cb4f539..dd4141020 100644 --- a/library/Zend/Service/Flickr/Image.php +++ b/library/Zend/Service/Flickr/Image.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_Image diff --git a/library/Zend/Service/Flickr/Result.php b/library/Zend/Service/Flickr/Result.php index 49a849b23..6978ab163 100644 --- a/library/Zend/Service/Flickr/Result.php +++ b/library/Zend/Service/Flickr/Result.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_Result diff --git a/library/Zend/Service/Flickr/ResultSet.php b/library/Zend/Service/Flickr/ResultSet.php index 1737d9433..e77202389 100644 --- a/library/Zend/Service/Flickr/ResultSet.php +++ b/library/Zend/Service/Flickr/ResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_ResultSet implements SeekableIterator diff --git a/library/Zend/Service/LiveDocx.php b/library/Zend/Service/LiveDocx.php index dc1b07028..5bfe24a36 100644 --- a/library/Zend/Service/LiveDocx.php +++ b/library/Zend/Service/LiveDocx.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LiveDocx.php 23022 2010-10-05 15:30:55Z jonathan_maron $ + * @version $Id: LiveDocx.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @since LiveDocx 1.0 */ @@ -42,37 +42,37 @@ class Zend_Service_LiveDocx * @since LiveDocx 1.0 */ protected $_soapClient; - + /** * WSDL of LiveDocx web service * @var string * @since LiveDocx 1.0 */ protected $_wsdl; - + /** * Array of credentials (username and password) to log into backend server * @var array * @since LiveDocx 1.2 */ protected $_credentials; - + /** * Set to true, when session is logged into backend server * @var boolean * @since LiveDocx 1.2 */ protected $_loggedIn; - + /** * Constructor * * Optionally, pass an array of options (or Zend_Config object). - * - * If an option with the key 'soapClient' is provided, that value will be + * + * If an option with the key 'soapClient' is provided, that value will be * used to set the internal SOAP client used to connect to the LiveDocx * service. - * + * * Use 'soapClient' in the case that you have a dedicated or (locally * installed) licensed LiveDocx server. For example: * @@ -85,7 +85,7 @@ class Zend_Service_LiveDocx * ) * ); * {code} - * + * * Replace the URI of the WSDL in the constructor of Zend_Soap_Client with * that of your dedicated or licensed LiveDocx server. * @@ -100,54 +100,54 @@ class Zend_Service_LiveDocx * ) * ); * {code} - * + * * If you prefer to not pass the username and password through the * constructor, you can also call the following methods: - * + * * {code} * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge(); - * + * * $phpLiveDocx->setUsername('myUsername') * ->setPassword('myPassword'); * {/code} - * + * * Or, if you want to specify your own SoapClient: - * + * * {code} * $phpLiveDocx = new Zend_Service_LiveDocx_MailMerge(); - * + * * $phpLiveDocx->setUsername('myUsername') * ->setPassword('myPassword'); - * + * * $phpLiveDocx->setSoapClient( * new Zend_Soap_Client('https://api.example.com/path/mailmerge.asmx?WSDL') * ); - * {/code} + * {/code} * * @param array|Zend_Config $options * @return void * @throws Zend_Service_LiveDocx_Exception * @since LiveDocx 1.0 - */ + */ public function __construct($options = null) { $this->_credentials = array(); $this->_loggedIn = false; - + if ($options instanceof Zend_Config) { $options = $options->toArray(); } - + if (is_array($options)) { $this->setOptions($options); } } - + /** * Set options * One or more of username, password, soapClient - * - * @param $options + * + * @param array $options * @return Zend_Service_LiveDocx * @since LiveDocx 1.2 */ @@ -159,10 +159,10 @@ public function setOptions(array $options) $this->$method($value); } } - + return $this; } - + /** * Clean up and log out of LiveDocx service * @@ -173,7 +173,7 @@ public function __destruct() { return $this->logOut(); } - + /** * Init Soap client - connect to SOAP service * @@ -187,13 +187,13 @@ protected function _initSoapClient($endpoint) try { // require_once 'Zend/Soap/Client.php'; $this->_soapClient = new Zend_Soap_Client(); - $this->_soapClient->setWsdl($endpoint); + $this->_soapClient->setWsdl($endpoint); } catch (Zend_Soap_Client_Exception $e) { // require_once 'Zend/Service/LiveDocx/Exception.php'; throw new Zend_Service_LiveDocx_Exception('Cannot connect to LiveDocx service at ' . $endpoint, 0, $e); - } + } } - + /** * Get SOAP client * @@ -204,7 +204,7 @@ public function getSoapClient() { return $this->_soapClient; } - + /** * Set SOAP client * @@ -237,18 +237,18 @@ public function logIn() 'Username has not been set. To set username specify the options array in the constructor or call setUsername($username) after instantiation' ); } - + if (null === $this->getPassword()) { // require_once 'Zend/Service/LiveDocx/Exception.php'; throw new Zend_Service_LiveDocx_Exception( 'Password has not been set. To set password specify the options array in the constructor or call setPassword($password) after instantiation' ); } - + if (null === $this->getSoapClient()) { $this->_initSoapClient($this->_wsdl); - } - + } + try { $this->getSoapClient()->LogIn(array( 'username' => $this->getUsername(), @@ -260,9 +260,9 @@ public function logIn() throw new Zend_Service_LiveDocx_Exception( 'Cannot login into LiveDocx service - username and/or password are invalid', 0, $e ); - } + } } - + return $this->_loggedIn; } @@ -284,15 +284,15 @@ public function logOut() throw new Zend_Service_LiveDocx_Exception( 'Cannot log out of LiveDocx service', 0, $e ); - } + } } - + return $this->_loggedIn; } - + /** * Return true, if session is currently logged into the backend server - * + * * @return boolean * @since LiveDocx 1.2 */ @@ -300,10 +300,10 @@ public function isLoggedIn() { return $this->_loggedIn; } - + /** * Set username - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 */ @@ -312,13 +312,13 @@ public function setUsername($username) $this->_credentials['username'] = $username; return $this; } - + /** * Set password - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 - */ + */ public function setPassword($password) { $this->_credentials['password'] = $password; @@ -327,19 +327,19 @@ public function setPassword($password) /** * Set WSDL of LiveDocx web service - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 - */ - public function setWsdl($wsdl) + */ + public function setWsdl($wsdl) { $this->_wsdl = $wsdl; return $this; } - + /** * Return current username - * + * * @return string|null * @since LiveDocx 1.0 */ @@ -348,35 +348,35 @@ public function getUsername() if (isset($this->_credentials['username'])) { return $this->_credentials['username']; } - + return null; } - + /** * Return current password - * + * * @return string|null * @since LiveDocx 1.0 - */ + */ public function getPassword() { if (isset($this->_credentials['password'])) { return $this->_credentials['password']; } - - return null; + + return null; } - + /** * Return WSDL of LiveDocx web service - * + * * @return Zend_Service_LiveDocx * @since LiveDocx 1.0 - */ - public function getWsdl() + */ + public function getWsdl() { return $this->_wsdl; - } + } /** * Return the document format (extension) of a filename @@ -389,7 +389,7 @@ public function getFormat($filename) { return strtolower(substr(strrchr($filename, '.'), 1)); } - + /** * Return the current API version * @@ -400,7 +400,7 @@ public function getVersion() { return self::VERSION; } - + /** * Compare the current API version with another version * @@ -412,4 +412,4 @@ public function compareVersion($version) { return version_compare($version, $this->getVersion()); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/LiveDocx/Exception.php b/library/Zend/Service/LiveDocx/Exception.php index f91f433a4..008e11bb3 100644 --- a/library/Zend/Service/LiveDocx/Exception.php +++ b/library/Zend/Service/LiveDocx/Exception.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @since LiveDocx 1.0 */ diff --git a/library/Zend/Service/LiveDocx/MailMerge.php b/library/Zend/Service/LiveDocx/MailMerge.php index 9f559c09f..09efeeac4 100644 --- a/library/Zend/Service/LiveDocx/MailMerge.php +++ b/library/Zend/Service/LiveDocx/MailMerge.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MailMerge.php 23022 2010-10-05 15:30:55Z jonathan_maron $ + * @version $Id: MailMerge.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Date **/ @@ -30,15 +30,15 @@ * @category Zend * @package Zend_Service * @subpackage LiveDocx - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ class Zend_Service_LiveDocx_MailMerge extends Zend_Service_LiveDocx { /** * URI of LiveDocx.MailMerge WSDL - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ //const WSDL = 'https://api.livedocx.com/1.2/mailmerge.asmx?WSDL'; const WSDL = 'https://api.livedocx.com/2.0/mailmerge.asmx?WSDL'; @@ -71,7 +71,7 @@ public function __construct($options = null) $this->_wsdl = self::WSDL; $this->_fieldValues = array(); $this->_blockFieldValues = array(); - + parent::__construct($options); } @@ -93,7 +93,7 @@ public function setLocalTemplate($filename) } $this->logIn(); - + try { $this->getSoapClient()->SetLocalTemplate(array( 'template' => base64_encode(file_get_contents($filename)), @@ -121,7 +121,7 @@ public function setLocalTemplate($filename) public function setRemoteTemplate($filename) { $this->logIn(); - + try { $this->getSoapClient()->SetRemoteTemplate(array( 'filename' => $filename, @@ -147,7 +147,7 @@ public function setRemoteTemplate($filename) public function setFieldValues($values) { $this->logIn(); - + foreach ($values as $value) { if (is_array($value)) { $method = 'multiAssocArrayToArrayOfArrayOfString'; @@ -156,7 +156,7 @@ public function setFieldValues($values) } break; } - + try { $this->getSoapClient()->SetFieldValues(array( 'fieldValues' => self::$method($values), @@ -184,7 +184,7 @@ public function setFieldValues($values) public function setFieldValue($field, $value) { $this->_fieldValues[$field] = $value; - + return $this; } @@ -201,7 +201,7 @@ public function setFieldValue($field, $value) public function setBlockFieldValues($blockName, $blockFieldValues) { $this->logIn(); - + try { $this->getSoapClient()->SetBlockFieldValues(array( 'blockName' => $blockName, @@ -250,9 +250,9 @@ public function assign($field, $value = null) /** * Set a password to open to document - * + * * This method can only be used for PDF documents - * + * * @param string $password * @return Zend_Service_LiveDocx_MailMerge * @throws Zend_Service_LiveDocx_Exception @@ -261,7 +261,7 @@ public function assign($field, $value = null) public function setDocumentPassword($password) { $this->logIn(); - + try { $this->getSoapClient()->SetDocumentPassword(array( 'password' => $password @@ -272,18 +272,18 @@ public function setDocumentPassword($password) 'Cannot set document password. This method can be used on PDF files only.', 0, $e ); } - - return $this; + + return $this; } - + /** * Set a master password for document and determine which security features * are accessible without using the master password. - * + * * As default, nothing is allowed. To allow a security setting, * explicatively set it using one of he DOCUMENT_ACCESS_PERMISSION_* class - * constants. - * + * constants. + * * {code} * $phpLiveDocx->setDocumentAccessPermissions( * array ( @@ -293,10 +293,10 @@ public function setDocumentPassword($password) * 'myDocumentAccessPassword' * ); * {code} - * + * * This method can only be used for PDF documents - * - * @param array $permissions + * + * @param array $permissions * @param string $password * @return Zend_Service_LiveDocx_MailMerge * @throws Zend_Service_LiveDocx_Exception @@ -305,7 +305,7 @@ public function setDocumentPassword($password) public function setDocumentAccessPermissions($permissions, $password) { $this->logIn(); - + try { $this->getSoapClient()->SetDocumentAccessPermissions(array( 'permissions' => $permissions, @@ -317,10 +317,10 @@ public function setDocumentAccessPermissions($permissions, $password) 'Cannot set document access permissions', 0, $e ); } - - return $this; - } - + + return $this; + } + /** * Merge assigned data with template to generate document * @@ -331,7 +331,7 @@ public function setDocumentAccessPermissions($permissions, $password) public function createDocument() { $this->logIn(); - + if (count($this->_fieldValues) > 0) { $this->setFieldValues($this->_fieldValues); } @@ -361,9 +361,9 @@ public function createDocument() public function retrieveDocument($format) { $this->logIn(); - + $format = strtolower($format); - + try { $result = $this->getSoapClient()->RetrieveDocument(array( 'format' => $format, @@ -390,7 +390,7 @@ public function retrieveDocument($format) public function getMetafiles($fromPage, $toPage) { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetMetafiles(array( 'fromPage' => (integer) $fromPage, @@ -422,7 +422,7 @@ public function getMetafiles($fromPage, $toPage) public function getAllMetafiles() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetAllMetafiles(); @@ -439,8 +439,8 @@ public function getAllMetafiles() } return $ret; - } - + } + /** * Return graphical bitmap data for specified page range of created document * Return array contains bitmap data (binary) - array key is page number @@ -451,13 +451,13 @@ public function getAllMetafiles() * @param string $format * @return array * @since LiveDocx 1.2 - */ + */ public function getBitmaps($fromPage, $toPage, $zoomFactor, $format) { $this->logIn(); - + $ret = array(); - + $result = $this->getSoapClient()->GetBitmaps(array( 'fromPage' => (integer) $fromPage, 'toPage' => (integer) $toPage, @@ -477,9 +477,9 @@ public function getBitmaps($fromPage, $toPage, $zoomFactor, $format) } } - return $ret; + return $ret; } - + /** * Return graphical bitmap data for all pages of created document * Return array contains bitmap data (binary) - array key is page number @@ -488,11 +488,11 @@ public function getBitmaps($fromPage, $toPage, $zoomFactor, $format) * @param string $format * @return array * @since LiveDocx 1.2 - */ + */ public function getAllBitmaps($zoomFactor, $format) { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetAllBitmaps(array( 'zoomFactor' => (integer) $zoomFactor, @@ -511,8 +511,8 @@ public function getAllBitmaps($zoomFactor, $format) } } - return $ret; - } + return $ret; + } /** * Return all the fields in the template @@ -523,7 +523,7 @@ public function getAllBitmaps($zoomFactor, $format) public function getFieldNames() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetFieldNames(); @@ -548,7 +548,7 @@ public function getFieldNames() public function getBlockFieldNames($blockName) { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetBlockFieldNames(array( 'blockName' => $blockName @@ -574,7 +574,7 @@ public function getBlockFieldNames($blockName) public function getBlockNames() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetBlockNames(); @@ -600,7 +600,7 @@ public function getBlockNames() public function uploadTemplate($filename) { $this->logIn(); - + try { $this->getSoapClient()->UploadTemplate(array( 'template' => base64_encode(file_get_contents($filename)), @@ -625,7 +625,7 @@ public function uploadTemplate($filename) public function downloadTemplate($filename) { $this->logIn(); - + try { $result = $this->getSoapClient()->DownloadTemplate(array( 'filename' => basename($filename), @@ -651,7 +651,7 @@ public function downloadTemplate($filename) public function deleteTemplate($filename) { $this->logIn(); - + $this->getSoapClient()->DeleteTemplate(array( 'filename' => basename($filename), )); @@ -661,12 +661,12 @@ public function deleteTemplate($filename) * List all templates stored on LiveDocx service * * @return array - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ public function listTemplates() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->ListTemplates(); @@ -687,7 +687,7 @@ public function listTemplates() public function templateExists($filename) { $this->logIn(); - + $result = $this->getSoapClient()->TemplateExists(array( 'filename' => basename($filename), )); @@ -704,7 +704,7 @@ public function templateExists($filename) public function shareDocument() { $this->logIn(); - + $ret = null; $result = $this->getSoapClient()->ShareDocument(); @@ -724,7 +724,7 @@ public function shareDocument() public function listSharedDocuments() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->ListSharedDocuments(); @@ -747,7 +747,7 @@ public function listSharedDocuments() public function deleteSharedDocument($filename) { $this->logIn(); - + $this->getSoapClient()->DeleteSharedDocument(array( 'filename' => basename($filename), )); @@ -764,7 +764,7 @@ public function deleteSharedDocument($filename) public function downloadSharedDocument($filename) { $this->logIn(); - + try { $result = $this->getSoapClient()->DownloadSharedDocument(array( 'filename' => basename($filename), @@ -789,11 +789,11 @@ public function downloadSharedDocument($filename) public function sharedDocumentExists($filename) { $this->logIn(); - + $ret = false; $sharedDocuments = $this->listSharedDocuments(); foreach ($sharedDocuments as $shareDocument) { - if (isset($shareDocument['filename']) + if (isset($shareDocument['filename']) && (basename($filename) === $shareDocument['filename']) ) { $ret = true; @@ -813,7 +813,7 @@ public function sharedDocumentExists($filename) public function getTemplateFormats() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetTemplateFormats(); @@ -834,7 +834,7 @@ public function getTemplateFormats() public function getDocumentFormats() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetDocumentFormats(); @@ -845,7 +845,7 @@ public function getDocumentFormats() return $ret; } - + /** * Return the names of all fonts that are installed on backend server * @@ -855,7 +855,7 @@ public function getDocumentFormats() public function getFontNames() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetFontNames(); @@ -864,8 +864,8 @@ public function getFontNames() } return $ret; - } - + } + /** * Return supported document access options * @@ -875,7 +875,7 @@ public function getFontNames() public function getDocumentAccessOptions() { $this->logIn(); - + $ret = array(); $result = $this->getSoapClient()->GetDocumentAccessOptions(); @@ -947,7 +947,7 @@ public function getImageFormats() trigger_error($errorMessage, E_USER_NOTICE); */ - + return $this->$replacement(); } @@ -1062,12 +1062,12 @@ public function imageExists($filename) * * @param array $list * @return array - * @since LiveDocx 1.0 + * @since LiveDocx 1.0 */ protected function _backendListArrayToMultiAssocArray($list) { $this->logIn(); - + $ret = array(); if (isset($list->ArrayOfString)) { foreach ($list->ArrayOfString as $a) { @@ -1108,7 +1108,7 @@ public static function assocArrayToArrayOfArrayOfString($assoc) { $arrayKeys = array_keys($assoc); $arrayValues = array_values($assoc); - + return array($arrayKeys, $arrayValues); } diff --git a/library/Zend/Service/Nirvanix.php b/library/Zend/Service/Nirvanix.php index 6558b9354..577c57e0a 100644 --- a/library/Zend/Service/Nirvanix.php +++ b/library/Zend/Service/Nirvanix.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nirvanix.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nirvanix.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix diff --git a/library/Zend/Service/Nirvanix/Exception.php b/library/Zend/Service/Nirvanix/Exception.php index dab6c99b0..c69943b9d 100644 --- a/library/Zend/Service/Nirvanix/Exception.php +++ b/library/Zend/Service/Nirvanix/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/Nirvanix/Namespace/Base.php b/library/Zend/Service/Nirvanix/Namespace/Base.php index b6bc68a3e..8f8fe483a 100644 --- a/library/Zend/Service/Nirvanix/Namespace/Base.php +++ b/library/Zend/Service/Nirvanix/Namespace/Base.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Namespace_Base @@ -76,7 +76,7 @@ class Zend_Service_Nirvanix_Namespace_Base /** * Class constructor. * - * @param $options array Options and dependency injection + * @param array $options Options and dependency injection */ public function __construct($options = array()) { diff --git a/library/Zend/Service/Nirvanix/Namespace/Imfs.php b/library/Zend/Service/Nirvanix/Namespace/Imfs.php index f80ee28d3..73421c4d5 100644 --- a/library/Zend/Service/Nirvanix/Namespace/Imfs.php +++ b/library/Zend/Service/Nirvanix/Namespace/Imfs.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imfs.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imfs.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespace_Base diff --git a/library/Zend/Service/Nirvanix/Response.php b/library/Zend/Service/Nirvanix/Response.php index a85dd3771..ac3a53953 100644 --- a/library/Zend/Service/Nirvanix/Response.php +++ b/library/Zend/Service/Nirvanix/Response.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Response diff --git a/library/Zend/Service/ReCaptcha.php b/library/Zend/Service/ReCaptcha.php index 666f4d559..e199cdcb3 100644 --- a/library/Zend/Service/ReCaptcha.php +++ b/library/Zend/Service/ReCaptcha.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,9 +34,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReCaptcha.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ReCaptcha.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Service_ReCaptcha extends Zend_Service_Abstract { @@ -45,21 +45,21 @@ class Zend_Service_ReCaptcha extends Zend_Service_Abstract * * @var string */ - const API_SERVER = 'http://api.recaptcha.net'; + const API_SERVER = 'http://www.google.com/recaptcha/api'; /** * URI to the secure API * * @var string */ - const API_SECURE_SERVER = 'https://api-secure.recaptcha.net'; + const API_SECURE_SERVER = 'https://www.google.com/recaptcha/api'; /** * URI to the verify server * * @var string */ - const VERIFY_SERVER = 'http://api-verify.recaptcha.net/verify'; + const VERIFY_SERVER = 'http://www.google.com/recaptcha/api/verify'; /** * Public key used when displaying the captcha @@ -373,10 +373,11 @@ public function setPrivateKey($privateKey) * * This method uses the public key to fetch a recaptcha form. * + * @param null|string $name Base name for recaptcha form elements * @return string * @throws Zend_Service_ReCaptcha_Exception */ - public function getHtml() + public function getHtml($name = null) { if ($this->_publicKey === null) { /** @see Zend_Service_ReCaptcha_Exception */ @@ -415,6 +416,12 @@ public function getHtml() SCRIPT; } + $challengeField = 'recaptcha_challenge_field'; + $responseField = 'recaptcha_response_field'; + if (!empty($name)) { + $challengeField = $name . '[' . $challengeField . ']'; + $responseField = $name . '[' . $responseField . ']'; + } $return = $reCaptchaOptions; $return .= << {$htmlBreak} - - HTML; diff --git a/library/Zend/Service/ReCaptcha/Exception.php b/library/Zend/Service/ReCaptcha/Exception.php index 65975a52b..54e33c503 100644 --- a/library/Zend/Service/ReCaptcha/Exception.php +++ b/library/Zend/Service/ReCaptcha/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Service_ReCaptcha_Exception extends Zend_Service_Exception {} \ No newline at end of file diff --git a/library/Zend/Service/ReCaptcha/MailHide.php b/library/Zend/Service/ReCaptcha/MailHide.php index f365089fa..6da90d0f4 100644 --- a/library/Zend/Service/ReCaptcha/MailHide.php +++ b/library/Zend/Service/ReCaptcha/MailHide.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MailHide.php 20108 2010-01-06 22:05:31Z matthew $ + * @version $Id: MailHide.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha { @@ -312,18 +312,18 @@ public function getHtml($email = null) $enc = $this->getOption('encoding'); /* Genrate the HTML used to represent the email address */ - $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc) - . '' . $this->_options['linkHiddenText'] . '@' + . $this->_options['popupWidth'] + . ',height=' + . $this->_options['popupHeight'] + . '\'); return false;" title="' + . $this->_options['linkTitle'] + . '">' . $this->_options['linkHiddenText'] . '@' . htmlentities($this->getEmailDomainPart(), ENT_COMPAT, $enc); return $html; diff --git a/library/Zend/Service/ReCaptcha/MailHide/Exception.php b/library/Zend/Service/ReCaptcha/MailHide/Exception.php index 2878f3bd3..9e3b2c67b 100644 --- a/library/Zend/Service/ReCaptcha/MailHide/Exception.php +++ b/library/Zend/Service/ReCaptcha/MailHide/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Service_ReCaptcha_Exception {} \ No newline at end of file diff --git a/library/Zend/Service/ReCaptcha/Response.php b/library/Zend/Service/ReCaptcha/Response.php index 95a2c0472..2fd3f6af6 100644 --- a/library/Zend/Service/ReCaptcha/Response.php +++ b/library/Zend/Service/ReCaptcha/Response.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,9 +25,9 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Service_ReCaptcha_Response { diff --git a/library/Zend/Service/ShortUrl/AbstractShortener.php b/library/Zend/Service/ShortUrl/AbstractShortener.php index 915eb458c..94cdac0f5 100644 --- a/library/Zend/Service/ShortUrl/AbstractShortener.php +++ b/library/Zend/Service/ShortUrl/AbstractShortener.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -32,11 +32,11 @@ /** * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_ShortUrl_AbstractShortener - extends Zend_Service_Abstract + extends Zend_Service_Abstract implements Zend_Service_ShortUrl_Shortener { /** @@ -46,7 +46,7 @@ abstract class Zend_Service_ShortUrl_AbstractShortener */ protected $_baseUri = null; - + /** * Checks whether URL to be shortened is valid * @@ -63,7 +63,7 @@ protected function _validateUri($url) )); } } - + /** * Verifies that the URL has been shortened by this service * diff --git a/library/Zend/Service/ShortUrl/Exception.php b/library/Zend/Service/ShortUrl/Exception.php index a638c2070..a54985f14 100644 --- a/library/Zend/Service/ShortUrl/Exception.php +++ b/library/Zend/Service/ShortUrl/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/ShortUrl/IsGd.php b/library/Zend/Service/ShortUrl/IsGd.php index ac418bf92..17e3123d8 100644 --- a/library/Zend/Service/ShortUrl/IsGd.php +++ b/library/Zend/Service/ShortUrl/IsGd.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_IsGd extends Zend_Service_ShortUrl_AbstractShortener @@ -40,7 +40,7 @@ class Zend_Service_ShortUrl_IsGd extends Zend_Service_ShortUrl_AbstractShortener * @var string */ protected $_baseUri = 'http://is.gd'; - + /** * This function shortens long url * @@ -51,15 +51,15 @@ class Zend_Service_ShortUrl_IsGd extends Zend_Service_ShortUrl_AbstractShortener public function shorten($url) { $this->_validateUri($url); - + $serviceUri = 'http://is.gd/api.php'; - + $this->getHttpClient()->resetParameters(true); $this->getHttpClient()->setUri($serviceUri); $this->getHttpClient()->setParameterGet('longurl', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -75,21 +75,21 @@ public function unshorten($shortenedUrl) $this->_validateUri($shortenedUrl); $this->_verifyBaseUri($shortenedUrl); - + $this->getHttpClient()->resetParameters(true); $this->getHttpClient()->setUri($shortenedUrl); $this->getHttpClient()->setConfig(array('maxredirects' => 0)); - + $response = $this->getHttpClient()->request(); if ($response->isError()) { // require_once 'Zend/Service/ShortUrl/Exception.php'; throw new Zend_Service_ShortUrl_Exception($response->getMessage()); } - + if ($response->isRedirect()) { return $response->getHeader('Location'); } - + // require_once 'Zend/Service/ShortUrl/Exception.php'; throw new Zend_Service_ShortUrl_Exception('Url unshortening was not successful'); } diff --git a/library/Zend/Service/ShortUrl/JdemCz.php b/library/Zend/Service/ShortUrl/JdemCz.php index a1987b0e9..a9c8fcf33 100644 --- a/library/Zend/Service/ShortUrl/JdemCz.php +++ b/library/Zend/Service/ShortUrl/JdemCz.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_JdemCz extends Zend_Service_ShortUrl_AbstractShortener @@ -40,7 +40,7 @@ class Zend_Service_ShortUrl_JdemCz extends Zend_Service_ShortUrl_AbstractShorten * @var string */ protected $_baseUri = 'http://jdem.cz'; - + /** * This function shortens long url * @@ -51,14 +51,14 @@ class Zend_Service_ShortUrl_JdemCz extends Zend_Service_ShortUrl_AbstractShorten public function shorten($url) { $this->_validateUri($url); - + $serviceUri = 'http://www.jdem.cz/get'; - + $this->getHttpClient()->setUri($serviceUri); $this->getHttpClient()->setParameterGet('url', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -74,11 +74,11 @@ public function unshorten($shortenedUrl) $this->_validateUri($shortenedUrl); $this->_verifyBaseUri($shortenedUrl); - + $this->getHttpClient()->setUri($shortenedUrl)->setParameterGet('kam', 1); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } } diff --git a/library/Zend/Service/ShortUrl/MetamarkNet.php b/library/Zend/Service/ShortUrl/MetamarkNet.php index 1f5f797b6..d64a74272 100644 --- a/library/Zend/Service/ShortUrl/MetamarkNet.php +++ b/library/Zend/Service/ShortUrl/MetamarkNet.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_MetamarkNet extends Zend_Service_ShortUrl_AbstractShortener @@ -40,9 +40,9 @@ class Zend_Service_ShortUrl_MetamarkNet extends Zend_Service_ShortUrl_AbstractSh * @var string */ protected $_baseUri = 'http://xrl.us/'; - + protected $_apiUri = 'http://metamark.net/api/rest/simple'; - + /** * This function shortens long url * @@ -53,12 +53,12 @@ class Zend_Service_ShortUrl_MetamarkNet extends Zend_Service_ShortUrl_AbstractSh public function shorten($url) { $this->_validateUri($url); - + $this->getHttpClient()->setUri($this->_apiUri); $this->getHttpClient()->setParameterGet('long_url', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -74,12 +74,12 @@ public function unshorten($shortenedUrl) $this->_validateUri($shortenedUrl); $this->_verifyBaseUri($shortenedUrl); - + $this->getHttpClient()->setUri($this->_apiUri); $this->getHttpClient()->setParameterGet('short_url', $shortenedUrl); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } } diff --git a/library/Zend/Service/ShortUrl/Shortener.php b/library/Zend/Service/ShortUrl/Shortener.php index a866f6324..df22776b3 100644 --- a/library/Zend/Service/ShortUrl/Shortener.php +++ b/library/Zend/Service/ShortUrl/Shortener.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -22,19 +22,19 @@ /** * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Service_ShortUrl_Shortener { /** * This function shortens long url - * + * * @param string $url URL to Shorten * @return string Shortened Url */ public function shorten($shortenedUrl); - + /** * Reveals target for short URL * diff --git a/library/Zend/Service/ShortUrl/TinyUrlCom.php b/library/Zend/Service/ShortUrl/TinyUrlCom.php index 67aadcbd2..515119129 100644 --- a/library/Zend/Service/ShortUrl/TinyUrlCom.php +++ b/library/Zend/Service/ShortUrl/TinyUrlCom.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: $ */ @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Service_ShortUrl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_ShortUrl_TinyUrlCom extends Zend_Service_ShortUrl_AbstractShortener @@ -40,7 +40,7 @@ class Zend_Service_ShortUrl_TinyUrlCom extends Zend_Service_ShortUrl_AbstractSho * @var string */ protected $_baseUri = 'http://tinyurl.com'; - + /** * This function shortens long url * @@ -53,12 +53,12 @@ public function shorten($url) $this->_validateUri($url); $serviceUri = 'http://tinyurl.com/api-create.php'; - + $this->getHttpClient()->setUri($serviceUri); $this->getHttpClient()->setParameterGet('url', $url); - + $response = $this->getHttpClient()->request(); - + return $response->getBody(); } @@ -72,29 +72,29 @@ public function shorten($url) public function unshorten($shortenedUrl) { $this->_validateUri($shortenedUrl); - + $this->_verifyBaseUri($shortenedUrl); - + //TinyUrl.com does not have an API for that, but we can use preview feature //we need new Zend_Http_Client $this->setHttpClient(new Zend_Http_Client()); - + $this->getHttpClient() ->setCookie('preview', 1) ->setUri($shortenedUrl); //get response $response = $this->getHttpClient()->request(); - + // require_once 'Zend/Dom/Query.php'; $dom = new Zend_Dom_Query($response->getBody()); - + //find the redirect url link $results = $dom->query('a#redirecturl'); - + //get href $originalUrl = $results->current()->getAttribute('href'); - + return $originalUrl; } } diff --git a/library/Zend/Service/Simpy.php b/library/Zend/Service/Simpy.php index 298018d22..cd57dd168 100644 --- a/library/Zend/Service/Simpy.php +++ b/library/Zend/Service/Simpy.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simpy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Simpy.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @link http://www.simpy.com/doc/api/rest/ */ diff --git a/library/Zend/Service/Simpy/Link.php b/library/Zend/Service/Simpy/Link.php index 48825a3b1..44cf82891 100644 --- a/library/Zend/Service/Simpy/Link.php +++ b/library/Zend/Service/Simpy/Link.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Link.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Link.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Link diff --git a/library/Zend/Service/Simpy/LinkQuery.php b/library/Zend/Service/Simpy/LinkQuery.php index 9d308179e..bf3d616ad 100644 --- a/library/Zend/Service/Simpy/LinkQuery.php +++ b/library/Zend/Service/Simpy/LinkQuery.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LinkQuery.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LinkQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_LinkQuery diff --git a/library/Zend/Service/Simpy/LinkSet.php b/library/Zend/Service/Simpy/LinkSet.php index 92fc6f8f1..fe0b95fae 100644 --- a/library/Zend/Service/Simpy/LinkSet.php +++ b/library/Zend/Service/Simpy/LinkSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LinkSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LinkSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_LinkSet implements IteratorAggregate diff --git a/library/Zend/Service/Simpy/Note.php b/library/Zend/Service/Simpy/Note.php index 210468e4c..b7239e57f 100644 --- a/library/Zend/Service/Simpy/Note.php +++ b/library/Zend/Service/Simpy/Note.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Note.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Note.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Note diff --git a/library/Zend/Service/Simpy/NoteSet.php b/library/Zend/Service/Simpy/NoteSet.php index fe6111084..08b7c8317 100644 --- a/library/Zend/Service/Simpy/NoteSet.php +++ b/library/Zend/Service/Simpy/NoteSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NoteSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NoteSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_NoteSet implements IteratorAggregate diff --git a/library/Zend/Service/Simpy/Tag.php b/library/Zend/Service/Simpy/Tag.php index 58895cdd8..b0db04c99 100644 --- a/library/Zend/Service/Simpy/Tag.php +++ b/library/Zend/Service/Simpy/Tag.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tag.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Tag diff --git a/library/Zend/Service/Simpy/TagSet.php b/library/Zend/Service/Simpy/TagSet.php index 05bfa9560..ae5d8a3a4 100644 --- a/library/Zend/Service/Simpy/TagSet.php +++ b/library/Zend/Service/Simpy/TagSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_TagSet implements IteratorAggregate diff --git a/library/Zend/Service/Simpy/Watchlist.php b/library/Zend/Service/Simpy/Watchlist.php index a485cf4d1..a6c7dfc39 100644 --- a/library/Zend/Service/Simpy/Watchlist.php +++ b/library/Zend/Service/Simpy/Watchlist.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Watchlist.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Watchlist.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Watchlist diff --git a/library/Zend/Service/Simpy/WatchlistFilter.php b/library/Zend/Service/Simpy/WatchlistFilter.php index 14a198158..5b64a0b93 100644 --- a/library/Zend/Service/Simpy/WatchlistFilter.php +++ b/library/Zend/Service/Simpy/WatchlistFilter.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WatchlistFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WatchlistFilter.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_WatchlistFilter diff --git a/library/Zend/Service/Simpy/WatchlistFilterSet.php b/library/Zend/Service/Simpy/WatchlistFilterSet.php index 979905797..c18c6052e 100644 --- a/library/Zend/Service/Simpy/WatchlistFilterSet.php +++ b/library/Zend/Service/Simpy/WatchlistFilterSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WatchlistFilterSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WatchlistFilterSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_WatchlistFilterSet implements IteratorAggregate diff --git a/library/Zend/Service/Simpy/WatchlistSet.php b/library/Zend/Service/Simpy/WatchlistSet.php index 733590e7a..dede6416c 100644 --- a/library/Zend/Service/Simpy/WatchlistSet.php +++ b/library/Zend/Service/Simpy/WatchlistSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WatchlistSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WatchlistSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_WatchlistSet implements IteratorAggregate diff --git a/library/Zend/Service/SlideShare.php b/library/Zend/Service/SlideShare.php index 382a54864..dd3e74e96 100644 --- a/library/Zend/Service/SlideShare.php +++ b/library/Zend/Service/SlideShare.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SlideShare.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SlideShare.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -44,7 +44,7 @@ * @package Zend_Service * @subpackage SlideShare * @throws Zend_Service_SlideShare_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare diff --git a/library/Zend/Service/SlideShare/Exception.php b/library/Zend/Service/SlideShare/Exception.php index 0c8d370b6..a317ff279 100644 --- a/library/Zend/Service/SlideShare/Exception.php +++ b/library/Zend/Service/SlideShare/Exception.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/SlideShare/SlideShow.php b/library/Zend/Service/SlideShare/SlideShow.php index e2164e675..527a7dd40 100644 --- a/library/Zend/Service/SlideShare/SlideShow.php +++ b/library/Zend/Service/SlideShare/SlideShow.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SlideShow.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SlideShow.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare_SlideShow diff --git a/library/Zend/Service/StrikeIron.php b/library/Zend/Service/StrikeIron.php index 8072972f9..077074b7f 100644 --- a/library/Zend/Service/StrikeIron.php +++ b/library/Zend/Service/StrikeIron.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StrikeIron.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StrikeIron.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron diff --git a/library/Zend/Service/StrikeIron/Base.php b/library/Zend/Service/StrikeIron/Base.php index c72a913f8..0f73203e7 100644 --- a/library/Zend/Service/StrikeIron/Base.php +++ b/library/Zend/Service/StrikeIron/Base.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Base @@ -193,10 +193,10 @@ protected function _transformCall($method, $params) * on what was originally called. * * @see __call() - * @param $result Raw result returned from SOAPClient_>__soapCall() - * @param $method Method name that was passed to SOAPClient->__soapCall() - * @param $params Method parameters that were passed to SOAPClient->__soapCall() - * @return mixed Transformed result + * @param object $result Raw result returned from SOAPClient_>__soapCall() + * @param string $method Method name that was passed to SOAPClient->__soapCall() + * @param array $params Method parameters that were passed to SOAPClient->__soapCall() + * @return mixed Transformed result */ protected function _transformResult($result, $method, $params) { diff --git a/library/Zend/Service/StrikeIron/Decorator.php b/library/Zend/Service/StrikeIron/Decorator.php index f74fb7cbc..ffc4f7040 100644 --- a/library/Zend/Service/StrikeIron/Decorator.php +++ b/library/Zend/Service/StrikeIron/Decorator.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Decorator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Decorator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Decorator diff --git a/library/Zend/Service/StrikeIron/Exception.php b/library/Zend/Service/StrikeIron/Exception.php index 7c1eaf2ac..c88c0c695 100644 --- a/library/Zend/Service/StrikeIron/Exception.php +++ b/library/Zend/Service/StrikeIron/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php b/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php index 934906cd1..44136757c 100644 --- a/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php +++ b/library/Zend/Service/StrikeIron/SalesUseTaxBasic.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SalesUseTaxBasic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SalesUseTaxBasic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Service_StrikeIron_Base */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_SalesUseTaxBasic extends Zend_Service_StrikeIron_Base diff --git a/library/Zend/Service/StrikeIron/USAddressVerification.php b/library/Zend/Service/StrikeIron/USAddressVerification.php index 2cda9501d..a622f5cb7 100644 --- a/library/Zend/Service/StrikeIron/USAddressVerification.php +++ b/library/Zend/Service/StrikeIron/USAddressVerification.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: USAddressVerification.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: USAddressVerification.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Service_StrikeIron_Base */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_USAddressVerification extends Zend_Service_StrikeIron_Base diff --git a/library/Zend/Service/StrikeIron/ZipCodeInfo.php b/library/Zend/Service/StrikeIron/ZipCodeInfo.php index 8f9ab90f3..3e32bf06e 100644 --- a/library/Zend/Service/StrikeIron/ZipCodeInfo.php +++ b/library/Zend/Service/StrikeIron/ZipCodeInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZipCodeInfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ZipCodeInfo.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Service_StrikeIron_Base */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_ZipCodeInfo extends Zend_Service_StrikeIron_Base diff --git a/library/Zend/Service/Technorati.php b/library/Zend/Service/Technorati.php index b569b0777..4e44b7a6a 100644 --- a/library/Zend/Service/Technorati.php +++ b/library/Zend/Service/Technorati.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Technorati.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Technorati.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati @@ -84,10 +84,15 @@ class Zend_Service_Technorati */ public function __construct($apiKey) { - iconv_set_encoding('output_encoding', 'UTF-8'); - iconv_set_encoding('input_encoding', 'UTF-8'); - iconv_set_encoding('internal_encoding', 'UTF-8'); - + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('output_encoding', 'UTF-8'); + iconv_set_encoding('input_encoding', 'UTF-8'); + iconv_set_encoding('internal_encoding', 'UTF-8'); + } else { + ini_set('output_encoding', 'UTF-8'); + ini_set('input_encoding', 'UTF-8'); + ini_set('default_charset', 'UTF-8'); + } $this->_apiKey = $apiKey; } diff --git a/library/Zend/Service/Technorati/Author.php b/library/Zend/Service/Technorati/Author.php index 65003f5df..a2909e87a 100644 --- a/library/Zend/Service/Technorati/Author.php +++ b/library/Zend/Service/Technorati/Author.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Author.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Author.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Author diff --git a/library/Zend/Service/Technorati/BlogInfoResult.php b/library/Zend/Service/Technorati/BlogInfoResult.php index 4aa9ec30b..a8b6e3680 100644 --- a/library/Zend/Service/Technorati/BlogInfoResult.php +++ b/library/Zend/Service/Technorati/BlogInfoResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlogInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BlogInfoResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_BlogInfoResult diff --git a/library/Zend/Service/Technorati/CosmosResult.php b/library/Zend/Service/Technorati/CosmosResult.php index 7d47bf055..aa17788d8 100644 --- a/library/Zend/Service/Technorati/CosmosResult.php +++ b/library/Zend/Service/Technorati/CosmosResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CosmosResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CosmosResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Result diff --git a/library/Zend/Service/Technorati/CosmosResultSet.php b/library/Zend/Service/Technorati/CosmosResultSet.php index 0d91c1c6f..ec7027d95 100644 --- a/library/Zend/Service/Technorati/CosmosResultSet.php +++ b/library/Zend/Service/Technorati/CosmosResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CosmosResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CosmosResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_ResultSet diff --git a/library/Zend/Service/Technorati/DailyCountsResult.php b/library/Zend/Service/Technorati/DailyCountsResult.php index 1bfd0e1c9..63d82f25c 100644 --- a/library/Zend/Service/Technorati/DailyCountsResult.php +++ b/library/Zend/Service/Technorati/DailyCountsResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DailyCountsResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DailyCountsResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_Result diff --git a/library/Zend/Service/Technorati/DailyCountsResultSet.php b/library/Zend/Service/Technorati/DailyCountsResultSet.php index 422f088fe..20d7f1f0d 100644 --- a/library/Zend/Service/Technorati/DailyCountsResultSet.php +++ b/library/Zend/Service/Technorati/DailyCountsResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DailyCountsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DailyCountsResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technorati_ResultSet diff --git a/library/Zend/Service/Technorati/Exception.php b/library/Zend/Service/Technorati/Exception.php index 0a332eb0f..226d22889 100644 --- a/library/Zend/Service/Technorati/Exception.php +++ b/library/Zend/Service/Technorati/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/Technorati/GetInfoResult.php b/library/Zend/Service/Technorati/GetInfoResult.php index a5cd3c722..34c401ebd 100644 --- a/library/Zend/Service/Technorati/GetInfoResult.php +++ b/library/Zend/Service/Technorati/GetInfoResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GetInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GetInfoResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_GetInfoResult diff --git a/library/Zend/Service/Technorati/KeyInfoResult.php b/library/Zend/Service/Technorati/KeyInfoResult.php index 039de6005..2079a2a86 100644 --- a/library/Zend/Service/Technorati/KeyInfoResult.php +++ b/library/Zend/Service/Technorati/KeyInfoResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: KeyInfoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: KeyInfoResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_KeyInfoResult diff --git a/library/Zend/Service/Technorati/Result.php b/library/Zend/Service/Technorati/Result.php index 7ff883b34..1111ca0c2 100644 --- a/library/Zend/Service/Technorati/Result.php +++ b/library/Zend/Service/Technorati/Result.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @abstract */ diff --git a/library/Zend/Service/Technorati/ResultSet.php b/library/Zend/Service/Technorati/ResultSet.php index 82cb7987d..03b647ab8 100644 --- a/library/Zend/Service/Technorati/ResultSet.php +++ b/library/Zend/Service/Technorati/ResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @abstract */ diff --git a/library/Zend/Service/Technorati/SearchResult.php b/library/Zend/Service/Technorati/SearchResult.php index 833126419..361407361 100644 --- a/library/Zend/Service/Technorati/SearchResult.php +++ b/library/Zend/Service/Technorati/SearchResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Result diff --git a/library/Zend/Service/Technorati/SearchResultSet.php b/library/Zend/Service/Technorati/SearchResultSet.php index 6792d8ae2..13e95279a 100644 --- a/library/Zend/Service/Technorati/SearchResultSet.php +++ b/library/Zend/Service/Technorati/SearchResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_SearchResultSet extends Zend_Service_Technorati_ResultSet diff --git a/library/Zend/Service/Technorati/TagResult.php b/library/Zend/Service/Technorati/TagResult.php index 6bf081d25..85e04a5ef 100644 --- a/library/Zend/Service/Technorati/TagResult.php +++ b/library/Zend/Service/Technorati/TagResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result diff --git a/library/Zend/Service/Technorati/TagResultSet.php b/library/Zend/Service/Technorati/TagResultSet.php index 870d55eff..e3a09b3f9 100644 --- a/library/Zend/Service/Technorati/TagResultSet.php +++ b/library/Zend/Service/Technorati/TagResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_ResultSet diff --git a/library/Zend/Service/Technorati/TagsResult.php b/library/Zend/Service/Technorati/TagsResult.php index ff4965caa..8f23e1c1b 100644 --- a/library/Zend/Service/Technorati/TagsResult.php +++ b/library/Zend/Service/Technorati/TagsResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagsResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagsResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result diff --git a/library/Zend/Service/Technorati/TagsResultSet.php b/library/Zend/Service/Technorati/TagsResultSet.php index bb7ce8039..526dec3eb 100644 --- a/library/Zend/Service/Technorati/TagsResultSet.php +++ b/library/Zend/Service/Technorati/TagsResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TagsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TagsResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagsResultSet extends Zend_Service_Technorati_ResultSet diff --git a/library/Zend/Service/Technorati/Utils.php b/library/Zend/Service/Technorati/Utils.php index 863d65b4f..261fbd8d0 100644 --- a/library/Zend/Service/Technorati/Utils.php +++ b/library/Zend/Service/Technorati/Utils.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Utils.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Utils.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Utils diff --git a/library/Zend/Service/Technorati/Weblog.php b/library/Zend/Service/Technorati/Weblog.php index 835e8f8fd..b68568f2b 100644 --- a/library/Zend/Service/Technorati/Weblog.php +++ b/library/Zend/Service/Technorati/Weblog.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Weblog.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Weblog.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Weblog diff --git a/library/Zend/Service/Twitter.php b/library/Zend/Service/Twitter.php old mode 100644 new mode 100755 index 90ff98484..0d0152f14 --- a/library/Zend/Service/Twitter.php +++ b/library/Zend/Service/Twitter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Twitter.php 23312 2010-11-08 19:45:00Z matthew $ + * @version $Id: Twitter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Twitter extends Zend_Rest_Client @@ -54,45 +54,45 @@ class Zend_Service_Twitter extends Zend_Rest_Client * This should be reviewed in the future... */ const STATUS_MAX_CHARACTERS = 246; - + /** * OAuth Endpoint */ const OAUTH_BASE_URI = 'http://twitter.com/oauth'; - + /** * @var Zend_Http_CookieJar */ protected $_cookieJar; - + /** * Date format for 'since' strings * * @var string */ protected $_dateFormat = 'D, d M Y H:i:s T'; - + /** * Username * * @var string */ protected $_username; - + /** * Current method type (for method proxying) * * @var string */ protected $_methodType; - + /** * Zend_Oauth Consumer * * @var Zend_Oauth_Consumer */ protected $_oauthConsumer = null; - + /** * Types of API methods * @@ -107,7 +107,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client 'favorite', 'block' ); - + /** * Options passed to constructor * @@ -131,11 +131,15 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function __construct($options = null, Zend_Oauth_Consumer $consumer = null) { $this->setUri('http://api.twitter.com'); - if (!is_array($options)) $options = array(); - $options['siteUrl'] = self::OAUTH_BASE_URI; if ($options instanceof Zend_Config) { $options = $options->toArray(); } + + if (!is_array($options)) { + $options = array(); + } + $options['siteUrl'] = self::OAUTH_BASE_URI; + $this->_options = $options; if (isset($options['username'])) { $this->setUsername($options['username']); @@ -166,7 +170,7 @@ public function setLocalHttpClient(Zend_Http_Client $client) $this->_localHttpClient->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8'); return $this; } - + /** * Get the local HTTP client as distinct from the static HTTP client * inherited from Zend_Rest_Client @@ -177,7 +181,7 @@ public function getLocalHttpClient() { return $this->_localHttpClient; } - + /** * Checks for an authorised state * @@ -358,6 +362,14 @@ public function statusFriendsTimeline(array $params = array()) case 'page': $_params['page'] = (int) $value; break; + case 'max_id': + $_params['max_id'] = $this->_validInteger($value); + break; + case 'include_rts': + case 'trim_user': + case 'include_entities': + $_params[strtolower($key)] = $value ? '1' : '0'; + break; default: break; } @@ -923,8 +935,7 @@ public function blockBlocking($page = 1, $returnUserIds = false) /** * Protected function to validate that the integer is valid or return a 0 - * @param $int - * @throws Zend_Http_Client_Exception if HTTP request fails or times out + * @param mixed $int * @return integer */ protected function _validInteger($int) diff --git a/library/Zend/Service/Twitter/Exception.php b/library/Zend/Service/Twitter/Exception.php old mode 100644 new mode 100755 index 9bbfe3e71..e1f578b5d --- a/library/Zend/Service/Twitter/Exception.php +++ b/library/Zend/Service/Twitter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Twitter_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/Twitter/Search.php b/library/Zend/Service/Twitter/Search.php index 2ad65625c..f3a632501 100644 --- a/library/Zend/Service/Twitter/Search.php +++ b/library/Zend/Service/Twitter/Search.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Search.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Search.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -39,7 +39,7 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php b/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php index 5fe8692a2..2491e0265 100644 --- a/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php +++ b/library/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CredentialsAbstract.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: CredentialsAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,31 +32,31 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - */ + */ abstract class Zend_Service_WindowsAzure_Credentials_CredentialsAbstract { - /** - * Development storage account and key - */ - const DEVSTORE_ACCOUNT = "devstoreaccount1"; - const DEVSTORE_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="; - - /** - * HTTP header prefixes - */ - const PREFIX_PROPERTIES = "x-ms-prop-"; - const PREFIX_METADATA = "x-ms-meta-"; - const PREFIX_STORAGE_HEADER = "x-ms-"; - - /** - * Permissions - */ - const PERMISSION_READ = "r"; - const PERMISSION_WRITE = "w"; - const PERMISSION_DELETE = "d"; - const PERMISSION_LIST = "l"; + /** + * Development storage account and key + */ + const DEVSTORE_ACCOUNT = "devstoreaccount1"; + const DEVSTORE_KEY = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="; + + /** + * HTTP header prefixes + */ + const PREFIX_PROPERTIES = "x-ms-prop-"; + const PREFIX_METADATA = "x-ms-meta-"; + const PREFIX_STORAGE_HEADER = "x-ms-"; + + /** + * Permissions + */ + const PERMISSION_READ = "r"; + const PERMISSION_WRITE = "w"; + const PERMISSION_DELETE = "d"; + const PERMISSION_LIST = "l"; /** * Account name for Windows Azure @@ -173,7 +173,7 @@ abstract public function signRequestHeaders( /** * Prepare query string for signing - * + * * @param string $value Original query string * @return string Query string for signing */ @@ -181,13 +181,13 @@ protected function _prepareQueryStringForSigning($value) { // Return value $returnValue = array(); - + // Prepare query string $queryParts = $this->_makeArrayOfQueryString($value); foreach ($queryParts as $key => $value) { $returnValue[] = $key . '=' . $value; } - + // Return if (count($returnValue) > 0) { return '?' . implode('&', $returnValue); @@ -198,7 +198,7 @@ protected function _prepareQueryStringForSigning($value) /** * Make array of query string - * + * * @param string $value Query string * @return array Array of key/value pairs */ @@ -207,7 +207,7 @@ protected function _makeArrayOfQueryString($value) // Returnvalue $returnValue = array(); - // Remove front ? + // Remove front ? if (strlen($value) > 0 && strpos($value, '?') === 0) { $value = substr($value, 1); } @@ -231,7 +231,7 @@ protected function _makeArrayOfQueryString($value) /** * Returns an array value if the key is set, otherwide returns $valueIfNotSet - * + * * @param array $array * @param mixed $key * @param mixed $valueIfNotSet diff --git a/library/Zend/Service/WindowsAzure/Credentials/Exception.php b/library/Zend/Service/WindowsAzure/Credentials/Exception.php index d9b458c53..13bbce11c 100644 --- a/library/Zend/Service/WindowsAzure/Credentials/Exception.php +++ b/library/Zend/Service/WindowsAzure/Credentials/Exception.php @@ -16,7 +16,7 @@ * @package Zend_Service_WindowsAzure * @subpackage Exception * @version $Id$ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Credentials_Exception extends Zend_Service_WindowsAzure_Exception diff --git a/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php b/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php index fc1fbddff..8999ba55b 100644 --- a/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php +++ b/library/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SharedAccessSignature.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: SharedAccessSignature.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,19 +37,19 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - */ + */ class Zend_Service_WindowsAzure_Credentials_SharedAccessSignature extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract { /** * Permission set - * + * * @var array */ protected $_permissionSet = array(); - + /** * Creates a new Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance * @@ -69,64 +69,64 @@ public function __construct( /** * Get permission set - * + * * @return array */ public function getPermissionSet() { - return $this->_permissionSet; + return $this->_permissionSet; } - /** - * Set permisison set - * - * Warning: fine-grained permissions should be added prior to coarse-grained permissions. - * For example: first add blob permissions, end with container-wide permissions. - * - * Warning: the signed access signature URL must match the account name of the - * Zend_Service_WindowsAzure_Credentials_Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance - * - * @param array $value Permission set - * @return void - */ + /** + * Set permisison set + * + * Warning: fine-grained permissions should be added prior to coarse-grained permissions. + * For example: first add blob permissions, end with container-wide permissions. + * + * Warning: the signed access signature URL must match the account name of the + * Zend_Service_WindowsAzure_Credentials_Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance + * + * @param array $value Permission set + * @return void + */ public function setPermissionSet($value = array()) - { - foreach ($value as $url) { - if (strpos($url, $this->_accountName) === false) { - throw new Zend_Service_WindowsAzure_Exception('The permission set can only contain URLs for the account name specified in the Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance.'); - } - } - $this->_permissionSet = $value; - } - + { + foreach ($value as $url) { + if (strpos($url, $this->_accountName) === false) { + throw new Zend_Service_WindowsAzure_Exception('The permission set can only contain URLs for the account name specified in the Zend_Service_WindowsAzure_Credentials_SharedAccessSignature instance.'); + } + } + $this->_permissionSet = $value; + } + /** * Create signature - * + * * @param string $path Path for the request * @param string $resource Signed resource - container (c) - blob (b) * @param string $permissions Signed permissions - read (r), write (w), delete (d) and list (l) * @param string $start The time at which the Shared Access Signature becomes valid. * @param string $expiry The time at which the Shared Access Signature becomes invalid. * @param string $identifier Signed identifier - * @return string + * @return string */ public function createSignature( - $path = '/', - $resource = 'b', - $permissions = 'r', - $start = '', - $expiry = '', - $identifier = '' + $path = '/', + $resource = 'b', + $permissions = 'r', + $start = '', + $expiry = '', + $identifier = '' ) { - // Determine path - if ($this->_usePathStyleUri) { - $path = substr($path, strpos($path, '/')); - } - - // Add trailing slash to $path - if (substr($path, 0, 1) !== '/') { - $path = '/' . $path; - } + // Determine path + if ($this->_usePathStyleUri) { + $path = substr($path, strpos($path, '/')); + } + + // Add trailing slash to $path + if (substr($path, 0, 1) !== '/') { + $path = '/' . $path; + } // Build canonicalized resource string $canonicalizedResource = '/' . $this->_accountName; @@ -134,8 +134,8 @@ public function createSignature( $canonicalizedResource .= '/' . $this->_accountName; }*/ $canonicalizedResource .= $path; - - // Create string to sign + + // Create string to sign $stringToSign = array(); $stringToSign[] = $permissions; $stringToSign[] = $start; @@ -143,15 +143,15 @@ public function createSignature( $stringToSign[] = $canonicalizedResource; $stringToSign[] = $identifier; - $stringToSign = implode("\n", $stringToSign); - $signature = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true)); - - return $signature; + $stringToSign = implode("\n", $stringToSign); + $signature = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true)); + + return $signature; } /** * Create signed query string - * + * * @param string $path Path for the request * @param string $queryString Query string for the request * @param string $resource Signed resource - container (c) - blob (b) @@ -159,16 +159,16 @@ public function createSignature( * @param string $start The time at which the Shared Access Signature becomes valid. * @param string $expiry The time at which the Shared Access Signature becomes invalid. * @param string $identifier Signed identifier - * @return string + * @return string */ public function createSignedQueryString( - $path = '/', - $queryString = '', - $resource = 'b', - $permissions = 'r', - $start = '', - $expiry = '', - $identifier = '' + $path = '/', + $queryString = '', + $resource = 'b', + $permissions = 'r', + $start = '', + $expiry = '', + $identifier = '' ) { // Parts $parts = array(); @@ -186,26 +186,26 @@ public function createSignedQueryString( // Assemble parts and query string if ($queryString != '') { $queryString .= '&'; - } + } $queryString .= implode('&', $parts); return $queryString; } - + /** - * Permission matches request? - * - * @param string $permissionUrl Permission URL - * @param string $requestUrl Request URL - * @param string $resourceType Resource type - * @param string $requiredPermission Required permission - * @return string Signed request URL - */ + * Permission matches request? + * + * @param string $permissionUrl Permission URL + * @param string $requestUrl Request URL + * @param string $resourceType Resource type + * @param string $requiredPermission Required permission + * @return string Signed request URL + */ public function permissionMatchesRequest( - $permissionUrl = '', - $requestUrl = '', - $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, - $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ + $permissionUrl = '', + $requestUrl = '', + $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, + $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ ) { // Build requirements $requiredResourceType = $resourceType; @@ -215,70 +215,70 @@ public function permissionMatchesRequest( // Parse permission url $parsedPermissionUrl = parse_url($permissionUrl); - + // Parse permission properties $permissionParts = explode('&', $parsedPermissionUrl['query']); - + // Parse request url $parsedRequestUrl = parse_url($requestUrl); - + // Check if permission matches request $matches = true; foreach ($permissionParts as $part) { list($property, $value) = explode('=', $part, 2); - + if ($property == 'sr') { $matches = $matches && (strpbrk($value, $requiredResourceType) !== false); } - + if ($property == 'sp') { $matches = $matches && (strpbrk($value, $requiredPermission) !== false); } } - + // Ok, but... does the resource match? $matches = $matches && (strpos($parsedRequestUrl['path'], $parsedPermissionUrl['path']) !== false); - + // Return return $matches; - } - + } + /** - * Sign request URL with credentials - * - * @param string $requestUrl Request URL - * @param string $resourceType Resource type - * @param string $requiredPermission Required permission - * @return string Signed request URL - */ - public function signRequestUrl( - $requestUrl = '', - $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, - $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ - ) { - // Look for a matching permission - foreach ($this->getPermissionSet() as $permittedUrl) { - if ($this->permissionMatchesRequest($permittedUrl, $requestUrl, $resourceType, $requiredPermission)) { - // This matches, append signature data - $parsedPermittedUrl = parse_url($permittedUrl); + * Sign request URL with credentials + * + * @param string $requestUrl Request URL + * @param string $resourceType Resource type + * @param string $requiredPermission Required permission + * @return string Signed request URL + */ + public function signRequestUrl( + $requestUrl = '', + $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, + $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ + ) { + // Look for a matching permission + foreach ($this->getPermissionSet() as $permittedUrl) { + if ($this->permissionMatchesRequest($permittedUrl, $requestUrl, $resourceType, $requiredPermission)) { + // This matches, append signature data + $parsedPermittedUrl = parse_url($permittedUrl); if (strpos($requestUrl, '?') === false) { $requestUrl .= '?'; } else { $requestUrl .= '&'; } - + $requestUrl .= $parsedPermittedUrl['query']; // Return url return $requestUrl; } } - + // Return url, will be unsigned... return $requestUrl; } - + /** * Sign request with credentials * diff --git a/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php b/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php index 6c9f61632..7f24abe6c 100644 --- a/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php +++ b/library/Zend/Service/WindowsAzure/Credentials/SharedKey.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SharedKey.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: SharedKey.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,119 +42,119 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - */ + */ class Zend_Service_WindowsAzure_Credentials_SharedKey extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract { /** - * Sign request URL with credentials - * - * @param string $requestUrl Request URL - * @param string $resourceType Resource type - * @param string $requiredPermission Required permission - * @return string Signed request URL - */ - public function signRequestUrl( - $requestUrl = '', - $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, - $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ - ) { - return $requestUrl; - } - - /** - * Sign request headers with credentials - * - * @param string $httpVerb HTTP verb the request will use - * @param string $path Path for the request - * @param string $queryString Query string for the request - * @param array $headers x-ms headers to add - * @param boolean $forTableStorage Is the request for table storage? - * @param string $resourceType Resource type - * @param string $requiredPermission Required permission - * @param mixed $rawData Raw post data - * @return array Array of headers - */ - public function signRequestHeaders( - $httpVerb = Zend_Http_Client::GET, - $path = '/', - $queryString = '', - $headers = null, - $forTableStorage = false, - $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, - $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ, - $rawData = null - ) { - // http://github.com/sriramk/winazurestorage/blob/214010a2f8931bac9c96dfeb337d56fe084ca63b/winazurestorage.py + * Sign request URL with credentials + * + * @param string $requestUrl Request URL + * @param string $resourceType Resource type + * @param string $requiredPermission Required permission + * @return string Signed request URL + */ + public function signRequestUrl( + $requestUrl = '', + $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, + $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ + ) { + return $requestUrl; + } + + /** + * Sign request headers with credentials + * + * @param string $httpVerb HTTP verb the request will use + * @param string $path Path for the request + * @param string $queryString Query string for the request + * @param array $headers x-ms headers to add + * @param boolean $forTableStorage Is the request for table storage? + * @param string $resourceType Resource type + * @param string $requiredPermission Required permission + * @param mixed $rawData Raw post data + * @return array Array of headers + */ + public function signRequestHeaders( + $httpVerb = Zend_Http_Client::GET, + $path = '/', + $queryString = '', + $headers = null, + $forTableStorage = false, + $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, + $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ, + $rawData = null + ) { + // http://github.com/sriramk/winazurestorage/blob/214010a2f8931bac9c96dfeb337d56fe084ca63b/winazurestorage.py - // Table storage? - if ($forTableStorage) { - throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKey authentication on table storage. Use SharedKeyLite authentication instead.'); - } - - // Determine path - if ($this->_usePathStyleUri) { - $path = substr($path, strpos($path, '/')); - } + // Table storage? + if ($forTableStorage) { + throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKey authentication on table storage. Use SharedKeyLite authentication instead.'); + } + + // Determine path + if ($this->_usePathStyleUri) { + $path = substr($path, strpos($path, '/')); + } - // Determine query - $queryString = $this->_prepareQueryStringForSigning($queryString); - - // Canonicalized headers - $canonicalizedHeaders = array(); - - // Request date - $requestDate = ''; - if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) { - $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date']; - } else { - $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123 - $canonicalizedHeaders[] = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date:' . $requestDate; - } - - // Build canonicalized headers - if ($headers !== null) { - foreach ($headers as $header => $value) { - if (is_bool($value)) { - $value = $value === true ? 'True' : 'False'; - } + // Determine query + $queryString = $this->_prepareQueryStringForSigning($queryString); + + // Canonicalized headers + $canonicalizedHeaders = array(); + + // Request date + $requestDate = ''; + if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) { + $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date']; + } else { + $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123 + $canonicalizedHeaders[] = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date:' . $requestDate; + } + + // Build canonicalized headers + if ($headers !== null) { + foreach ($headers as $header => $value) { + if (is_bool($value)) { + $value = $value === true ? 'True' : 'False'; + } - $headers[$header] = $value; - if (substr($header, 0, strlen(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER)) == Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER) { - $canonicalizedHeaders[] = strtolower($header) . ':' . $value; - } - } - } - sort($canonicalizedHeaders); + $headers[$header] = $value; + if (substr($header, 0, strlen(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER)) == Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER) { + $canonicalizedHeaders[] = strtolower($header) . ':' . $value; + } + } + } + sort($canonicalizedHeaders); - // Build canonicalized resource string - $canonicalizedResource = '/' . $this->_accountName; - if ($this->_usePathStyleUri) { - $canonicalizedResource .= '/' . $this->_accountName; - } - $canonicalizedResource .= $path; - if ($queryString !== '') { - $queryStringItems = $this->_makeArrayOfQueryString($queryString); - foreach ($queryStringItems as $key => $value) { - $canonicalizedResource .= "\n" . strtolower($key) . ':' . $value; - } - } - - // Content-Length header - $contentLength = ''; - if (strtoupper($httpVerb) != Zend_Http_Client::GET - && strtoupper($httpVerb) != Zend_Http_Client::DELETE - && strtoupper($httpVerb) != Zend_Http_Client::HEAD) { - $contentLength = 0; - - if ($rawData !== null) { - $contentLength = strlen($rawData); - } - } + // Build canonicalized resource string + $canonicalizedResource = '/' . $this->_accountName; + if ($this->_usePathStyleUri) { + $canonicalizedResource .= '/' . $this->_accountName; + } + $canonicalizedResource .= $path; + if ($queryString !== '') { + $queryStringItems = $this->_makeArrayOfQueryString($queryString); + foreach ($queryStringItems as $key => $value) { + $canonicalizedResource .= "\n" . strtolower($key) . ':' . $value; + } + } + + // Content-Length header + $contentLength = ''; + if (strtoupper($httpVerb) != Zend_Http_Client::GET + && strtoupper($httpVerb) != Zend_Http_Client::DELETE + && strtoupper($httpVerb) != Zend_Http_Client::HEAD) { + $contentLength = 0; + + if ($rawData !== null) { + $contentLength = strlen($rawData); + } + } - // Create string to sign + // Create string to sign $stringToSign = array(); $stringToSign[] = strtoupper($httpVerb); // VERB $stringToSign[] = $this->_issetOr($headers, 'Content-Encoding', ''); // Content-Encoding @@ -177,11 +177,11 @@ public function signRequestHeaders( $stringToSign = implode("\n", $stringToSign); $signString = base64_encode(hash_hmac('sha256', $stringToSign, $this->_accountKey, true)); - // Sign request - $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate; - $headers['Authorization'] = 'SharedKey ' . $this->_accountName . ':' . $signString; - - // Return headers - return $headers; - } + // Sign request + $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'] = $requestDate; + $headers['Authorization'] = 'SharedKey ' . $this->_accountName . ':' . $signString; + + // Return headers + return $headers; + } } diff --git a/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php b/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php index 525c1a656..8c9a87411 100644 --- a/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php +++ b/library/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SharedKeyLite.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: SharedKeyLite.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -42,83 +42,83 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - */ + */ class Zend_Service_WindowsAzure_Credentials_SharedKeyLite extends Zend_Service_WindowsAzure_Credentials_CredentialsAbstract { /** - * Sign request URL with credentials - * - * @param string $requestUrl Request URL - * @param string $resourceType Resource type - * @param string $requiredPermission Required permission - * @return string Signed request URL - */ - public function signRequestUrl( - $requestUrl = '', - $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, - $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ - ) { - return $requestUrl; - } - - /** - * Sign request headers with credentials - * - * @param string $httpVerb HTTP verb the request will use - * @param string $path Path for the request - * @param string $queryString Query string for the request - * @param array $headers x-ms headers to add - * @param boolean $forTableStorage Is the request for table storage? - * @param string $resourceType Resource type - * @param string $requiredPermission Required permission - * @param mixed $rawData Raw post data - * @return array Array of headers - */ - public function signRequestHeaders( - $httpVerb = Zend_Http_Client::GET, - $path = '/', - $queryString = '', - $headers = null, - $forTableStorage = false, - $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, - $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ, - $rawData = null - ) { - // Table storage? - if (!$forTableStorage) { - throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKeyLite authentication on blob or queue storage. Use SharedKey authentication instead.'); - } - - // Determine path - if ($this->_usePathStyleUri) { - $path = substr($path, strpos($path, '/')); - } + * Sign request URL with credentials + * + * @param string $requestUrl Request URL + * @param string $resourceType Resource type + * @param string $requiredPermission Required permission + * @return string Signed request URL + */ + public function signRequestUrl( + $requestUrl = '', + $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, + $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ + ) { + return $requestUrl; + } + + /** + * Sign request headers with credentials + * + * @param string $httpVerb HTTP verb the request will use + * @param string $path Path for the request + * @param string $queryString Query string for the request + * @param array $headers x-ms headers to add + * @param boolean $forTableStorage Is the request for table storage? + * @param string $resourceType Resource type + * @param string $requiredPermission Required permission + * @param mixed $rawData Raw post data + * @return array Array of headers + */ + public function signRequestHeaders( + $httpVerb = Zend_Http_Client::GET, + $path = '/', + $queryString = '', + $headers = null, + $forTableStorage = false, + $resourceType = Zend_Service_WindowsAzure_Storage::RESOURCE_UNKNOWN, + $requiredPermission = Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_READ, + $rawData = null + ) { + // Table storage? + if (!$forTableStorage) { + throw new Zend_Service_WindowsAzure_Credentials_Exception('The Windows Azure SDK for PHP does not support SharedKeyLite authentication on blob or queue storage. Use SharedKey authentication instead.'); + } + + // Determine path + if ($this->_usePathStyleUri) { + $path = substr($path, strpos($path, '/')); + } - // Determine query - $queryString = $this->_prepareQueryStringForSigning($queryString); + // Determine query + $queryString = $this->_prepareQueryStringForSigning($queryString); - // Build canonicalized resource string - $canonicalizedResource = '/' . $this->_accountName; - if ($this->_usePathStyleUri) { - $canonicalizedResource .= '/' . $this->_accountName; - } - $canonicalizedResource .= $path; - if ($queryString !== '') { - $canonicalizedResource .= $queryString; - } + // Build canonicalized resource string + $canonicalizedResource = '/' . $this->_accountName; + if ($this->_usePathStyleUri) { + $canonicalizedResource .= '/' . $this->_accountName; + } + $canonicalizedResource .= $path; + if ($queryString !== '') { + $canonicalizedResource .= $queryString; + } - // Request date - $requestDate = ''; - if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) { - $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date']; - } else { - $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123 - } + // Request date + $requestDate = ''; + if (isset($headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date'])) { + $requestDate = $headers[Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PREFIX_STORAGE_HEADER . 'date']; + } else { + $requestDate = gmdate('D, d M Y H:i:s', time()) . ' GMT'; // RFC 1123 + } - // Create string to sign + // Create string to sign $stringToSign = array(); $stringToSign[] = $requestDate; // Date $stringToSign[] = $canonicalizedResource; // Canonicalized resource @@ -135,7 +135,7 @@ public function signRequestHeaders( /** * Prepare query string for signing - * + * * @param string $value Original query string * @return string Query string for signing */ @@ -146,7 +146,7 @@ protected function _prepareQueryStringForSigning($value) // If not found, no query string needed return ''; } else { - // If found, make sure it is the only parameter being used + // If found, make sure it is the only parameter being used if (strlen($value) > 0 && strpos($value, '?') === 0) { $value = substr($value, 1); } @@ -159,8 +159,8 @@ protected function _prepareQueryStringForSigning($value) } } - // Should never happen... - return ''; - } - } + // Should never happen... + return ''; + } + } } diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php index 269129ff7..a719b8eb8 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDataSources.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -59,33 +59,33 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property int OverallQuotaInMB Overall quota in MB - * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs Logs Logs - * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDiagnosticInfrastructureLogs DiagnosticInfrastructureLogs Diagnostic infrastructure logs - * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationPerformanceCounters PerformanceCounters Performance counters - * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationWindowsEventLog WindowsEventLog Windows Event Log - * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories Directories Directories + * @property int OverallQuotaInMB Overall quota in MB + * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs Logs Logs + * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDiagnosticInfrastructureLogs DiagnosticInfrastructureLogs Diagnostic infrastructure logs + * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationPerformanceCounters PerformanceCounters Performance counters + * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationWindowsEventLog WindowsEventLog Windows Event Log + * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories Directories Directories */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param int $overallQuotaInMB Overall quota in MB */ - public function __construct($overallQuotaInMB = 0) - { + public function __construct($overallQuotaInMB = 0) + { $this->_data = array( - 'overallquotainmb' => $overallQuotaInMB, - 'logs' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs(), - 'diagnosticinfrastructurelogs' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDiagnosticInfrastructureLogs(), - 'performancecounters' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationPerformanceCounters(), - 'windowseventlog' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationWindowsEventLog(), - 'directories' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories() + 'overallquotainmb' => $overallQuotaInMB, + 'logs' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs(), + 'diagnosticinfrastructurelogs' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDiagnosticInfrastructureLogs(), + 'performancecounters' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationPerformanceCounters(), + 'windowseventlog' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationWindowsEventLog(), + 'directories' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories(), ); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php index da4df32b8..4223f19a8 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDiagnosticInfrastructureLogs.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,29 +39,29 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property int BufferQuotaInMB Buffer quota in MB - * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes - * @property string ScheduledTransferLogLevelFilter Scheduled transfer log level filter + * @property int BufferQuotaInMB Buffer quota in MB + * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes + * @property string ScheduledTransferLogLevelFilter Scheduled transfer log level filter */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationDiagnosticInfrastructureLogs - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param int $bufferQuotaInMB Buffer quota in MB * @param int $scheduledTransferPeriodInMinutes Scheduled transfer period in minutes * @param string $scheduledTransferLogLevelFilter Scheduled transfer log level filter */ - public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) - { + public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) + { $this->_data = array( - 'bufferquotainmb' => $bufferQuotaInMB, - 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, - 'scheduledtransferloglevelfilter' => $scheduledTransferLogLevelFilter + 'bufferquotainmb' => $bufferQuotaInMB, + 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, + 'scheduledtransferloglevelfilter' => $scheduledTransferLogLevelFilter, ); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php index 2915432b7..bd612b808 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationDirectories.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,52 +39,52 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property int BufferQuotaInMB Buffer quota in MB - * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes - * @property array Subscriptions Subscriptions + * @property int BufferQuotaInMB Buffer quota in MB + * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes + * @property array Subscriptions Subscriptions */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationDirectories - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param int $bufferQuotaInMB Buffer quota in MB * @param int $scheduledTransferPeriodInMinutes Scheduled transfer period in minutes */ - public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0) - { + public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0) + { $this->_data = array( - 'bufferquotainmb' => $bufferQuotaInMB, - 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, - 'subscriptions' => array() + 'bufferquotainmb' => $bufferQuotaInMB, + 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, + 'subscriptions' => array() ); } - + /** * Add subscription - * + * * @param string $path Path * @param string $container Container * @param int $directoryQuotaInMB Directory quota in MB */ public function addSubscription($path, $container, $directoryQuotaInMB = 1024) { - $this->_data['subscriptions'][$path] = new Zend_Service_WindowsAzure_Diagnostics_DirectoryConfigurationSubscription($path, $container, $directoryQuotaInMB); + $this->_data['subscriptions'][$path] = new Zend_Service_WindowsAzure_Diagnostics_DirectoryConfigurationSubscription($path, $container, $directoryQuotaInMB); } - + /** * Remove subscription - * + * * @param string $path Path */ public function removeSubscription($path) { - if (isset($this->_data['subscriptions'][$path])) { - unset($this->_data['subscriptions'][$path]); - } + if (isset($this->_data['subscriptions'][$path])) { + unset($this->_data['subscriptions'][$path]); + } } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php index 7d8bb2f61..460c84348 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationInstance.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,27 +39,27 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources DataSources Data sources + * @property Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources DataSources Data sources */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { - /** - * Constructor - */ - public function __construct() - { + /** + * Constructor + */ + public function __construct() + { $this->_data = array( - 'datasources' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources() + 'datasources' => new Zend_Service_WindowsAzure_Diagnostics_ConfigurationDataSources() ); - } + } /** * Load configuration XML - * + * * @param string $configurationXml Configuration XML */ public function loadXml($configurationXml) @@ -70,15 +70,15 @@ public function loadXml($configurationXml) // Assign general settings $this->DataSources->OverallQuotaInMB = (int)$configurationXml->DataSources->OverallQuotaInMB; - // Assign Logs settings - $this->DataSources->Logs->BufferQuotaInMB = (int)$configurationXml->DataSources->Logs->BufferQuotaInMB; - $this->DataSources->Logs->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->Logs->ScheduledTransferPeriodInMinutes; - $this->DataSources->Logs->ScheduledTransferLogLevelFilter = (string)$configurationXml->DataSources->Logs->ScheduledTransferLogLevelFilter; + // Assign Logs settings + $this->DataSources->Logs->BufferQuotaInMB = (int)$configurationXml->DataSources->Logs->BufferQuotaInMB; + $this->DataSources->Logs->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->Logs->ScheduledTransferPeriodInMinutes; + $this->DataSources->Logs->ScheduledTransferLogLevelFilter = (string)$configurationXml->DataSources->Logs->ScheduledTransferLogLevelFilter; - // Assign DiagnosticInfrastructureLogs settings - $this->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB = (int)$configurationXml->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB; - $this->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes; - $this->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferLogLevelFilter = (string)$configurationXml->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferLogLevelFilter; + // Assign DiagnosticInfrastructureLogs settings + $this->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB = (int)$configurationXml->DataSources->DiagnosticInfrastructureLogs->BufferQuotaInMB; + $this->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes = (int)$configurationXml->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferPeriodInMinutes; + $this->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferLogLevelFilter = (string)$configurationXml->DataSources->DiagnosticInfrastructureLogs->ScheduledTransferLogLevelFilter; // Assign PerformanceCounters settings $this->DataSources->PerformanceCounters->BufferQuotaInMB = (int)$configurationXml->DataSources->PerformanceCounters->BufferQuotaInMB; @@ -132,7 +132,7 @@ public function loadXml($configurationXml) /** * Create configuration XML - * + * * @return string */ public function toXml() @@ -217,4 +217,4 @@ public function toXml() // Return return implode("\r\n", $returnValue); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php index 721560fab..4d6fc9c28 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationLogs.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,29 +39,29 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property int BufferQuotaInMB Buffer quota in MB - * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes - * @property string ScheduledTransferLogLevelFilter Scheduled transfer log level filter + * @property int BufferQuotaInMB Buffer quota in MB + * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes + * @property string ScheduledTransferLogLevelFilter Scheduled transfer log level filter */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationLogs - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param int $bufferQuotaInMB Buffer quota in MB * @param int $scheduledTransferPeriodInMinutes Scheduled transfer period in minutes * @param string $scheduledTransferLogLevelFilter Scheduled transfer log level filter */ - public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) - { + public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) + { $this->_data = array( - 'bufferquotainmb' => $bufferQuotaInMB, - 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, - 'scheduledtransferloglevelfilter' => $scheduledTransferLogLevelFilter + 'bufferquotainmb' => $bufferQuotaInMB, + 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, + 'scheduledtransferloglevelfilter' => $scheduledTransferLogLevelFilter, ); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php index d6963e267..9bf7eb78f 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationObjectBaseAbstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,21 +29,21 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Data - * + * * @var array */ protected $_data = null; - + /** * Magic overload for setting properties - * + * * @param string $name Name of the property * @param string $value Value to set */ @@ -58,7 +58,7 @@ public function __set($name, $value) { /** * Magic overload for getting properties - * + * * @param string $name Name of the property */ public function __get($name) { diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php index 3f326d1d6..44e46d596 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationPerformanceCounters.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,51 +39,51 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property int BufferQuotaInMB Buffer quota in MB - * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes - * @property array Subscriptions Subscriptions + * @property int BufferQuotaInMB Buffer quota in MB + * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes + * @property array Subscriptions Subscriptions */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationPerformanceCounters - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param int $bufferQuotaInMB Buffer quota in MB * @param int $scheduledTransferPeriodInMinutes Scheduled transfer period in minutes */ - public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0) - { + public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0) + { $this->_data = array( - 'bufferquotainmb' => $bufferQuotaInMB, - 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, - 'subscriptions' => array() + 'bufferquotainmb' => $bufferQuotaInMB, + 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, + 'subscriptions' => array(), ); } - + /** * Add subscription - * + * * @param string $counterSpecifier Counter specifier * @param int $sampleRateInSeconds Sample rate in seconds */ public function addSubscription($counterSpecifier, $sampleRateInSeconds = 1) { - $this->_data['subscriptions'][$counterSpecifier] = new Zend_Service_WindowsAzure_Diagnostics_PerformanceCounterSubscription($counterSpecifier, $sampleRateInSeconds); + $this->_data['subscriptions'][$counterSpecifier] = new Zend_Service_WindowsAzure_Diagnostics_PerformanceCounterSubscription($counterSpecifier, $sampleRateInSeconds); } - + /** * Remove subscription - * + * * @param string $counterSpecifier Counter specifier */ public function removeSubscription($counterSpecifier) { - if (isset($this->_data['subscriptions'][$counterSpecifier])) { - unset($this->_data['subscriptions'][$counterSpecifier]); - } + if (isset($this->_data['subscriptions'][$counterSpecifier])) { + unset($this->_data['subscriptions'][$counterSpecifier]); + } } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php index 118c20c32..79d84b2f3 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/ConfigurationWindowsEventLog.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,53 +39,53 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property int BufferQuotaInMB Buffer quota in MB - * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes - * @property string ScheduledTransferLogLevelFilter Scheduled transfer log level filter - * @property array Subscriptions Subscriptions + * @property int BufferQuotaInMB Buffer quota in MB + * @property int ScheduledTransferPeriodInMinutes Scheduled transfer period in minutes + * @property string ScheduledTransferLogLevelFilter Scheduled transfer log level filter + * @property array Subscriptions Subscriptions */ class Zend_Service_WindowsAzure_Diagnostics_ConfigurationWindowsEventLog - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param int $bufferQuotaInMB Buffer quota in MB * @param int $scheduledTransferPeriodInMinutes Scheduled transfer period in minutes * @param string $scheduledTransferLogLevelFilter Scheduled transfer log level filter */ - public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) - { + public function __construct($bufferQuotaInMB = 0, $scheduledTransferPeriodInMinutes = 0, $scheduledTransferLogLevelFilter = Zend_Service_WindowsAzure_Diagnostics_LogLevel::UNDEFINED) + { $this->_data = array( - 'bufferquotainmb' => $bufferQuotaInMB, - 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, - 'scheduledtransferloglevelfilter' => $scheduledTransferLogLevelFilter, - 'subscriptions' => array() + 'bufferquotainmb' => $bufferQuotaInMB, + 'scheduledtransferperiodinminutes' => $scheduledTransferPeriodInMinutes, + 'scheduledtransferloglevelfilter' => $scheduledTransferLogLevelFilter, + 'subscriptions' => array() ); } - + /** * Add subscription - * + * * @param string $filter Event log filter */ public function addSubscription($filter) { - $this->_data['subscriptions'][$filter] = $filter; + $this->_data['subscriptions'][$filter] = $filter; } - + /** * Remove subscription - * + * * @param string $filter Event log filter */ public function removeSubscription($filter) { - if (isset($this->_data['subscriptions'][$filter])) { - unset($this->_data['subscriptions'][$filter]); - } + if (isset($this->_data['subscriptions'][$filter])) { + unset($this->_data['subscriptions'][$filter]); + } } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php b/library/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php index 24e979fc0..8bf1610b7 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/DirectoryConfigurationSubscription.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,29 +34,29 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property string Path Path - * @property string Container Container - * @property int DirectoryQuotaInMB Directory quota in MB + * @property string Path Path + * @property string Container Container + * @property int DirectoryQuotaInMB Directory quota in MB */ class Zend_Service_WindowsAzure_Diagnostics_DirectoryConfigurationSubscription - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param string $path Path * @param string $container Container * @param int $directoryQuotaInMB Directory quota in MB */ - public function __construct($path, $container, $directoryQuotaInMB = 1024) - { + public function __construct($path, $container, $directoryQuotaInMB = 1024) + { $this->_data = array( - 'path' => $path, - 'container' => $container, - 'directoryquotainmb' => $directoryQuotaInMB + 'path' => $path, + 'container' => $container, + 'directoryquotainmb' => $directoryQuotaInMB, ); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/Exception.php b/library/Zend/Service/WindowsAzure/Diagnostics/Exception.php index 8536f3625..41757c56c 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/Exception.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,10 +29,10 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Diagnostics_Exception - extends Zend_Service_WindowsAzure_Exception + extends Zend_Service_WindowsAzure_Exception { } \ No newline at end of file diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php b/library/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php index 6660416b1..bfb7c7332 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/LogLevel.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,15 +25,15 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Diagnostics_LogLevel { - const UNDEFINED = 'Undefined'; - const CRITICAL = 'Critical'; - const ERROR = 'Error'; - const WARNING = 'Warning'; - const INFORMATION = 'Information'; - const VERBOSE = 'Verbose'; + const UNDEFINED = 'Undefined'; + const CRITICAL = 'Critical'; + const ERROR = 'Error'; + const WARNING = 'Warning'; + const INFORMATION = 'Information'; + const VERBOSE = 'Verbose'; } \ No newline at end of file diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/Manager.php b/library/Zend/Service/WindowsAzure/Diagnostics/Manager.php index 08ddb6b89..2b64e626e 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/Manager.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/Manager.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,38 +39,37 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Diagnostics_Manager { /** * Blob storage client - * + * * @var Zend_Service_WindowsAzure_Storage_Blob */ protected $_blobStorageClient = null; /** * Control container name - * + * * @var string */ protected $_controlContainer = ''; /** * Create a new instance of Zend_Service_WindowsAzure_Diagnostics_Manager - * + * * @param Zend_Service_WindowsAzure_Storage_Blob $blobStorageClient Blob storage client * @param string $controlContainer Control container name */ public function __construct(Zend_Service_WindowsAzure_Storage_Blob $blobStorageClient = null, $controlContainer = 'wad-control-container') { $this->_blobStorageClient = $blobStorageClient; - $this->_controlContainer = $controlContainer; - - $this->_ensureStorageInitialized(); - } + $this->_controlContainer = $controlContainer; + $this->_ensureStorageInitialized(); + } /** * Ensure storage has been initialized @@ -84,7 +83,7 @@ protected function _ensureStorageInitialized() /** * Get default configuration values - * + * * @return Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance */ public function getDefaultConfiguration() @@ -94,7 +93,7 @@ public function getDefaultConfiguration() /** * Checks if a configuration for a specific role instance exists. - * + * * @param string $roleInstance Role instance name, can be found in $_SERVER['RdRoleId'] when hosted on Windows Azure. * @return boolean * @throws Zend_Service_WindowsAzure_Diagnostics_Exception @@ -110,7 +109,7 @@ public function configurationForRoleInstanceExists($roleInstance = null) /** * Checks if a configuration for current role instance exists. Only works on Development Fabric or Windows Azure Fabric. - * + * * @return boolean * @throws Zend_Service_WindowsAzure_Diagnostics_Exception */ @@ -125,7 +124,7 @@ public function configurationForCurrentRoleInstanceExists() /** * Get configuration for current role instance. Only works on Development Fabric or Windows Azure Fabric. - * + * * @return Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance * @throws Zend_Service_WindowsAzure_Diagnostics_Exception */ @@ -139,7 +138,7 @@ public function getConfigurationForCurrentRoleInstance() /** * Set configuration for current role instance. Only works on Development Fabric or Windows Azure Fabric. - * + * * @param Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration Configuration to apply * @throws Zend_Service_WindowsAzure_Diagnostics_Exception */ @@ -153,7 +152,7 @@ public function setConfigurationForCurrentRoleInstance(Zend_Service_WindowsAzure /** * Get configuration for a specific role instance - * + * * @param string $roleInstance Role instance name, can be found in $_SERVER['RdRoleId'] when hosted on Windows Azure. * @return Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance * @throws Zend_Service_WindowsAzure_Diagnostics_Exception @@ -164,18 +163,18 @@ public function getConfigurationForRoleInstance($roleInstance = null) throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Role instance should be specified. Try reading $_SERVER[\'RdRoleId\'] for this information if the application is hosted on Windows Azure Fabric or Development Fabric.'); } - if ($this->_blobStorageClient->blobExists($this->_controlContainer, $roleInstance)) { - $configurationInstance = new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance(); - $configurationInstance->loadXml( $this->_blobStorageClient->getBlobData($this->_controlContainer, $roleInstance) ); - return $configurationInstance; - } + if ($this->_blobStorageClient->blobExists($this->_controlContainer, $roleInstance)) { + $configurationInstance = new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance(); + $configurationInstance->loadXml( $this->_blobStorageClient->getBlobData($this->_controlContainer, $roleInstance) ); + return $configurationInstance; + } return new Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance(); } /** * Set configuration for a specific role instance - * + * * @param string $roleInstance Role instance name, can be found in $_SERVER['RdRoleId'] when hosted on Windows Azure. * @param Zend_Service_WindowsAzure_Diagnostics_ConfigurationInstance $configuration Configuration to apply * @throws Zend_Service_WindowsAzure_Diagnostics_Exception @@ -186,6 +185,6 @@ public function setConfigurationForRoleInstance($roleInstance = null, Zend_Servi throw new Zend_Service_WindowsAzure_Diagnostics_Exception('Role instance should be specified. Try reading $_SERVER[\'RdRoleId\'] for this information if the application is hosted on Windows Azure Fabric or Development Fabric.'); } - $this->_blobStorageClient->putBlobData($this->_controlContainer, $roleInstance, $configuration->toXml(), array(), null, array('Content-Type' => 'text/xml')); - } -} \ No newline at end of file + $this->_blobStorageClient->putBlobData($this->_controlContainer, $roleInstance, $configuration->toXml(), array(), null, array('Content-Type' => 'text/xml')); + } +} diff --git a/library/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php b/library/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php index cf2df4771..de434a9da 100644 --- a/library/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php +++ b/library/Zend/Service/WindowsAzure/Diagnostics/PerformanceCounterSubscription.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,26 +34,26 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Diagnostics - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * - * @property string CounterSpecifier Counter specifier - * @property int SampleRateInSeconds Sample rate in seconds + * @property string CounterSpecifier Counter specifier + * @property int SampleRateInSeconds Sample rate in seconds */ class Zend_Service_WindowsAzure_Diagnostics_PerformanceCounterSubscription - extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract + extends Zend_Service_WindowsAzure_Diagnostics_ConfigurationObjectBaseAbstract { /** * Constructor - * + * * @param string $counterSpecifier Counter specifier * @param int $sampleRateInSeconds Sample rate in seconds */ - public function __construct($counterSpecifier, $sampleRateInSeconds = 1) - { + public function __construct($counterSpecifier, $sampleRateInSeconds = 1) + { $this->_data = array( 'counterspecifier' => $counterSpecifier, - 'samplerateinseconds' => $sampleRateInSeconds + 'samplerateinseconds' => $sampleRateInSeconds ); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Exception.php b/library/Zend/Service/WindowsAzure/Exception.php index 963ea27a6..de055d022 100644 --- a/library/Zend/Service/WindowsAzure/Exception.php +++ b/library/Zend/Service/WindowsAzure/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Exception - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Service_WindowsAzure - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Exception extends Zend_Service_Exception diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php b/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php index 2a6e3ae8e..c3ef6e42d 100644 --- a/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php +++ b/library/Zend/Service/WindowsAzure/RetryPolicy/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Exception - * @version $Id: Exception.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_RetryPolicy_Exception extends Zend_Service_WindowsAzure_Exception diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php b/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php index f049f6ab9..d87bde253 100644 --- a/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php +++ b/library/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @version $Id: NoRetry.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: NoRetry.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,14 +29,14 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract { /** * Execute function under retry policy - * + * * @param string|array $function Function to execute * @param array $parameters Parameters for function call * @return mixed @@ -44,7 +44,7 @@ class Zend_Service_WindowsAzure_RetryPolicy_NoRetry extends Zend_Service_Windows public function execute($function, $parameters = array()) { $returnValue = null; - + try { $returnValue = call_user_func_array($function, $parameters); diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php b/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php index cbd6fb6f6..c967e0b87 100644 --- a/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php +++ b/library/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @version $Id: RetryN.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: RetryN.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,28 +34,28 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_RetryPolicy_RetryN extends Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract { /** * Number of retries - * + * * @var int */ protected $_retryCount = 1; - + /** * Interval between retries (in milliseconds) - * + * * @var int */ protected $_retryInterval = 0; - + /** * Constructor - * + * * @param int $count Number of retries * @param int $intervalBetweenRetries Interval between retries (in milliseconds) */ @@ -64,10 +64,10 @@ public function __construct($count = 1, $intervalBetweenRetries = 0) $this->_retryCount = $count; $this->_retryInterval = $intervalBetweenRetries; } - + /** * Execute function under retry policy - * + * * @param string|array $function Function to execute * @param array $parameters Parameters for function call * @return mixed @@ -75,7 +75,7 @@ public function __construct($count = 1, $intervalBetweenRetries = 0) public function execute($function, $parameters = array()) { $returnValue = null; - + for ($retriesLeft = $this->_retryCount; $retriesLeft >= 0; --$retriesLeft) { try { $returnValue = call_user_func_array($function, $parameters); @@ -84,7 +84,7 @@ public function execute($function, $parameters = array()) if ($retriesLeft == 1) { throw new Zend_Service_WindowsAzure_RetryPolicy_Exception("Exceeded retry count of " . $this->_retryCount . ". " . $ex->getMessage()); } - + usleep($this->_retryInterval * 1000); } } diff --git a/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php b/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php index 74eb57c62..2ba33af15 100644 --- a/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php +++ b/library/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @version $Id: RetryPolicyAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: RetryPolicyAbstract.php 24594 2012-01-05 21:27:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -39,33 +39,33 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage RetryPolicy - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract { /** * Execute function under retry policy - * + * * @param string|array $function Function to execute * @param array $parameters Parameters for function call * @return mixed */ public abstract function execute($function, $parameters = array()); - + /** * Create a Zend_Service_WindowsAzure_RetryPolicy_NoRetry instance - * + * * @return Zend_Service_WindowsAzure_RetryPolicy_NoRetry */ public static function noRetry() { return new Zend_Service_WindowsAzure_RetryPolicy_NoRetry(); } - + /** * Create a Zend_Service_WindowsAzure_RetryPolicy_RetryN instance - * + * * @param int $count Number of retries * @param int $intervalBetweenRetries Interval between retries (in milliseconds) * @return Zend_Service_WindowsAzure_RetryPolicy_RetryN diff --git a/library/Zend/Service/WindowsAzure/SessionHandler.php b/library/Zend/Service/WindowsAzure/SessionHandler.php index 20a571fd4..63a4d5159 100644 --- a/library/Zend/Service/WindowsAzure/SessionHandler.php +++ b/library/Zend/Service/WindowsAzure/SessionHandler.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SessionHandler.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: SessionHandler.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Service_WindowsAzure_Storage_Table */ @@ -32,35 +32,35 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_SessionHandler { /** * Table storage - * + * * @var Zend_Service_WindowsAzure_Storage_Table */ protected $_tableStorage; - + /** * Session table name - * + * * @var string */ protected $_sessionTable; - + /** * Session table partition - * + * * @var string */ protected $_sessionTablePartition; - + /** * Creates a new Zend_Service_WindowsAzure_SessionHandler instance - * + * * @param Zend_Service_WindowsAzure_Storage_Table $tableStorage Table storage * @param string $sessionTable Session table name * @param string $sessionTablePartition Session table partition @@ -75,7 +75,7 @@ public function __construct(Zend_Service_WindowsAzure_Storage_Table $tableStorag /** * Registers the current session handler as PHP's session handler - * + * * @return boolean */ public function register() @@ -87,38 +87,38 @@ public function register() array($this, 'destroy'), array($this, 'gc') ); - } - + } + /** * Open the session store - * + * * @return bool */ public function open() { - // Make sure table exists - $tableExists = $this->_tableStorage->tableExists($this->_sessionTable); - if (!$tableExists) { - $this->_tableStorage->createTable($this->_sessionTable); - } - - // Ok! - return true; + // Make sure table exists + $tableExists = $this->_tableStorage->tableExists($this->_sessionTable); + if (!$tableExists) { + $this->_tableStorage->createTable($this->_sessionTable); + } + + // Ok! + return true; } /** * Close the session store - * + * * @return bool */ public function close() { return true; } - + /** * Read a specific session - * + * * @param int $id Session Id * @return string */ @@ -138,10 +138,10 @@ public function read($id) return ''; } } - + /** * Write a specific session - * + * * @param int $id Session Id * @param string $serializedData Serialized PHP object */ @@ -150,7 +150,7 @@ public function write($id, $serializedData) $sessionRecord = new Zend_Service_WindowsAzure_Storage_DynamicTableEntity($this->_sessionTablePartition, $id); $sessionRecord->sessionExpires = time(); $sessionRecord->serializedData = base64_encode($serializedData); - + $sessionRecord->setAzurePropertyType('sessionExpires', 'Edm.Int32'); try @@ -162,10 +162,10 @@ public function write($id, $serializedData) $this->_tableStorage->insertEntity($this->_sessionTable, $sessionRecord); } } - + /** * Destroy a specific session - * + * * @param int $id Session Id * @return boolean */ @@ -179,7 +179,7 @@ public function destroy($id) $id ); $this->_tableStorage->deleteEntity($this->_sessionTable, $sessionRecord); - + return true; } catch (Zend_Service_WindowsAzure_Exception $ex) @@ -187,10 +187,10 @@ public function destroy($id) return false; } } - + /** * Garbage collector - * + * * @param int $lifeTime Session maximal lifetime * @see session.gc_divisor 100 * @see session.gc_maxlifetime 1440 diff --git a/library/Zend/Service/WindowsAzure/Storage.php b/library/Zend/Service/WindowsAzure/Storage.php index e972176d1..f6740c2a2 100644 --- a/library/Zend/Service/WindowsAzure/Storage.php +++ b/library/Zend/Service/WindowsAzure/Storage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Storage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -54,7 +54,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage @@ -92,7 +92,7 @@ class Zend_Service_WindowsAzure_Storage /** * Current API version - * + * * @var string */ protected $_apiVersion = '2009-09-19'; @@ -134,42 +134,42 @@ class Zend_Service_WindowsAzure_Storage /** * Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract instance - * + * * @var Zend_Service_WindowsAzure_RetryPolicy_RetryPolicyAbstract */ protected $_retryPolicy = null; /** * Zend_Http_Client channel used for communication with REST services - * + * * @var Zend_Http_Client */ protected $_httpClientChannel = null; /** * Use proxy? - * + * * @var boolean */ protected $_useProxy = false; /** * Proxy url - * + * * @var string */ protected $_proxyUrl = ''; /** * Proxy port - * + * * @var int */ protected $_proxyPort = 80; /** * Proxy credentials - * + * * @var string */ protected $_proxyCredentials = ''; @@ -231,7 +231,7 @@ public function __construct( /** * Set the HTTP client channel to use - * + * * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name. */ public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Proxy') @@ -241,7 +241,7 @@ public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapte /** * Retrieve HTTP client channel - * + * * @return Zend_Http_Client_Adapter_Interface */ public function getHttpClientChannel() @@ -264,7 +264,7 @@ public function setRetryPolicy(Zend_Service_WindowsAzure_RetryPolicy_RetryPolicy /** * Set proxy - * + * * @param boolean $useProxy Use proxy? * @param string $proxyUrl Proxy URL * @param int $proxyPort Proxy port @@ -276,7 +276,7 @@ public function setProxy($useProxy = false, $proxyUrl = '', $proxyPort = 80, $pr $this->_proxyUrl = $proxyUrl; $this->_proxyPort = $proxyPort; $this->_proxyCredentials = $proxyCredentials; - + if ($this->_useProxy) { $credentials = explode(':', $this->_proxyCredentials); @@ -298,7 +298,7 @@ public function setProxy($useProxy = false, $proxyUrl = '', $proxyPort = 80, $pr /** * Returns the Windows Azure account name - * + * * @return string */ public function getAccountName() @@ -322,7 +322,7 @@ public function getBaseUrl() /** * Set Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance - * + * * @param Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance to use for request signing. */ public function setCredentials(Zend_Service_WindowsAzure_Credentials_CredentialsAbstract $credentials) @@ -335,7 +335,7 @@ public function setCredentials(Zend_Service_WindowsAzure_Credentials_Credentials /** * Get Zend_Service_WindowsAzure_Credentials_CredentialsAbstract instance - * + * * @return Zend_Service_WindowsAzure_Credentials_CredentialsAbstract */ public function getCredentials() @@ -386,16 +386,16 @@ protected function _performRequest( // Add version header $headers['x-ms-version'] = $this->_apiVersion; - + // URL encoding $path = self::urlencode($path); $queryString = self::urlencode($queryString); - // Generate URL and sign request - $requestUrl = $this->_credentials - ->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission); - $requestHeaders = $this->_credentials - ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission, $rawData); + // Generate URL and sign request + $requestUrl = $this->_credentials + ->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission); + $requestHeaders = $this->_credentials + ->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission, $rawData); // Prepare request $this->_httpClientChannel->resetParameters(true); @@ -412,7 +412,7 @@ protected function _performRequest( return $response; } - /** + /** * Parse result from Zend_Http_Response * * @param Zend_Http_Response $response Response from HTTP call @@ -426,25 +426,25 @@ protected function _parseResponse(Zend_Http_Response $response = null) } $xml = @simplexml_load_string($response->getBody()); - + if ($xml !== false) { - // Fetch all namespaces - $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); - + // Fetch all namespaces + $namespaces = array_merge($xml->getNamespaces(true), $xml->getDocNamespaces(true)); + // Register all namespace prefixes - foreach ($namespaces as $prefix => $ns) { + foreach ($namespaces as $prefix => $ns) { if ($prefix != '') { $xml->registerXPathNamespace($prefix, $ns); - } - } + } + } } - + return $xml; } /** * Generate metadata headers - * + * * @param array $metadata * @return HTTP headers containing metadata */ @@ -473,7 +473,7 @@ protected function _generateMetadataHeaders($metadata = array()) /** * Parse metadata headers - * + * * @param array $headers HTTP headers containing metadata * @return array */ @@ -496,7 +496,7 @@ protected function _parseMetadataHeaders($headers = array()) /** * Parse metadata XML - * + * * @param SimpleXMLElement $parentElement Element containing the Metadata element. * @return array */ @@ -512,27 +512,27 @@ protected function _parseMetadataElement($element = null) /** * Generate ISO 8601 compliant date string in UTC time zone - * + * * @param int $timestamp * @return string */ - public function isoDate($timestamp = null) - { + public function isoDate($timestamp = null) + { $tz = @date_default_timezone_get(); @date_default_timezone_set('UTC'); - + if ($timestamp === null) { $timestamp = time(); } - - $returnValue = str_replace('+00:00', '.0000000Z', @date("Y-m-d H:i:s", $timestamp)); + + $returnValue = str_replace('+00:00', '.0000000Z', @date('c', $timestamp)); @date_default_timezone_set($tz); return $returnValue; } /** * URL encode function - * + * * @param string $value Value to encode * @return string Encoded value */ @@ -552,22 +552,22 @@ public static function isValidMetadataName($metadataName = '') if (preg_match("/^[a-zA-Z0-9_@][a-zA-Z0-9_]*$/", $metadataName) === 0) { return false; } - + if ($metadataName == '') { return false; } return true; } - + /** * Builds a query string from an array of elements - * + * * @param array Array of elements * @return string Assembled query string */ public static function createQueryStringFromArray($queryString) { - return count($queryString) > 0 ? '?' . implode('&', $queryString) : ''; - } + return count($queryString) > 0 ? '?' . implode('&', $queryString) : ''; + } } diff --git a/library/Zend/Service/WindowsAzure/Storage/Batch.php b/library/Zend/Service/WindowsAzure/Storage/Batch.php index d456b6f50..7e095209b 100644 --- a/library/Zend/Service/WindowsAzure/Storage/Batch.php +++ b/library/Zend/Service/WindowsAzure/Storage/Batch.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Batch.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Batch.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,49 +34,49 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Batch -{ +{ /** * Storage client the batch is defined on - * + * * @var Zend_Service_WindowsAzure_Storage_BatchStorageAbstract */ protected $_storageClient = null; - + /** * For table storage? - * + * * @var boolean */ protected $_forTableStorage = false; - + /** * Base URL - * + * * @var string */ protected $_baseUrl; - + /** * Pending operations - * + * * @var unknown_type */ protected $_operations = array(); - + /** * Does the batch contain a single select? - * + * * @var boolean */ protected $_isSingleSelect = false; - + /** * Creates a new Zend_Service_WindowsAzure_Storage_Batch - * + * * @param Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient Storage client the batch is defined on */ public function __construct(Zend_Service_WindowsAzure_Storage_BatchStorageAbstract $storageClient = null, $baseUrl = '') @@ -85,7 +85,7 @@ public function __construct(Zend_Service_WindowsAzure_Storage_BatchStorageAbstra $this->_baseUrl = $baseUrl; $this->_beginBatch(); } - + /** * Get base URL for creating requests * @@ -95,17 +95,17 @@ public function getBaseUrl() { return $this->_baseUrl; } - + /** * Starts a new batch operation set - * + * * @throws Zend_Service_WindowsAzure_Exception */ protected function _beginBatch() { $this->_storageClient->setCurrentBatch($this); } - + /** * Cleanup current batch */ @@ -134,7 +134,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend if ($forTableStorage) { $this->_forTableStorage = true; } - + // Set _isSingleSelect if ($httpVerb == Zend_Http_Client::GET) { if (count($this->_operations) > 0) { @@ -142,7 +142,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend } $this->_isSingleSelect = true; } - + // Clean path if (strpos($path, '/') !== 0) { $path = '/' . $path; @@ -152,7 +152,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend if ($headers === null) { $headers = array(); } - + // URL encoding $path = Zend_Service_WindowsAzure_Storage::urlencode($path); $queryString = Zend_Service_WindowsAzure_Storage::urlencode($queryString); @@ -164,7 +164,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend if ($rawData === null) { $rawData = ''; } - + // Add headers if ($httpVerb != Zend_Http_Client::GET) { $headers['Content-ID'] = count($this->_operations) + 1; @@ -173,7 +173,7 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend } $headers['Content-Length'] = strlen($rawData); } - + // Generate $operation $operation = ''; $operation .= $httpVerb . ' ' . $requestUrl . ' HTTP/1.1' . "\n"; @@ -187,12 +187,12 @@ public function enlistOperation($path = '/', $queryString = '', $httpVerb = Zend $operation .= $rawData; // Store operation - $this->_operations[] = $operation; + $this->_operations[] = $operation; } - + /** * Commit current batch - * + * * @return Zend_Http_Response * @throws Zend_Service_WindowsAzure_Exception */ @@ -200,23 +200,23 @@ public function commit() { // Perform batch $response = $this->_storageClient->performBatch($this->_operations, $this->_forTableStorage, $this->_isSingleSelect); - + // Dispose $this->_clean(); - + // Parse response $errors = null; preg_match_all('/(.*)<\/message>/', $response->getBody(), $errors); - + // Error? if (count($errors[2]) > 0) { throw new Zend_Service_WindowsAzure_Exception('An error has occured while committing a batch: ' . $errors[2][0]); } - + // Return return $response; } - + /** * Rollback current batch */ @@ -225,20 +225,20 @@ public function rollback() // Dispose $this->_clean(); } - + /** * Get operation count - * + * * @return integer */ public function getOperationCount() { return count($this->_operations); } - + /** * Is single select? - * + * * @return boolean */ public function isSingleSelect() diff --git a/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php b/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php index 9dcf65205..49974212a 100644 --- a/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php +++ b/library/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BatchStorageAbstract.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: BatchStorageAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -54,22 +54,22 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_WindowsAzure_Storage_BatchStorageAbstract extends Zend_Service_WindowsAzure_Storage -{ +{ /** * Current batch - * + * * @var Zend_Service_WindowsAzure_Storage_Batch */ protected $_currentBatch = null; - + /** * Set current batch - * + * * @param Zend_Service_WindowsAzure_Storage_Batch $batch Current batch * @throws Zend_Service_WindowsAzure_Exception */ @@ -80,30 +80,30 @@ public function setCurrentBatch(Zend_Service_WindowsAzure_Storage_Batch $batch = } $this->_currentBatch = $batch; } - + /** * Get current batch - * + * * @return Zend_Service_WindowsAzure_Storage_Batch */ public function getCurrentBatch() { return $this->_currentBatch; } - + /** * Is there a current batch? - * + * * @return boolean */ public function isInBatch() { return $this->_currentBatch !== null; } - + /** * Starts a new batch operation set - * + * * @return Zend_Service_WindowsAzure_Storage_Batch * @throws Zend_Service_WindowsAzure_Exception */ @@ -127,10 +127,10 @@ public function performBatch($operations = array(), $forTableStorage = false, $i // Generate boundaries $batchBoundary = 'batch_' . md5(time() . microtime()); $changesetBoundary = 'changeset_' . md5(time() . microtime()); - + // Set headers $headers = array(); - + // Add version header $headers['x-ms-version'] = $this->_apiVersion; @@ -141,57 +141,57 @@ public function performBatch($operations = array(), $forTableStorage = false, $i // Add content-type header $headers['Content-Type'] = 'multipart/mixed; boundary=' . $batchBoundary; - // Set path and query string - $path = '/$batch'; - $queryString = ''; - - // Set verb - $httpVerb = Zend_Http_Client::POST; - - // Generate raw data - $rawData = ''; - - // Single select? - if ($isSingleSelect) { - $operation = $operations[0]; - $rawData .= '--' . $batchBoundary . "\n"; + // Set path and query string + $path = '/$batch'; + $queryString = ''; + + // Set verb + $httpVerb = Zend_Http_Client::POST; + + // Generate raw data + $rawData = ''; + + // Single select? + if ($isSingleSelect) { + $operation = $operations[0]; + $rawData .= '--' . $batchBoundary . "\n"; $rawData .= 'Content-Type: application/http' . "\n"; $rawData .= 'Content-Transfer-Encoding: binary' . "\n\n"; - $rawData .= $operation; + $rawData .= $operation; $rawData .= '--' . $batchBoundary . '--'; - } else { - $rawData .= '--' . $batchBoundary . "\n"; - $rawData .= 'Content-Type: multipart/mixed; boundary=' . $changesetBoundary . "\n\n"; - - // Add operations - foreach ($operations as $operation) - { + } else { + $rawData .= '--' . $batchBoundary . "\n"; + $rawData .= 'Content-Type: multipart/mixed; boundary=' . $changesetBoundary . "\n\n"; + + // Add operations + foreach ($operations as $operation) + { $rawData .= '--' . $changesetBoundary . "\n"; $rawData .= 'Content-Type: application/http' . "\n"; $rawData .= 'Content-Transfer-Encoding: binary' . "\n\n"; $rawData .= $operation; } $rawData .= '--' . $changesetBoundary . '--' . "\n"; - + $rawData .= '--' . $batchBoundary . '--'; } - // Generate URL and sign request - $requestUrl = $this->_credentials->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission); - $requestHeaders = $this->_credentials->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission); + // Generate URL and sign request + $requestUrl = $this->_credentials->signRequestUrl($this->getBaseUrl() . $path . $queryString, $resourceType, $requiredPermission); + $requestHeaders = $this->_credentials->signRequestHeaders($httpVerb, $path, $queryString, $headers, $forTableStorage, $resourceType, $requiredPermission); - // Prepare request - $this->_httpClientChannel->resetParameters(true); - $this->_httpClientChannel->setUri($requestUrl); - $this->_httpClientChannel->setHeaders($requestHeaders); - $this->_httpClientChannel->setRawData($rawData); - - // Execute request - $response = $this->_retryPolicy->execute( - array($this->_httpClientChannel, 'request'), - array($httpVerb) - ); + // Prepare request + $this->_httpClientChannel->resetParameters(true); + $this->_httpClientChannel->setUri($requestUrl); + $this->_httpClientChannel->setHeaders($requestHeaders); + $this->_httpClientChannel->setRawData($rawData); + + // Execute request + $response = $this->_retryPolicy->execute( + array($this->_httpClientChannel, 'request'), + array($httpVerb) + ); - return $response; - } + return $response; + } } diff --git a/library/Zend/Service/WindowsAzure/Storage/Blob.php b/library/Zend/Service/WindowsAzure/Storage/Blob.php index e0b2e13fd..1abfb7e56 100644 --- a/library/Zend/Service/WindowsAzure/Storage/Blob.php +++ b/library/Zend/Service/WindowsAzure/Storage/Blob.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://todo name_todo - * @version $Id: Blob.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Blob.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -85,7 +85,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Blob extends Zend_Service_WindowsAzure_Storage @@ -537,7 +537,7 @@ public function listContainers($prefix = null, $maxResults = null, $marker = nul $queryString[] = 'include=' . $include; } $queryString = self::createQueryStringFromArray($queryString); - + // Perform request $response = $this->_performRequest('', $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_CredentialsAbstract::PERMISSION_LIST); if ($response->isSuccessful()) { @@ -564,7 +564,7 @@ public function listContainers($prefix = null, $maxResults = null, $marker = nul if ($maxResults !== null && count($containers) > $maxResults) { $containers = array_slice($containers, 0, $maxResults); } - + return $containers; } else { throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); @@ -1152,7 +1152,7 @@ public function getPageRegions($containerName = '', $blobName = '', $startByteOf (int)$xmlRanges[$i]->End ); } - + return $ranges; } else { throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); @@ -1357,7 +1357,7 @@ public function getBlobInstance($containerName = '', $blobName = '', $snapshotId $queryString[] = 'snapshot=' . $snapshotId; } $queryString = self::createQueryStringFromArray($queryString); - + // Additional headers? $headers = array(); if ($leaseId !== null) { diff --git a/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php b/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php index 5b28f980c..5c5a5c5af 100644 --- a/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php +++ b/library/Zend/Service/WindowsAzure/Storage/Blob/Stream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure_Storage * @subpackage Blob - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://todo name_todo - * @version $Id: Stream.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,56 +35,56 @@ * @category Zend * @package Zend_Service_WindowsAzure_Storage * @subpackage Blob - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Blob_Stream { /** * Current file name - * + * * @var string */ private $_fileName = null; - + /** * Temporary file name - * + * * @var string */ private $_temporaryFileName = null; - + /** * Temporary file handle - * + * * @var resource */ private $_temporaryFileHandle = null; - + /** * Blob storage client - * + * * @var Zend_Service_WindowsAzure_Storage_Blob */ private $_storageClient = null; - + /** * Write mode? - * + * * @var boolean */ private $_writeMode = false; - + /** * List of blobs - * + * * @var array */ private $_blobs = null; - + /** * Retrieve storage client for this stream type - * + * * @param string $path * @return Zend_Service_WindowsAzure_Storage_Blob */ @@ -101,10 +101,10 @@ protected function _getStorageClient($path = '') throw new Zend_Service_WindowsAzure_Exception('No storage client registered for stream type "' . $url[0] . '://".'); } } - + return $this->_storageClient; } - + /** * Extract container name * @@ -120,7 +120,7 @@ protected function _getContainerName($path) return ''; } - + /** * Extract file name * @@ -132,15 +132,15 @@ protected function _getFileName($path) $url = parse_url($path); if ($url['host']) { $fileName = isset($url['path']) ? $url['path'] : $url['host']; - if (strpos($fileName, '/') === 0) { - $fileName = substr($fileName, 1); - } + if (strpos($fileName, '/') === 0) { + $fileName = substr($fileName, 1); + } return $fileName; } return ''; } - + /** * Open the stream * @@ -154,21 +154,21 @@ public function stream_open($path, $mode, $options, $opened_path) { $this->_fileName = $path; $this->_temporaryFileName = tempnam(sys_get_temp_dir(), 'azure'); - + // Check the file can be opened $fh = @fopen($this->_temporaryFileName, $mode); if ($fh === false) { return false; } fclose($fh); - + // Write mode? if (strpbrk($mode, 'wax+')) { $this->_writeMode = true; - } else { + } else { $this->_writeMode = false; } - + // If read/append, fetch the file if (!$this->_writeMode || strpbrk($mode, 'ra+')) { $this->_getStorageClient($this->_fileName)->getBlob( @@ -177,10 +177,10 @@ public function stream_open($path, $mode, $options, $opened_path) $this->_temporaryFileName ); } - + // Open temporary file handle $this->_temporaryFileHandle = fopen($this->_temporaryFileName, $mode); - + // Ok! return true; } @@ -193,7 +193,7 @@ public function stream_open($path, $mode, $options, $opened_path) public function stream_close() { @fclose($this->_temporaryFileHandle); - + // Upload the file? if ($this->_writeMode) { // Make sure the container exists @@ -205,7 +205,7 @@ public function stream_close() $this->_getContainerName($this->_fileName) ); } - + // Upload the file try { $this->_getStorageClient($this->_fileName)->putBlob( @@ -216,11 +216,11 @@ public function stream_close() } catch (Zend_Service_WindowsAzure_Exception $ex) { @unlink($this->_temporaryFileName); unset($this->_storageClient); - + throw $ex; } } - + @unlink($this->_temporaryFileName); unset($this->_storageClient); } @@ -251,7 +251,7 @@ public function stream_write($data) if (!$this->_temporaryFileHandle) { return 0; } - + $len = strlen($data); fwrite($this->_temporaryFileHandle, $data, $len); return $len; @@ -293,7 +293,7 @@ public function stream_seek($offset, $whence) if (!$this->_temporaryFileHandle) { return false; } - + return (fseek($this->_temporaryFileHandle, $offset, $whence) === 0); } @@ -305,7 +305,7 @@ public function stream_seek($offset, $whence) public function stream_flush() { $result = fflush($this->_temporaryFileHandle); - + // Upload the file? if ($this->_writeMode) { // Make sure the container exists @@ -317,7 +317,7 @@ public function stream_flush() $this->_getContainerName($this->_fileName) ); } - + // Upload the file try { $this->_getStorageClient($this->_fileName)->putBlob( @@ -328,11 +328,11 @@ public function stream_flush() } catch (Zend_Service_WindowsAzure_Exception $ex) { @unlink($this->_temporaryFileName); unset($this->_storageClient); - + throw $ex; } } - + return $result; } @@ -374,8 +374,8 @@ public function stream_stat() if ($info !== null) { $stat['size'] = $info->Size; $stat['atime'] = time(); - } - + } + return $stat; } @@ -405,11 +405,11 @@ public function rename($path_from, $path_to) if ($this->_getContainerName($path_from) != $this->_getContainerName($path_to)) { throw new Zend_Service_WindowsAzure_Exception('Container name can not be changed.'); } - + if ($this->_getFileName($path_from) == $this->_getContainerName($path_to)) { return true; } - + $this->_getStorageClient($path_from)->copyBlob( $this->_getContainerName($path_from), $this->_getFileName($path_from), @@ -422,7 +422,7 @@ public function rename($path_from, $path_to) ); return true; } - + /** * Return array of URL variables * @@ -459,7 +459,7 @@ public function url_stat($path, $flags) if ($info !== null) { $stat['size'] = $info->Size; $stat['atime'] = time(); - } + } return $stat; } diff --git a/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php b/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php index 83acd16b8..bdd6bcf56 100644 --- a/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php +++ b/library/Zend/Service/WindowsAzure/Storage/BlobContainer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlobContainer.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: BlobContainer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,9 +34,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $Name Name of the container * @property string $Etag Etag of the container * @property string $LastModified Last modified date of the container @@ -46,20 +46,20 @@ class Zend_Service_WindowsAzure_Storage_BlobContainer { /** * Data - * + * * @var array */ protected $_data = null; - + /** * Constructor - * + * * @param string $name Name * @param string $etag Etag * @param string $lastModified Last modified date * @param array $metadata Key/value pairs of meta data */ - public function __construct($name, $etag, $lastModified, $metadata = array()) + public function __construct($name, $etag, $lastModified, $metadata = array()) { $this->_data = array( 'name' => $name, @@ -68,10 +68,10 @@ public function __construct($name, $etag, $lastModified, $metadata = array()) 'metadata' => $metadata ); } - + /** * Magic overload for setting properties - * + * * @param string $name Name of the property * @param string $value Value to set */ @@ -86,7 +86,7 @@ public function __set($name, $value) { /** * Magic overload for getting properties - * + * * @param string $name Name of the property */ public function __get($name) { diff --git a/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php b/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php index e2c588093..bb604bbd0 100644 --- a/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php +++ b/library/Zend/Service/WindowsAzure/Storage/BlobInstance.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlobInstance.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: BlobInstance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,9 +34,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $Container Container name * @property string $Name Name * @property string $SnapshotId Snapshot id @@ -57,14 +57,14 @@ class Zend_Service_WindowsAzure_Storage_BlobInstance { /** * Data - * + * * @var array */ protected $_data = null; - + /** * Constructor - * + * * @param string $containerName Container name * @param string $name Name * @param string $snapshotId Snapshot id @@ -81,12 +81,12 @@ class Zend_Service_WindowsAzure_Storage_BlobInstance * @param boolean $isPrefix Is Prefix? * @param array $metadata Key/value pairs of meta data */ - public function __construct($containerName, $name, $snapshotId, $etag, $lastModified, $url = '', $size = 0, $contentType = '', $contentEncoding = '', $contentLanguage = '', $cacheControl = '', $blobType = '', $leaseStatus = '', $isPrefix = false, $metadata = array()) - { + public function __construct($containerName, $name, $snapshotId, $etag, $lastModified, $url = '', $size = 0, $contentType = '', $contentEncoding = '', $contentLanguage = '', $cacheControl = '', $blobType = '', $leaseStatus = '', $isPrefix = false, $metadata = array()) + { $this->_data = array( 'container' => $containerName, 'name' => $name, - 'snapshotid' => $snapshotId, + 'snapshotid' => $snapshotId, 'etag' => $etag, 'lastmodified' => $lastModified, 'url' => $url, @@ -101,10 +101,10 @@ public function __construct($containerName, $name, $snapshotId, $etag, $lastModi 'metadata' => $metadata ); } - + /** * Magic overload for setting properties - * + * * @param string $name Name of the property * @param string $value Value to set */ @@ -119,7 +119,7 @@ public function __set($name, $value) { /** * Magic overload for getting properties - * + * * @param string $name Name of the property */ public function __get($name) { diff --git a/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php b/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php index 31f14d3d7..6fafd6127 100644 --- a/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php +++ b/library/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DynamicTableEntity.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: DynamicTableEntity.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -36,40 +36,40 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_DynamicTableEntity extends Zend_Service_WindowsAzure_Storage_TableEntity -{ +{ /** * Dynamic properties - * + * * @var array */ protected $_dynamicProperties = array(); - + /** * Magic overload for setting properties - * + * * @param string $name Name of the property * @param string $value Value to set */ - public function __set($name, $value) { + public function __set($name, $value) { $this->setAzureProperty($name, $value, null); } /** * Magic overload for getting properties - * + * * @param string $name Name of the property */ public function __get($name) { return $this->getAzureProperty($name); } - + /** * Set an Azure property - * + * * @param string $name Property name * @param mixed $value Property value * @param string $type Property type (Edm.xxxx) @@ -96,23 +96,23 @@ public function setAzureProperty($name, $value = '', $type = null) $type = 'Edm.Boolean'; } } - + // Set dynamic property $this->_dynamicProperties[strtolower($name)] = (object)array( 'Name' => $name, - 'Type' => $type, - 'Value' => $value, + 'Type' => $type, + 'Value' => $value, ); } - + $this->_dynamicProperties[strtolower($name)]->Value = $value; } return $this; } - + /** * Set an Azure property type - * + * * @param string $name Property name * @param string $type Property type (Edm.xxxx) * @return Zend_Service_WindowsAzure_Storage_DynamicTableEntity @@ -120,16 +120,16 @@ public function setAzureProperty($name, $value = '', $type = null) public function setAzurePropertyType($name, $type = 'Edm.String') { if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) { - $this->setAzureProperty($name, '', $type); + $this->setAzureProperty($name, '', $type); } else { - $this->_dynamicProperties[strtolower($name)]->Type = $type; + $this->_dynamicProperties[strtolower($name)]->Type = $type; } return $this; } - + /** * Get an Azure property - * + * * @param string $name Property name * @param mixed $value Property value * @param string $type Property type (Edm.xxxx) @@ -148,40 +148,40 @@ public function getAzureProperty($name) } if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) { - $this->setAzureProperty($name); + $this->setAzureProperty($name); } return $this->_dynamicProperties[strtolower($name)]->Value; } - + /** * Get an Azure property type - * + * * @param string $name Property name * @return string Property type (Edm.xxxx) */ public function getAzurePropertyType($name) { if (!array_key_exists(strtolower($name), $this->_dynamicProperties)) { - $this->setAzureProperty($name, '', $type); + $this->setAzureProperty($name, '', $type); } - + return $this->_dynamicProperties[strtolower($name)]->Type; } - + /** * Get Azure values - * + * * @return array */ public function getAzureValues() { return array_merge(array_values($this->_dynamicProperties), parent::getAzureValues()); } - + /** * Set Azure values - * + * * @param array $values * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values? * @throws Zend_Service_WindowsAzure_Exception @@ -190,9 +190,9 @@ public function setAzureValues($values = array(), $throwOnError = false) { // Set parent values parent::setAzureValues($values, false); - + // Set current values - foreach ($values as $key => $value) + foreach ($values as $key => $value) { $this->$key = $value; } diff --git a/library/Zend/Service/WindowsAzure/Storage/LeaseInstance.php b/library/Zend/Service/WindowsAzure/Storage/LeaseInstance.php index f8d61d0f4..40167649c 100644 --- a/library/Zend/Service/WindowsAzure/Storage/LeaseInstance.php +++ b/library/Zend/Service/WindowsAzure/Storage/LeaseInstance.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,31 +34,31 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $Container Container name * @property string $Name Name * @property string $LeaseId Lease id * @property string $LeaseTime Time remaining in the lease period, in seconds. This header is returned only for a successful request to break the lease. It provides an approximation as to when the lease period will expire. */ class Zend_Service_WindowsAzure_Storage_LeaseInstance - extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Constructor - * + * * @param string $containerName Container name * @param string $name Name * @param string $leaseId Lease id * @param string $leaseTime Time remaining in the lease period, in seconds. This header is returned only for a successful request to break the lease. It provides an approximation as to when the lease period will expire. */ - public function __construct($containerName, $name, $leaseId, $leaseTime) - { + public function __construct($containerName, $name, $leaseId, $leaseTime) + { $this->_data = array( 'container' => $containerName, 'name' => $name, - 'leaseid' => $leaseId, + 'leaseid' => $leaseId, 'leasetime' => $leaseTime ); } diff --git a/library/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php b/library/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php index 72d3979a8..9ec2a696b 100644 --- a/library/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php +++ b/library/Zend/Service/WindowsAzure/Storage/PageRegionInstance.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,23 +34,23 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property int $start Page range start * @property int $end Page range end */ class Zend_Service_WindowsAzure_Storage_PageRegionInstance - extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Constructor - * + * * @param int $start Page range start * @param int $end Page range end */ - public function __construct($start = 0, $end = 0) - { + public function __construct($start = 0, $end = 0) + { $this->_data = array( 'start' => $start, 'end' => $end diff --git a/library/Zend/Service/WindowsAzure/Storage/Queue.php b/library/Zend/Service/WindowsAzure/Storage/Queue.php index 18ee99d92..4d1909a71 100644 --- a/library/Zend/Service/WindowsAzure/Storage/Queue.php +++ b/library/Zend/Service/WindowsAzure/Storage/Queue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://todo name_todo - * @version $Id: Queue.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: Queue.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -65,7 +65,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Queue extends Zend_Service_WindowsAzure_Storage @@ -99,7 +99,7 @@ public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_Q /** * Check if a queue exists - * + * * @param string $queueName Queue name * @return boolean */ @@ -119,7 +119,7 @@ public function queueExists($queueName = '') return true; } } - + return false; } @@ -142,7 +142,7 @@ public function createQueue($queueName = '', $metadata = array()) // Create metadata headers $headers = array(); - $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); + $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); // Perform request $response = $this->_performRequest($queueName, '', Zend_Http_Client::PUT, $headers); @@ -158,7 +158,7 @@ public function createQueue($queueName = '', $metadata = array()) /** * Get queue - * + * * @param string $queueName Queue name * @return Zend_Service_WindowsAzure_Storage_QueueInstance * @throws Zend_Service_WindowsAzure_Exception @@ -171,7 +171,7 @@ public function getQueue($queueName = '') if (!self::isValidQueueName($queueName)) { throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } - + // Perform request $response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::GET); if ($response->isSuccessful()) { @@ -192,7 +192,7 @@ public function getQueue($queueName = '') /** * Get queue metadata - * + * * @param string $queueName Queue name * @return array Key/value pairs of meta data * @throws Zend_Service_WindowsAzure_Exception @@ -211,7 +211,7 @@ public function getQueueMetadata($queueName = '') /** * Set queue metadata - * + * * Calling the Set Queue Metadata operation overwrites all existing metadata that is associated with the queue. It's not possible to modify an individual name/value pair. * * @param string $queueName Queue name @@ -229,56 +229,56 @@ public function setQueueMetadata($queueName = '', $metadata = array()) if (count($metadata) == 0) { return; } - + // Create metadata headers $headers = array(); - $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); + $headers = array_merge($headers, $this->_generateMetadataHeaders($metadata)); // Perform request $response = $this->_performRequest($queueName, '?comp=metadata', Zend_Http_Client::PUT, $headers); - if (!$response->isSuccessful()) { - throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); - } - } - - /** - * Delete queue - * - * @param string $queueName Queue name - * @throws Zend_Service_WindowsAzure_Exception - */ - public function deleteQueue($queueName = '') - { - if ($queueName === '') { - throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); - } - if (!self::isValidQueueName($queueName)) { - throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); - } - - // Perform request - $response = $this->_performRequest($queueName, '', Zend_Http_Client::DELETE); - if (!$response->isSuccessful()) { - throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); - } - } - - /** - * List queues - * - * @param string $prefix Optional. Filters the results to return only queues whose name begins with the specified prefix. - * @param int $maxResults Optional. Specifies the maximum number of queues to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000) - * @param string $marker Optional string value that identifies the portion of the list to be returned with the next list operation. - * @param string $include Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. (allowed values: '', 'metadata') - * @param int $currentResultCount Current result count (internal use) - * @return array - * @throws Zend_Service_WindowsAzure_Exception - */ - public function listQueues($prefix = null, $maxResults = null, $marker = null, $include = null, $currentResultCount = 0) - { - // Build query string - $queryString = array('comp=list'); + if (!$response->isSuccessful()) { + throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Delete queue + * + * @param string $queueName Queue name + * @throws Zend_Service_WindowsAzure_Exception + */ + public function deleteQueue($queueName = '') + { + if ($queueName === '') { + throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); + } + if (!self::isValidQueueName($queueName)) { + throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); + } + + // Perform request + $response = $this->_performRequest($queueName, '', Zend_Http_Client::DELETE); + if (!$response->isSuccessful()) { + throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * List queues + * + * @param string $prefix Optional. Filters the results to return only queues whose name begins with the specified prefix. + * @param int $maxResults Optional. Specifies the maximum number of queues to return per call to Azure storage. This does NOT affect list size returned by this function. (maximum: 5000) + * @param string $marker Optional string value that identifies the portion of the list to be returned with the next list operation. + * @param string $include Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. (allowed values: '', 'metadata') + * @param int $currentResultCount Current result count (internal use) + * @return array + * @throws Zend_Service_WindowsAzure_Exception + */ + public function listQueues($prefix = null, $maxResults = null, $marker = null, $include = null, $currentResultCount = 0) + { + // Build query string + $queryString = array('comp=list'); if ($prefix !== null) { $queryString[] = 'prefix=' . $prefix; } @@ -292,7 +292,7 @@ public function listQueues($prefix = null, $maxResults = null, $marker = null, $ $queryString[] = 'include=' . $include; } $queryString = self::createQueryStringFromArray($queryString); - + // Perform request $response = $this->_performRequest('', $queryString, Zend_Http_Client::GET); if ($response->isSuccessful()) { @@ -317,7 +317,7 @@ public function listQueues($prefix = null, $maxResults = null, $marker = null, $ if ($maxResults !== null && count($queues) > $maxResults) { $queues = array_slice($queues, 0, $maxResults); } - + return $queues; } else { throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); @@ -349,20 +349,20 @@ public function putMessage($queueName = '', $message = '', $ttl = null) if ($ttl !== null && ($ttl <= 0 || $ttl > self::MAX_MESSAGE_SIZE)) { throw new Zend_Service_WindowsAzure_Exception('Message TTL is invalid. Maximal TTL is 7 days (' . self::MAX_MESSAGE_SIZE . ' seconds) and should be greater than zero.'); } - + // Build query string $queryString = array(); if ($ttl !== null) { $queryString[] = 'messagettl=' . $ttl; } $queryString = self::createQueryStringFromArray($queryString); - + // Build body $rawData = ''; $rawData .= ''; $rawData .= ' ' . base64_encode($message) . ''; $rawData .= ''; - + // Perform request $response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::POST, array(), false, $rawData); @@ -395,7 +395,7 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime if ($visibilityTimeout !== null && ($visibilityTimeout <= 0 || $visibilityTimeout > 7200)) { throw new Zend_Service_WindowsAzure_Exception('Visibility timeout is invalid. Maximum value is 2 hours (7200 seconds) and should be greater than zero.'); } - + // Build query string $queryString = array(); if ($peek) { @@ -406,9 +406,9 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime } if (!$peek && $visibilityTimeout !== null) { $queryString[] = 'visibilitytimeout=' . $visibilityTimeout; - } + } $queryString = self::createQueryStringFromArray($queryString); - + // Perform request $response = $this->_performRequest($queueName . '/messages', $queryString, Zend_Http_Client::GET); if ($response->isSuccessful()) { @@ -418,12 +418,12 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime return array(); } - $xmlMessages = null; - if (count($result->QueueMessage) > 1) { - $xmlMessages = $result->QueueMessage; - } else { - $xmlMessages = array($result->QueueMessage); - } + $xmlMessages = null; + if (count($result->QueueMessage) > 1) { + $xmlMessages = $result->QueueMessage; + } else { + $xmlMessages = array($result->QueueMessage); + } $messages = array(); for ($i = 0; $i < count($xmlMessages); $i++) { @@ -437,7 +437,7 @@ public function getMessages($queueName = '', $numOfMessages = 1, $visibilityTime base64_decode((string)$xmlMessages[$i]->MessageText) ); } - + return $messages; } else { throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); @@ -472,73 +472,73 @@ public function clearMessages($queueName = '') throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); } - // Perform request - $response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE); - if (!$response->isSuccessful()) { - throw new Zend_Service_WindowsAzure_Exception('Error clearing messages from queue.'); - } - } - - /** - * Delete queue message - * - * @param string $queueName Queue name - * @param Zend_Service_WindowsAzure_Storage_QueueMessage $message Message to delete from queue. A message retrieved using "peekMessages" can NOT be deleted! - * @throws Zend_Service_WindowsAzure_Exception - */ - public function deleteMessage($queueName = '', Zend_Service_WindowsAzure_Storage_QueueMessage $message) - { - if ($queueName === '') { - throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); - } - if (!self::isValidQueueName($queueName)) { - throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); - } - if ($message->PopReceipt == '') { - throw new Zend_Service_WindowsAzure_Exception('A message retrieved using "peekMessages" can NOT be deleted! Use "getMessages" instead.'); - } + // Perform request + $response = $this->_performRequest($queueName . '/messages', '', Zend_Http_Client::DELETE); + if (!$response->isSuccessful()) { + throw new Zend_Service_WindowsAzure_Exception('Error clearing messages from queue.'); + } + } + + /** + * Delete queue message + * + * @param string $queueName Queue name + * @param Zend_Service_WindowsAzure_Storage_QueueMessage $message Message to delete from queue. A message retrieved using "peekMessages" can NOT be deleted! + * @throws Zend_Service_WindowsAzure_Exception + */ + public function deleteMessage($queueName = '', Zend_Service_WindowsAzure_Storage_QueueMessage $message) + { + if ($queueName === '') { + throw new Zend_Service_WindowsAzure_Exception('Queue name is not specified.'); + } + if (!self::isValidQueueName($queueName)) { + throw new Zend_Service_WindowsAzure_Exception('Queue name does not adhere to queue naming conventions. See http://msdn.microsoft.com/en-us/library/dd179349.aspx for more information.'); + } + if ($message->PopReceipt == '') { + throw new Zend_Service_WindowsAzure_Exception('A message retrieved using "peekMessages" can NOT be deleted! Use "getMessages" instead.'); + } - // Perform request - $response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . $message->PopReceipt, Zend_Http_Client::DELETE); - if (!$response->isSuccessful()) { - throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); - } - } - - /** - * Is valid queue name? - * - * @param string $queueName Queue name - * @return boolean - */ + // Perform request + $response = $this->_performRequest($queueName . '/messages/' . $message->MessageId, '?popreceipt=' . $message->PopReceipt, Zend_Http_Client::DELETE); + if (!$response->isSuccessful()) { + throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.')); + } + } + + /** + * Is valid queue name? + * + * @param string $queueName Queue name + * @return boolean + */ public static function isValidQueueName($queueName = '') { if (preg_match("/^[a-z0-9][a-z0-9-]*$/", $queueName) === 0) { return false; } - + if (strpos($queueName, '--') !== false) { return false; } - + if (strtolower($queueName) != $queueName) { return false; } - + if (strlen($queueName) < 3 || strlen($queueName) > 63) { return false; } - + if (substr($queueName, -1) == '-') { return false; } - + return true; } - + /** * Get error message from Zend_Http_Response - * + * * @param Zend_Http_Response $response Repsonse * @param string $alternativeError Alternative error message * @return string diff --git a/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php b/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php index 4b3f8c0eb..24aa81f25 100644 --- a/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php +++ b/library/Zend/Service/WindowsAzure/Storage/QueueInstance.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueueInstance.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: QueueInstance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,23 +34,23 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $Name Name of the queue * @property array $Metadata Key/value pairs of meta data * @property integer $ApproximateMessageCount The approximate number of messages in the queue */ class Zend_Service_WindowsAzure_Storage_QueueInstance - extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Constructor - * + * * @param string $name Name * @param array $metadata Key/value pairs of meta data */ - public function __construct($name, $metadata = array()) + public function __construct($name, $metadata = array()) { $this->_data = array( 'name' => $name, diff --git a/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php b/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php index 7eebd04aa..0dc249e21 100644 --- a/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php +++ b/library/Zend/Service/WindowsAzure/Storage/QueueMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueueMessage.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: QueueMessage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,32 +34,32 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $MessageId Message ID * @property string $InsertionTime Insertion time * @property string $ExpirationTime Expiration time - * @property string $PopReceipt Receipt verification for deleting the message from queue. + * @property string $PopReceipt Receipt verification for deleting the message from queue. * @property string $TimeNextVisible Next time the message is visible in the queue * @property int $DequeueCount Number of times the message has been dequeued. This value is incremented each time the message is subsequently dequeued. * @property string $MessageText Message text */ class Zend_Service_WindowsAzure_Storage_QueueMessage - extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Constructor - * + * * @param string $messageId Message ID * @param string $insertionTime Insertion time * @param string $expirationTime Expiration time - * @param string $popReceipt Receipt verification for deleting the message from queue. + * @param string $popReceipt Receipt verification for deleting the message from queue. * @param string $timeNextVisible Next time the message is visible in the queue * @param int $dequeueCount Number of times the message has been dequeued. This value is incremented each time the message is subsequently dequeued. * @param string $messageText Message text */ - public function __construct($messageId, $insertionTime, $expirationTime, $popReceipt, $timeNextVisible, $dequeueCount, $messageText) + public function __construct($messageId, $insertionTime, $expirationTime, $popReceipt, $timeNextVisible, $dequeueCount, $messageText) { $this->_data = array( 'messageid' => $messageId, @@ -67,7 +67,7 @@ public function __construct($messageId, $insertionTime, $expirationTime, $popRec 'expirationtime' => $expirationTime, 'popreceipt' => $popReceipt, 'timenextvisible' => $timeNextVisible, - 'dequeuecount' => $dequeueCount, + 'dequeuecount' => $dequeueCount, 'messagetext' => $messageText ); } diff --git a/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php b/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php index 851560655..885fe6893 100644 --- a/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php +++ b/library/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SignedIdentifier.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: SignedIdentifier.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,26 +34,26 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $Id Id for the signed identifier * @property string $Start The time at which the Shared Access Signature becomes valid. * @property string $Expiry The time at which the Shared Access Signature becomes invalid. * @property string $Permissions Signed permissions - read (r), write (w), delete (d) and list (l) */ class Zend_Service_WindowsAzure_Storage_SignedIdentifier - extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Constructor - * + * * @param string $id Id for the signed identifier * @param string $start The time at which the Shared Access Signature becomes valid. * @param string $expiry The time at which the Shared Access Signature becomes invalid. * @param string $permissions Signed permissions - read (r), write (w), delete (d) and list (l) */ - public function __construct($id = '', $start = '', $expiry = '', $permissions = '') + public function __construct($id = '', $start = '', $expiry = '', $permissions = '') { $this->_data = array( 'id' => $id, diff --git a/library/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php b/library/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php index fb615fd9d..859a714ad 100644 --- a/library/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php +++ b/library/Zend/Service/WindowsAzure/Storage/StorageEntityAbstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,22 +30,22 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * */ abstract class Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Data - * + * * @var array */ protected $_data = null; - + /** * Magic overload for setting properties - * + * * @param string $name Name of the property * @param string $value Value to set */ @@ -60,7 +60,7 @@ public function __set($name, $value) { /** * Magic overload for getting properties - * + * * @param string $name Name of the property */ public function __get($name) { diff --git a/library/Zend/Service/WindowsAzure/Storage/Table.php b/library/Zend/Service/WindowsAzure/Storage/Table.php index 66c14bb3d..0697ea8d2 100644 --- a/library/Zend/Service/WindowsAzure/Storage/Table.php +++ b/library/Zend/Service/WindowsAzure/Storage/Table.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 23170 2010-10-19 18:29:24Z mabe $ + * @version $Id: Table.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -90,7 +90,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_Table @@ -111,14 +111,14 @@ public function __construct($host = Zend_Service_WindowsAzure_Storage::URL_DEV_T // Always use SharedKeyLite authentication $this->_credentials = new Zend_Service_WindowsAzure_Credentials_SharedKeyLite($accountName, $accountKey, $this->_usePathStyleUri); - + // API version $this->_apiVersion = '2009-09-19'; } /** * Check if a table exists - * + * * @param string $tableName Table name * @return boolean */ @@ -135,7 +135,7 @@ public function tableExists($tableName = '') return true; } } - + return false; } @@ -154,17 +154,17 @@ public function listTables($nextTableName = '') $queryString[] = 'NextTableName=' . $nextTableName; } $queryString = self::createQueryStringFromArray($queryString); - + // Perform request $response = $this->_performRequest('Tables', $queryString, Zend_Http_Client::GET, null, true); - if ($response->isSuccessful()) { + if ($response->isSuccessful()) { // Parse result $result = $this->_parseResponse($response); - + if (!$result || !$result->entry) { return array(); } - + $entries = null; if (count($result->entry) > 1) { $entries = $result->entry; @@ -173,11 +173,11 @@ public function listTables($nextTableName = '') } // Create return value - $returnValue = array(); + $returnValue = array(); foreach ($entries as $entry) { $tableName = $entry->xpath('.//m:properties/d:TableName'); $tableName = (string)$tableName[0]; - + $returnValue[] = new Zend_Service_WindowsAzure_Storage_TableInstance( (string)$entry->id, $tableName, @@ -185,7 +185,7 @@ public function listTables($nextTableName = '') (string)$entry->updated ); } - + // More tables? if ($response->getHeader('x-ms-continuation-NextTableName') !== null) { $returnValue = array_merge($returnValue, $this->listTables($response->getHeader('x-ms-continuation-NextTableName'))); @@ -213,9 +213,9 @@ public function createTable($tableName = '') // Generate request body $requestBody = ' + xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" + xmlns="http://www.w3.org/2005/Atom"> <updated>{tpl:Updated}</updated> <author> @@ -228,29 +228,29 @@ public function createTable($tableName = '') </m:properties> </content> </entry>'; - + $requestBody = $this->_fillTemplate($requestBody, array( 'BaseUrl' => $this->getBaseUrl(), 'TableName' => htmlspecialchars($tableName), - 'Updated' => $this->isoDate(), + 'Updated' => $this->isoDate(), 'AccountName' => $this->_accountName )); - + // Add header information $headers = array(); $headers['Content-Type'] = 'application/atom+xml'; $headers['DataServiceVersion'] = '1.0;NetFx'; - $headers['MaxDataServiceVersion'] = '1.0;NetFx'; + $headers['MaxDataServiceVersion'] = '1.0;NetFx'; // Perform request $response = $this->_performRequest('Tables', '', Zend_Http_Client::POST, $headers, true, $requestBody); if ($response->isSuccessful()) { // Parse response $entry = $this->_parseResponse($response); - + $tableName = $entry->xpath('.//m:properties/d:TableName'); $tableName = (string)$tableName[0]; - + return new Zend_Service_WindowsAzure_Storage_TableInstance( (string)$entry->id, $tableName, @@ -287,7 +287,7 @@ public function deleteTable($tableName = '') /** * Insert entity into table - * + * * @param string $tableName Table name * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity Entity to insert * @return Zend_Service_WindowsAzure_Storage_TableEntity @@ -301,7 +301,7 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ if ($entity === null) { throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.'); } - + // Generate request body $requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?> <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom"> @@ -317,9 +317,9 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ </m:properties> </content> </entry>'; - + $requestBody = $this->_fillTemplate($requestBody, array( - 'Updated' => $this->isoDate(), + 'Updated' => $this->isoDate(), 'Properties' => $this->_generateAzureRepresentation($entity) )); @@ -338,13 +338,13 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ if ($response->isSuccessful()) { // Parse result $result = $this->_parseResponse($response); - + $timestamp = $result->xpath('//m:properties/d:Timestamp'); $timestamp = (string)$timestamp[0]; $etag = $result->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata'); $etag = (string)$etag['etag']; - + // Update properties $entity->setTimestamp($timestamp); $entity->setEtag($etag); @@ -357,7 +357,7 @@ public function insertEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ /** * Delete entity from table - * + * * @param string $tableName Table name * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity Entity to delete * @param boolean $verifyEtag Verify etag of the entity (used for concurrency) @@ -371,11 +371,11 @@ public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ if ($entity === null) { throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.'); } - + // Add header information $headers = array(); if (!$this->isInBatch()) { - // http://social.msdn.microsoft.com/Forums/en-US/windowsazure/thread/9e255447-4dc7-458a-99d3-bdc04bdc5474/ + // http://social.msdn.microsoft.com/Forums/en-US/windowsazure/thread/9e255447-4dc7-458a-99d3-bdc04bdc5474/ $headers['Content-Type'] = 'application/atom+xml'; } $headers['Content-Length'] = 0; @@ -400,11 +400,11 @@ public function deleteEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ /** * Retrieve entity from table, by id - * + * * @param string $tableName Table name * @param string $partitionKey Partition key * @param string $rowKey Row key - * @param string $entityClass Entity class name* + * @param string $entityClass Entity class name* * @return Zend_Service_WindowsAzure_Storage_TableEntity * @throws Zend_Service_WindowsAzure_Exception */ @@ -431,7 +431,7 @@ public function retrieveEntityById($tableName = '', $partitionKey = '', $rowKey if ($this->isInBatch()) { throw new Zend_Service_WindowsAzure_Exception('Entity cannot be retrieved. A transaction is required to retrieve the entity, but another transaction is already active.'); } - + $this->startBatch(); } @@ -444,18 +444,18 @@ public function retrieveEntityById($tableName = '', $partitionKey = '', $rowKey '', $entityClass ); - + // Return if (count($result) == 1) { return $result[0]; } - + return null; } /** * Create a new Zend_Service_WindowsAzure_Storage_TableEntityQuery - * + * * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ public function select() @@ -465,7 +465,7 @@ public function select() /** * Retrieve entities from table - * + * * @param string $tableName|Zend_Service_WindowsAzure_Storage_TableEntityQuery Table name -or- Zend_Service_WindowsAzure_Storage_TableEntityQuery instance * @param string $filter Filter condition (not applied when $tableName is a Zend_Service_WindowsAzure_Storage_TableEntityQuery instance) * @param string $entityClass Entity class name @@ -495,18 +495,18 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' // Determine query if (is_string($tableName)) { // Option 1: $tableName is a string - + // Append parentheses $tableName .= '()'; - + // Build query $query = array(); - + // Filter? if ($filter !== '') { $query[] = '$filter=' . Zend_Service_WindowsAzure_Storage_TableEntityQuery::encodeQuery($filter); } - + // Build queryString if (count($query) > 0) { $queryString = '?' . implode('&', $query); @@ -528,7 +528,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' if ($queryString !== '') { $queryString .= '&'; } - + $queryString .= '&NextPartitionKey=' . rawurlencode($nextPartitionKey) . '&NextRowKey=' . rawurlencode($nextRowKey); } @@ -537,7 +537,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' if ($this->isInBatch() && $this->getCurrentBatch()->getOperationCount() == 0) { $this->getCurrentBatch()->enlistOperation($tableName, $queryString, Zend_Http_Client::GET, array(), true, null); $response = $this->getCurrentBatch()->commit(); - + // Get inner response (multipart) $innerResponse = $response->getBody(); $innerResponse = substr($innerResponse, strpos($innerResponse, 'HTTP/1.1 200 OK')); @@ -572,19 +572,19 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' } // Create return value - $returnValue = array(); + $returnValue = array(); foreach ($entries as $entry) { // Parse properties $properties = $entry->xpath('.//m:properties'); $properties = $properties[0]->children('http://schemas.microsoft.com/ado/2007/08/dataservices'); - + // Create entity $entity = new $entityClass('', ''); $entity->setAzureValues((array)$properties, true); - + // If we have a Zend_Service_WindowsAzure_Storage_DynamicTableEntity, make sure all property types are OK if ($entity instanceof Zend_Service_WindowsAzure_Storage_DynamicTableEntity) { - foreach ($properties as $key => $value) { + foreach ($properties as $key => $value) { $attributes = $value->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata'); $type = (string)$attributes['type']; if ($type !== '') { @@ -592,12 +592,12 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' } } } - + // Update etag $etag = $entry->attributes('http://schemas.microsoft.com/ado/2007/08/dataservices/metadata'); $etag = (string)$etag['etag']; $entity->setEtag($etag); - + // Add to result $returnValue[] = $entity; } @@ -608,7 +608,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' $returnValue = array_merge($returnValue, $this->retrieveEntities($tableName, $filter, $entityClass, $response->getHeader('x-ms-continuation-NextPartitionKey'), $response->getHeader('x-ms-continuation-NextRowKey'))); } } - + // Return return $returnValue; } else { @@ -618,7 +618,7 @@ public function retrieveEntities($tableName = '', $filter = '', $entityClass = ' /** * Update entity by replacing it - * + * * @param string $tableName Table name * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity Entity to update * @param boolean $verifyEtag Verify etag of the entity (used for concurrency) @@ -631,7 +631,7 @@ public function updateEntity($tableName = '', Zend_Service_WindowsAzure_Storage_ /** * Update entity by adding or updating properties - * + * * @param string $tableName Table name * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity Entity to update * @param boolean $verifyEtag Verify etag of the entity (used for concurrency) @@ -656,7 +656,7 @@ public function mergeEntity($tableName = '', Zend_Service_WindowsAzure_Storage_T $mergeEntity = $entity; } - // Ensure entity timestamp matches updated timestamp + // Ensure entity timestamp matches updated timestamp $entity->setTimestamp($this->isoDate()); return $this->_changeEntity(Zend_Http_Client::MERGE, $tableName, $mergeEntity, $verifyEtag); @@ -664,7 +664,7 @@ public function mergeEntity($tableName = '', Zend_Service_WindowsAzure_Storage_T /** * Get error message from Zend_Http_Response - * + * * @param Zend_Http_Response $response Repsonse * @param string $alternativeError Alternative error message * @return string @@ -681,7 +681,7 @@ protected function _getErrorMessage(Zend_Http_Response $response, $alternativeEr /** * Update entity / merge entity - * + * * @param string $httpVerb HTTP verb to use (PUT = update, MERGE = merge) * @param string $tableName Table name * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity Entity to update @@ -696,7 +696,7 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = if ($entity === null) { throw new Zend_Service_WindowsAzure_Exception('Entity is not specified.'); } - + // Add header information $headers = array(); $headers['Content-Type'] = 'application/atom+xml'; @@ -707,8 +707,8 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = $headers['If-Match'] = $entity->getEtag(); } - // Generate request body - $requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?> + // Generate request body + $requestBody = '<?xml version="1.0" encoding="utf-8" standalone="yes"?> <entry xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://www.w3.org/2005/Atom"> <title /> <updated>{tpl:Updated}</updated> @@ -722,7 +722,7 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = </m:properties> </content> </entry>'; - + // Attempt to get timestamp from entity $timestamp = $entity->getTimestamp(); if ($timestamp == Zend_Service_WindowsAzure_Storage_TableEntity::DEFAULT_TIMESTAMP) { @@ -730,19 +730,19 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = } $requestBody = $this->_fillTemplate($requestBody, array( - 'Updated' => $timestamp, + 'Updated' => $timestamp, 'Properties' => $this->_generateAzureRepresentation($entity) )); // Add header information $headers = array(); $headers['Content-Type'] = 'application/atom+xml'; - if (!$verifyEtag) { + if (!$verifyEtag) { $headers['If-Match'] = '*'; } else { $headers['If-Match'] = $entity->getEtag(); } - + // Perform request $response = null; if ($this->isInBatch()) { @@ -764,7 +764,7 @@ protected function _changeEntity($httpVerb = Zend_Http_Client::PUT, $tableName = /** * Generate RFC 1123 compliant date string - * + * * @return string */ protected function _rfcDate() @@ -774,7 +774,7 @@ protected function _rfcDate() /** * Fill text template with variables from key/value array - * + * * @param string $templateText Template text * @param array $variables Array containing key/value pairs * @return string @@ -789,7 +789,7 @@ protected function _fillTemplate($templateText, $variables = array()) /** * Generate Azure representation from entity (creates atompub markup from properties) - * + * * @param Zend_Service_WindowsAzure_Storage_TableEntity $entity * @return string */ @@ -805,10 +805,10 @@ protected function _generateAzureRepresentation(Zend_Service_WindowsAzure_Storag $value[] = ' m:type="' . $azureValue->Type . '"'; } if ($azureValue->Value === null) { - $value[] = ' m:null="true"'; + $value[] = ' m:null="true"'; } $value[] = '>'; - + if ($azureValue->Value !== null) { if (strtolower($azureValue->Type) == 'edm.boolean') { $value[] = ($azureValue->Value == true ? '1' : '0'); @@ -816,7 +816,7 @@ protected function _generateAzureRepresentation(Zend_Service_WindowsAzure_Storag $value[] = htmlspecialchars($azureValue->Value); } } - + $value[] = '</d:' . $azureValue->Name . '>'; $azureRepresentation[] = implode('', $value); } diff --git a/library/Zend/Service/WindowsAzure/Storage/TableEntity.php b/library/Zend/Service/WindowsAzure/Storage/TableEntity.php index 9ff13db4c..a3df75d05 100644 --- a/library/Zend/Service/WindowsAzure/Storage/TableEntity.php +++ b/library/Zend/Service/WindowsAzure/Storage/TableEntity.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableEntity.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: TableEntity.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_TableEntity @@ -39,47 +39,47 @@ class Zend_Service_WindowsAzure_Storage_TableEntity /** * Partition key - * + * * @var string */ protected $_partitionKey; - + /** * Row key - * + * * @var string */ protected $_rowKey; - + /** * Timestamp - * + * * @var string */ protected $_timestamp; - + /** * Etag - * + * * @var string */ protected $_etag = ''; - + /** * Constructor - * + * * @param string $partitionKey Partition key * @param string $rowKey Row key */ - public function __construct($partitionKey = '', $rowKey = '') - { + public function __construct($partitionKey = '', $rowKey = '') + { $this->_partitionKey = $partitionKey; $this->_rowKey = $rowKey; } - + /** * Get partition key - * + * * @azure PartitionKey * @return string */ @@ -87,10 +87,10 @@ public function getPartitionKey() { return $this->_partitionKey; } - + /** * Set partition key - * + * * @azure PartitionKey * @param string $value */ @@ -98,10 +98,10 @@ public function setPartitionKey($value) { $this->_partitionKey = $value; } - + /** * Get row key - * + * * @azure RowKey * @return string */ @@ -109,10 +109,10 @@ public function getRowKey() { return $this->_rowKey; } - + /** * Set row key - * + * * @azure RowKey * @param string $value */ @@ -120,10 +120,10 @@ public function setRowKey($value) { $this->_rowKey = $value; } - + /** * Get timestamp - * + * * @azure Timestamp Edm.DateTime * @return string */ @@ -134,10 +134,10 @@ public function getTimestamp() } return $this->_timestamp; } - + /** * Set timestamp - * + * * @azure Timestamp Edm.DateTime * @param string $value */ @@ -145,37 +145,37 @@ public function setTimestamp($value = '1900-01-01T00:00:00') { $this->_timestamp = $value; } - + /** * Get etag - * + * * @return string */ public function getEtag() { return $this->_etag; } - + /** * Set etag - * + * * @param string $value */ public function setEtag($value = '') { $this->_etag = $value; } - + /** * Get Azure values - * + * * @return array */ public function getAzureValues() { // Get accessors $accessors = self::getAzureAccessors(get_class($this)); - + // Loop accessors and retrieve values $returnValue = array(); foreach ($accessors as $accessor) { @@ -183,26 +183,26 @@ public function getAzureValues() $property = $accessor->EntityAccessor; $returnValue[] = (object)array( 'Name' => $accessor->AzurePropertyName, - 'Type' => $accessor->AzurePropertyType, - 'Value' => $this->$property, + 'Type' => $accessor->AzurePropertyType, + 'Value' => $this->$property, ); } else if ($accessor->EntityType == 'ReflectionMethod' && substr(strtolower($accessor->EntityAccessor), 0, 3) == 'get') { $method = $accessor->EntityAccessor; $returnValue[] = (object)array( 'Name' => $accessor->AzurePropertyName, - 'Type' => $accessor->AzurePropertyType, - 'Value' => $this->$method(), + 'Type' => $accessor->AzurePropertyType, + 'Value' => $this->$method(), ); } } - + // Return return $returnValue; } - + /** * Set Azure values - * + * * @param array $values * @param boolean $throwOnError Throw Zend_Service_WindowsAzure_Exception when a property is not specified in $values? * @throws Zend_Service_WindowsAzure_Exception @@ -211,7 +211,7 @@ public function setAzureValues($values = array(), $throwOnError = false) { // Get accessors $accessors = self::getAzureAccessors(get_class($this)); - + // Loop accessors and set values $returnValue = array(); foreach ($accessors as $accessor) { @@ -219,20 +219,20 @@ public function setAzureValues($values = array(), $throwOnError = false) // Cast to correct type if ($accessor->AzurePropertyType != '') { switch (strtolower($accessor->AzurePropertyType)) { - case 'edm.int32': - case 'edm.int64': - $values[$accessor->AzurePropertyName] = intval($values[$accessor->AzurePropertyName]); break; - case 'edm.boolean': - if ($values[$accessor->AzurePropertyName] == 'true' || $values[$accessor->AzurePropertyName] == '1') - $values[$accessor->AzurePropertyName] = true; - else - $values[$accessor->AzurePropertyName] = false; - break; - case 'edm.double': - $values[$accessor->AzurePropertyName] = floatval($values[$accessor->AzurePropertyName]); break; - } + case 'edm.int32': + case 'edm.int64': + $values[$accessor->AzurePropertyName] = intval($values[$accessor->AzurePropertyName]); break; + case 'edm.boolean': + if ($values[$accessor->AzurePropertyName] == 'true' || $values[$accessor->AzurePropertyName] == '1') + $values[$accessor->AzurePropertyName] = true; + else + $values[$accessor->AzurePropertyName] = false; + break; + case 'edm.double': + $values[$accessor->AzurePropertyName] = floatval($values[$accessor->AzurePropertyName]); break; + } } - + // Assign value if ($accessor->EntityType == 'ReflectionProperty') { $property = $accessor->EntityAccessor; @@ -242,17 +242,17 @@ public function setAzureValues($values = array(), $throwOnError = false) $this->$method($values[$accessor->AzurePropertyName]); } } else if ($throwOnError) { - throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array"); + throw new Zend_Service_WindowsAzure_Exception("Property '" . $accessor->AzurePropertyName . "' was not found in \$values array"); } } - + // Return return $returnValue; } - + /** * Get Azure accessors from class - * + * * @param string $className Class to get accessors for * @return array */ @@ -260,10 +260,10 @@ public static function getAzureAccessors($className = '') { // List of accessors $azureAccessors = array(); - + // Get all types $type = new ReflectionClass($className); - + // Loop all properties $properties = $type->getProperties(); foreach ($properties as $property) { @@ -272,7 +272,7 @@ public static function getAzureAccessors($className = '') $azureAccessors[] = $accessor; } } - + // Loop all methods $methods = $type->getMethods(); foreach ($methods as $method) { @@ -281,14 +281,14 @@ public static function getAzureAccessors($className = '') $azureAccessors[] = $accessor; } } - + // Return return $azureAccessors; } - + /** * Get Azure accessor from reflection member - * + * * @param ReflectionProperty|ReflectionMethod $member * @return object */ @@ -296,13 +296,13 @@ public static function getAzureAccessor($member) { // Get comment $docComment = $member->getDocComment(); - + // Check for Azure comment if (strpos($docComment, '@azure') === false) { return null; } - + // Search for @azure contents $azureComment = ''; $commentLines = explode("\n", $docComment); @@ -315,14 +315,14 @@ public static function getAzureAccessor($member) break; } } - + // Fetch @azure properties $azureProperties = explode(' ', $azureComment); return (object)array( 'EntityAccessor' => $member->getName(), 'EntityType' => get_class($member), 'AzurePropertyName' => $azureProperties[0], - 'AzurePropertyType' => isset($azureProperties[1]) ? $azureProperties[1] : '' + 'AzurePropertyType' => isset($azureProperties[1]) ? $azureProperties[1] : '' ); } } diff --git a/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php b/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php index 5830bdb17..96cf005d3 100644 --- a/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php +++ b/library/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php @@ -15,65 +15,65 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableEntityQuery.php 23167 2010-10-19 17:53:31Z mabe $ + * @version $Id: TableEntityQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_WindowsAzure_Storage_TableEntityQuery { /** * From - * + * * @var string */ protected $_from = ''; /** * Where - * + * * @var array */ protected $_where = array(); /** * Order by - * + * * @var array */ protected $_orderBy = array(); /** * Top - * + * * @var int */ protected $_top = null; /** * Partition key - * + * * @var string */ protected $_partitionKey = null; /** * Row key - * + * * @var string */ protected $_rowKey = null; /** * Select clause - * + * * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ public function select() @@ -83,7 +83,7 @@ public function select() /** * From clause - * + * * @param string $name Table name to select entities from * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ @@ -95,7 +95,7 @@ public function from($name) /** * Specify partition key - * + * * @param string $value Partition key to query for * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ @@ -107,7 +107,7 @@ public function wherePartitionKey($value = null) /** * Specify row key - * + * * @param string $value Row key to query for * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ @@ -119,7 +119,7 @@ public function whereRowKey($value = null) /** * Add where clause - * + * * @param string $condition Condition, can contain question mark(s) (?) for parameter insertion. * @param string|array $value Value(s) to insert in question mark (?) parameters. * @param string $cond Condition for the clause (and/or/not) @@ -128,11 +128,11 @@ public function whereRowKey($value = null) public function where($condition, $value = null, $cond = '') { $condition = $this->_replaceOperators($condition); - + if ($value !== null) { $condition = $this->_quoteInto($condition, $value); } - + if (count($this->_where) == 0) { $cond = ''; } else if ($cond !== '') { @@ -145,7 +145,7 @@ public function where($condition, $value = null, $cond = '') /** * Add where clause with AND condition - * + * * @param string $condition Condition, can contain question mark(s) (?) for parameter insertion. * @param string|array $value Value(s) to insert in question mark (?) parameters. * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery @@ -157,7 +157,7 @@ public function andWhere($condition, $value = null) /** * Add where clause with OR condition - * + * * @param string $condition Condition, can contain question mark(s) (?) for parameter insertion. * @param string|array $value Value(s) to insert in question mark (?) parameters. * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery @@ -169,7 +169,7 @@ public function orWhere($condition, $value = null) /** * OrderBy clause - * + * * @param string $column Column to sort by * @param string $direction Direction to sort (asc/desc) * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery @@ -179,10 +179,10 @@ public function orderBy($column, $direction = 'asc') $this->_orderBy[] = $column . ' ' . $direction; return $this; } - + /** * Top clause - * + * * @param int $top Top to fetch * @return Zend_Service_WindowsAzure_Storage_TableEntityQuery */ @@ -191,10 +191,10 @@ public function top($top = null) $this->_top = (int)$top; return $this; } - + /** * Assembles the query string - * + * * @param boolean $urlEncode Apply URL encoding to the query string * @return string */ @@ -224,7 +224,7 @@ public function assembleQueryString($urlEncode = false) /** * Assemble from - * + * * @param boolean $includeParentheses Include parentheses? () * @return string */ @@ -233,19 +233,19 @@ public function assembleFrom($includeParentheses = true) $identifier = ''; if ($includeParentheses) { $identifier .= '('; - + if ($this->_partitionKey !== null) { $identifier .= 'PartitionKey=\'' . $this->_partitionKey . '\''; } - + if ($this->_partitionKey !== null && $this->_rowKey !== null) { $identifier .= ', '; } - + if ($this->_rowKey !== null) { $identifier .= 'RowKey=\'' . $this->_rowKey . '\''; } - + $identifier .= ')'; } return $this->_from . $identifier; @@ -253,7 +253,7 @@ public function assembleFrom($includeParentheses = true) /** * Assemble full query - * + * * @return string */ public function assembleQuery() @@ -270,7 +270,7 @@ public function assembleQuery() /** * Quotes a variable into a condition - * + * * @param string $text Condition, can contain question mark(s) (?) for parameter insertion. * @param string|array $value Value(s) to insert in question mark (?) parameters. * @return string @@ -294,7 +294,7 @@ protected function _quoteInto($text, $value = null) /** * Replace operators - * + * * @param string $text * @return string */ @@ -306,17 +306,17 @@ protected function _replaceOperators($text) $text = str_replace('>=', 'ge', $text); $text = str_replace('<=', 'le', $text); $text = str_replace('!=', 'ne', $text); - + $text = str_replace('&&', 'and', $text); $text = str_replace('||', 'or', $text); $text = str_replace('!', 'not', $text); - + return $text; } /** * urlencode a query - * + * * @param string $query Query to encode * @return string Encoded query */ @@ -340,11 +340,11 @@ public static function encodeQuery($query) /** * __toString overload - * + * * @return string */ public function __toString() { return $this->assembleQuery(); } -} \ No newline at end of file +} diff --git a/library/Zend/Service/WindowsAzure/Storage/TableInstance.php b/library/Zend/Service/WindowsAzure/Storage/TableInstance.php index cc2ae90c6..2fc936cf5 100644 --- a/library/Zend/Service/WindowsAzure/Storage/TableInstance.php +++ b/library/Zend/Service/WindowsAzure/Storage/TableInstance.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableInstance.php 22773 2010-08-03 07:18:27Z maartenba $ + * @version $Id: TableInstance.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,27 +34,27 @@ * @category Zend * @package Zend_Service_WindowsAzure * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * + * * @property string $Id Id * @property string $Name Name * @property string $Href Href * @property string $Updated Updated */ class Zend_Service_WindowsAzure_Storage_TableInstance - extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract + extends Zend_Service_WindowsAzure_Storage_StorageEntityAbstract { /** * Constructor - * + * * @param string $id Id * @param string $name Name * @param string $href Href * @param string $updated Updated */ - public function __construct($id, $name, $href, $updated) - { + public function __construct($id, $name, $href, $updated) + { $this->_data = array( 'id' => $id, 'name' => $name, diff --git a/library/Zend/Service/Yahoo.php b/library/Zend/Service/Yahoo.php index 56c4f357b..29768630b 100644 --- a/library/Zend/Service/Yahoo.php +++ b/library/Zend/Service/Yahoo.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yahoo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Yahoo.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo diff --git a/library/Zend/Service/Yahoo/Image.php b/library/Zend/Service/Yahoo/Image.php index cf24123fd..cb14c731d 100644 --- a/library/Zend/Service/Yahoo/Image.php +++ b/library/Zend/Service/Yahoo/Image.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Image.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_Image diff --git a/library/Zend/Service/Yahoo/ImageResult.php b/library/Zend/Service/Yahoo/ImageResult.php index 017a63ede..40344485d 100644 --- a/library/Zend/Service/Yahoo/ImageResult.php +++ b/library/Zend/Service/Yahoo/ImageResult.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ImageResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/ImageResultSet.php b/library/Zend/Service/Yahoo/ImageResultSet.php index c79609a1d..3f6aa128c 100644 --- a/library/Zend/Service/Yahoo/ImageResultSet.php +++ b/library/Zend/Service/Yahoo/ImageResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ImageResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ImageResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Service/Yahoo/InlinkDataResult.php b/library/Zend/Service/Yahoo/InlinkDataResult.php index 0c49b9d26..97468c50d 100644 --- a/library/Zend/Service/Yahoo/InlinkDataResult.php +++ b/library/Zend/Service/Yahoo/InlinkDataResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InlinkDataResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InlinkDataResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_InlinkDataResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/InlinkDataResultSet.php b/library/Zend/Service/Yahoo/InlinkDataResultSet.php index d3fe538c5..dcb25842f 100644 --- a/library/Zend/Service/Yahoo/InlinkDataResultSet.php +++ b/library/Zend/Service/Yahoo/InlinkDataResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InlinkDataResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InlinkDataResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_InlinkDataResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Service/Yahoo/LocalResult.php b/library/Zend/Service/Yahoo/LocalResult.php index 6f47bea7e..2162fd8ac 100644 --- a/library/Zend/Service/Yahoo/LocalResult.php +++ b/library/Zend/Service/Yahoo/LocalResult.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_LocalResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/LocalResultSet.php b/library/Zend/Service/Yahoo/LocalResultSet.php index 7d71b569b..950b44d7e 100644 --- a/library/Zend/Service/Yahoo/LocalResultSet.php +++ b/library/Zend/Service/Yahoo/LocalResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_LocalResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Service/Yahoo/NewsResult.php b/library/Zend/Service/Yahoo/NewsResult.php index d6381a862..bf0632575 100644 --- a/library/Zend/Service/Yahoo/NewsResult.php +++ b/library/Zend/Service/Yahoo/NewsResult.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewsResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NewsResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_NewsResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/NewsResultSet.php b/library/Zend/Service/Yahoo/NewsResultSet.php index c0b6d22c0..3a57dbcdf 100644 --- a/library/Zend/Service/Yahoo/NewsResultSet.php +++ b/library/Zend/Service/Yahoo/NewsResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NewsResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NewsResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_NewsResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Service/Yahoo/PageDataResult.php b/library/Zend/Service/Yahoo/PageDataResult.php index 318d6d81a..1eca64ad9 100644 --- a/library/Zend/Service/Yahoo/PageDataResult.php +++ b/library/Zend/Service/Yahoo/PageDataResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PageDataResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PageDataResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_PageDataResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/PageDataResultSet.php b/library/Zend/Service/Yahoo/PageDataResultSet.php index 040359868..a9b6f8dff 100644 --- a/library/Zend/Service/Yahoo/PageDataResultSet.php +++ b/library/Zend/Service/Yahoo/PageDataResultSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PageDataResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PageDataResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_PageDataResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Service/Yahoo/Result.php b/library/Zend/Service/Yahoo/Result.php index 540994320..fb89e3163 100644 --- a/library/Zend/Service/Yahoo/Result.php +++ b/library/Zend/Service/Yahoo/Result.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Result.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/ResultSet.php b/library/Zend/Service/Yahoo/ResultSet.php index 57339ba19..a668b6159 100644 --- a/library/Zend/Service/Yahoo/ResultSet.php +++ b/library/Zend/Service/Yahoo/ResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ResultSet implements SeekableIterator diff --git a/library/Zend/Service/Yahoo/VideoResult.php b/library/Zend/Service/Yahoo/VideoResult.php index 10acb874a..26e739583 100644 --- a/library/Zend/Service/Yahoo/VideoResult.php +++ b/library/Zend/Service/Yahoo/VideoResult.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_VideoResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/VideoResultSet.php b/library/Zend/Service/Yahoo/VideoResultSet.php index 4092f63ad..8351f4407 100644 --- a/library/Zend/Service/Yahoo/VideoResultSet.php +++ b/library/Zend/Service/Yahoo/VideoResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VideoResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: VideoResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_VideoResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Service/Yahoo/WebResult.php b/library/Zend/Service/Yahoo/WebResult.php index 1af1ccada..3be41c19b 100644 --- a/library/Zend/Service/Yahoo/WebResult.php +++ b/library/Zend/Service/Yahoo/WebResult.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WebResult.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WebResult.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_WebResult extends Zend_Service_Yahoo_Result diff --git a/library/Zend/Service/Yahoo/WebResultSet.php b/library/Zend/Service/Yahoo/WebResultSet.php index 0887276cc..eeca5e4ac 100644 --- a/library/Zend/Service/Yahoo/WebResultSet.php +++ b/library/Zend/Service/Yahoo/WebResultSet.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WebResultSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WebResultSet.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_WebResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/library/Zend/Session.php b/library/Zend/Session.php index c56b4f259..f6e5670b1 100644 --- a/library/Zend/Session.php +++ b/library/Zend/Session.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 22587 2010-07-16 20:14:18Z ralph $ + * @version $Id: Session.php 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -43,7 +43,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session extends Zend_Session_Abstract @@ -308,24 +308,13 @@ public static function regenerateId() "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } - if (self::$_sessionStarted && self::$_regenerateIdState <= 0) { + if ( !self::$_sessionStarted ) { + self::$_regenerateIdState = -1; + } else { if (!self::$_unitTestEnabled) { session_regenerate_id(true); } self::$_regenerateIdState = 1; - } else { - /** - * @todo If we can detect that this requester had no session previously, - * then why regenerate the id before the session has started? - * Feedback wanted for: - // - if (isset($_COOKIE[session_name()]) || (!use only cookies && isset($_REQUEST[session_name()]))) { - self::$_regenerateIdState = 1; - } else { - self::$_regenerateIdState = -1; - } - //*/ - self::$_regenerateIdState = -1; } } @@ -335,7 +324,7 @@ public static function regenerateId() * seconds is specified, then this defaults to self::$_rememberMeSeconds. Due to clock errors on end users' systems, * large values are recommended to avoid undesirable expiration of session cookies. * - * @param $seconds integer - OPTIONAL specifies TTL for cookie in seconds from present time + * @param int $seconds OPTIONAL specifies TTL for cookie in seconds from present time * @return void */ public static function rememberMe($seconds = null) @@ -374,6 +363,7 @@ public static function rememberUntil($seconds = 0) } $cookieParams = session_get_cookie_params(); + session_set_cookie_params( $seconds, $cookieParams['path'], @@ -571,13 +561,13 @@ private static function _processStartupMetadataGlobal() } } if (empty($_SESSION['__ZF'][$namespace]['ENVGH'])) { - unset($_SESSION['__ZF'][$namespace]['ENVGH']); + unset($_SESSION['__ZF'][$namespace]['ENVGH']); } } - } - if (isset($namespace) && empty($_SESSION['__ZF'][$namespace])) { - unset($_SESSION['__ZF'][$namespace]); + if (isset($namespace) && empty($_SESSION['__ZF'][$namespace])) { + unset($_SESSION['__ZF'][$namespace]); + } } } diff --git a/library/Zend/Session/Abstract.php b/library/Zend/Session/Abstract.php index 2c5b613e9..ed4d5cf5a 100644 --- a/library/Zend/Session/Abstract.php +++ b/library/Zend/Session/Abstract.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Session_Abstract diff --git a/library/Zend/Session/Exception.php b/library/Zend/Session/Exception.php index dc8aa638f..03e9906dc 100644 --- a/library/Zend/Session/Exception.php +++ b/library/Zend/Session/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -32,7 +32,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_Exception extends Zend_Exception diff --git a/library/Zend/Session/Namespace.php b/library/Zend/Session/Namespace.php index ef811a066..418a0503f 100644 --- a/library/Zend/Session/Namespace.php +++ b/library/Zend/Session/Namespace.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Namespace.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Namespace.php 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAggregate diff --git a/library/Zend/Session/SaveHandler/DbTable.php b/library/Zend/Session/SaveHandler/DbTable.php index b59526d3a..0bcb4c26e 100644 --- a/library/Zend/Session/SaveHandler/DbTable.php +++ b/library/Zend/Session/SaveHandler/DbTable.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -46,7 +46,7 @@ * @category Zend * @package Zend_Session * @subpackage SaveHandler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_SaveHandler_DbTable @@ -386,8 +386,8 @@ public function destroy($id) */ public function gc($maxlifetime) { - $this->delete($this->getAdapter()->quoteIdentifier($this->_modifiedColumn) . ' + ' - . $this->getAdapter()->quoteIdentifier($this->_lifetimeColumn) . ' < ' + $this->delete($this->getAdapter()->quoteIdentifier($this->_modifiedColumn, true) . ' + ' + . $this->getAdapter()->quoteIdentifier($this->_lifetimeColumn, true) . ' < ' . $this->getAdapter()->quote(time())); return true; @@ -548,7 +548,7 @@ protected function _getPrimary($id, $type = null) $primaryArray[$primary] = $value; break; case self::PRIMARY_TYPE_WHERECLAUSE: - $primaryArray[] = $this->getAdapter()->quoteIdentifier($primary) . ' = ' + $primaryArray[] = $this->getAdapter()->quoteIdentifier($primary, true) . ' = ' . $this->getAdapter()->quote($value); break; case self::PRIMARY_TYPE_NUM: diff --git a/library/Zend/Session/SaveHandler/Exception.php b/library/Zend/Session/SaveHandler/Exception.php index 249dcfa93..189495d33 100644 --- a/library/Zend/Session/SaveHandler/Exception.php +++ b/library/Zend/Session/SaveHandler/Exception.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_SaveHandler_Exception extends Zend_Session_Exception diff --git a/library/Zend/Session/SaveHandler/Interface.php b/library/Zend/Session/SaveHandler/Interface.php index 6e426974a..194992e4f 100644 --- a/library/Zend/Session/SaveHandler/Interface.php +++ b/library/Zend/Session/SaveHandler/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Session * @subpackage SaveHandler - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://php.net/session_set_save_handler */ diff --git a/library/Zend/Session/Validator/Abstract.php b/library/Zend/Session/Validator/Abstract.php index 6c4caaeb9..ad35bfe56 100644 --- a/library/Zend/Session/Validator/Abstract.php +++ b/library/Zend/Session/Validator/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Session * @subpackage Validator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Session_Validator_Abstract implements Zend_Session_Validator_Interface diff --git a/library/Zend/Session/Validator/HttpUserAgent.php b/library/Zend/Session/Validator/HttpUserAgent.php index fef7d3332..12970da5d 100644 --- a/library/Zend/Session/Validator/HttpUserAgent.php +++ b/library/Zend/Session/Validator/HttpUserAgent.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpUserAgent.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpUserAgent.php 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Session * @subpackage Validator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Session_Validator_HttpUserAgent extends Zend_Session_Validator_Abstract diff --git a/library/Zend/Session/Validator/Interface.php b/library/Zend/Session/Validator/Interface.php index eab9d186c..e22898764 100644 --- a/library/Zend/Session/Validator/Interface.php +++ b/library/Zend/Session/Validator/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Session - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ * @since Preview Release 0.2 */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Session * @subpackage Validator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Session_Validator_Interface diff --git a/library/Zend/Soap/AutoDiscover.php b/library/Zend/Soap/AutoDiscover.php index f534fe368..ed21aa389 100644 --- a/library/Zend/Soap/AutoDiscover.php +++ b/library/Zend/Soap/AutoDiscover.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage AutoDiscover - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoDiscover.php 23338 2010-11-15 14:59:33Z alexander $ + * @version $Id: AutoDiscover.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -378,10 +378,10 @@ public function addFunction($function, $namespace = '') /** * Add a function to the WSDL document. * - * @param $function Zend_Server_Reflection_Function_Abstract function to add - * @param $wsdl Zend_Soap_Wsdl WSDL document - * @param $port object wsdl:portType - * @param $binding object wsdl:binding + * @param Zend_Server_Reflection_Function_Abstract $function function to add + * @param Zend_Soap_Wsdl $wsdl WSDL document + * @param object $port wsdl:portType + * @param object $binding wsdl:binding * @return void */ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding) diff --git a/library/Zend/Soap/AutoDiscover/Exception.php b/library/Zend/Soap/AutoDiscover/Exception.php index 3045aea6c..975436f31 100644 --- a/library/Zend/Soap/AutoDiscover/Exception.php +++ b/library/Zend/Soap/AutoDiscover/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage AutoDiscover - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** diff --git a/library/Zend/Soap/Client.php b/library/Zend/Soap/Client.php index d521b29a8..89b3b1f07 100644 --- a/library/Zend/Soap/Client.php +++ b/library/Zend/Soap/Client.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 23453 2010-11-28 13:56:14Z ramon $ + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Client diff --git a/library/Zend/Soap/Client/Common.php b/library/Zend/Soap/Client/Common.php index 0319c08dd..c8f729ca1 100644 --- a/library/Zend/Soap/Client/Common.php +++ b/library/Zend/Soap/Client/Common.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Common.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Common.php 24594 2012-01-05 21:27:01Z matthew $ */ diff --git a/library/Zend/Soap/Client/DotNet.php b/library/Zend/Soap/Client/DotNet.php index 41ea9b5b4..e2dcd02dd 100644 --- a/library/Zend/Soap/Client/DotNet.php +++ b/library/Zend/Soap/Client/DotNet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DotNet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DotNet.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Soap_Client */ diff --git a/library/Zend/Soap/Client/Exception.php b/library/Zend/Soap/Client/Exception.php index b76910279..31df0f08d 100644 --- a/library/Zend/Soap/Client/Exception.php +++ b/library/Zend/Soap/Client/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,9 +26,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Soap_Client_Exception extends Zend_Exception {} diff --git a/library/Zend/Soap/Client/Local.php b/library/Zend/Soap/Client/Local.php index aaa38f808..b3616353c 100644 --- a/library/Zend/Soap/Client/Local.php +++ b/library/Zend/Soap/Client/Local.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Local.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Local.php 25032 2012-08-17 19:45:06Z matthew $ */ /** Zend_Soap_Server */ @@ -83,8 +83,14 @@ public function _doRequest(Zend_Soap_Client_Common $client, $request, $location, // Perform request as is ob_start(); $this->_server->handle($request); - $response = ob_get_contents(); - ob_end_clean(); + $response = ob_get_clean(); + + if ($response === null || $response === '') { + $serverResponse = $this->server->getResponse(); + if ($serverResponse !== null) { + $response = $serverResponse; + } + } return $response; } diff --git a/library/Zend/Soap/Server.php b/library/Zend/Soap/Server.php index ce6231943..51a66f6f0 100644 --- a/library/Zend/Soap/Server.php +++ b/library/Zend/Soap/Server.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,9 +31,9 @@ * @package Zend_Soap * @subpackage Server * @uses Zend_Server_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 22223 2010-05-21 08:06:47Z jan $ + * @version $Id: Server.php 25032 2012-08-17 19:45:06Z matthew $ */ class Zend_Soap_Server implements Zend_Server_Interface { @@ -690,11 +690,21 @@ protected function _setRequest($request) $xml = $request; } + libxml_disable_entity_loader(true); $dom = new DOMDocument(); if(strlen($xml) == 0 || !$dom->loadXML($xml)) { // require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid XML'); } + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + // require_once 'Zend/Soap/Server/Exception.php'; + throw new Zend_Soap_Server_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + libxml_disable_entity_loader(false); } $this->_request = $xml; return $this; @@ -823,16 +833,16 @@ public function handle($request = null) $soap = $this->_getSoap(); + $fault = false; ob_start(); - if($setRequestException instanceof Exception) { - // Send SOAP fault message if we've catched exception - $soap->fault("Sender", $setRequestException->getMessage()); + if ($setRequestException instanceof Exception) { + // Create SOAP fault message if we've caught a request exception + $fault = $this->fault($setRequestException->getMessage(), 'Sender'); } else { try { - $soap->handle($request); + $soap->handle($this->_request); } catch (Exception $e) { $fault = $this->fault($e); - $soap->fault($fault->faultcode, $fault->faultstring); } } $this->_response = ob_get_clean(); @@ -841,6 +851,11 @@ public function handle($request = null) restore_error_handler(); ini_set('display_errors', $displayErrorsOriginalState); + // Send a fault, if we have one + if ($fault) { + $this->_response = $fault; + } + if (!$this->_returnResponse) { echo $this->_response; return; diff --git a/library/Zend/Soap/Server/Exception.php b/library/Zend/Soap/Server/Exception.php index bdc9dca2d..14e539b8b 100644 --- a/library/Zend/Soap/Server/Exception.php +++ b/library/Zend/Soap/Server/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Soap_Server_Exception extends Zend_Exception {} diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php index 9c6c6b2f9..15713d725 100644 --- a/library/Zend/Soap/Wsdl.php +++ b/library/Zend/Soap/Wsdl.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Wsdl.php 23342 2010-11-15 15:29:20Z alexander $ + * @version $Id: Wsdl.php 25032 2012-08-17 19:45:06Z matthew $ */ /** @@ -96,13 +96,23 @@ public function __construct($name, $uri, $strategy = true) xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:soap-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'></definitions>"; + libxml_disable_entity_loader(true); $this->_dom = new DOMDocument(); if (!$this->_dom->loadXML($wsdl)) { // require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Unable to create DomDocument'); } else { + foreach ($this->_dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + // require_once 'Zend/Server/Exception.php'; + throw new Zend_Server_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } $this->_wsdl = $this->_dom->documentElement; } + libxml_disable_entity_loader(false); $this->setComplexTypeStrategy($strategy); } @@ -125,8 +135,10 @@ public function setUri($uri) // @todo: This is the worst hack ever, but its needed due to design and non BC issues of WSDL generation $xml = $this->_dom->saveXML(); $xml = str_replace($oldUri, $uri, $xml); + libxml_disable_entity_loader(true); $this->_dom = new DOMDocument(); $this->_dom->loadXML($xml); + libxml_disable_entity_loader(false); } return $this; @@ -543,28 +555,23 @@ public function getType($type) case 'string': case 'str': return 'xsd:string'; - break; + case 'long': + return 'xsd:long'; case 'int': case 'integer': return 'xsd:int'; - break; case 'float': case 'double': return 'xsd:float'; - break; case 'boolean': case 'bool': return 'xsd:boolean'; - break; case 'array': return 'soap-enc:Array'; - break; case 'object': return 'xsd:struct'; - break; case 'mixed': return 'xsd:anyType'; - break; case 'void': return ''; default: diff --git a/library/Zend/Soap/Wsdl/Exception.php b/library/Zend/Soap/Wsdl/Exception.php index 51fec3c05..5265b1395 100644 --- a/library/Zend/Soap/Wsdl/Exception.php +++ b/library/Zend/Soap/Wsdl/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Exception extends Zend_Exception { } \ No newline at end of file diff --git a/library/Zend/Soap/Wsdl/Strategy/Abstract.php b/library/Zend/Soap/Wsdl/Strategy/Abstract.php index 6d50175a7..6ba30eba1 100644 --- a/library/Zend/Soap/Wsdl/Strategy/Abstract.php +++ b/library/Zend/Soap/Wsdl/Strategy/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Soap_Wsdl_Strategy_Abstract implements Zend_Soap_Wsdl_Strategy_Interface diff --git a/library/Zend/Soap/Wsdl/Strategy/AnyType.php b/library/Zend/Soap/Wsdl/Strategy/AnyType.php index 8f6d4a4f6..ee07f0048 100644 --- a/library/Zend/Soap/Wsdl/Strategy/AnyType.php +++ b/library/Zend/Soap/Wsdl/Strategy/AnyType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AnyType.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AnyType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interface diff --git a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php index 992d737d4..060922606 100644 --- a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php +++ b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayOfTypeComplex.php 21858 2010-04-15 19:58:12Z beberlei $ + * @version $Id: ArrayOfTypeComplex.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy_DefaultComplexType diff --git a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php index e42f6e5ae..37933db5a 100644 --- a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php +++ b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayOfTypeSequence.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ArrayOfTypeSequence.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence extends Zend_Soap_Wsdl_Strategy_DefaultComplexType diff --git a/library/Zend/Soap/Wsdl/Strategy/Composite.php b/library/Zend/Soap/Wsdl/Strategy/Composite.php index c4aacafb3..aab46b4d2 100644 --- a/library/Zend/Soap/Wsdl/Strategy/Composite.php +++ b/library/Zend/Soap/Wsdl/Strategy/Composite.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Composite.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Composite.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_Composite implements Zend_Soap_Wsdl_Strategy_Interface diff --git a/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php b/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php index 48ae0261a..9896b7bd3 100644 --- a/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php +++ b/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultComplexType.php 22674 2010-07-25 19:35:20Z ramon $ + * @version $Id: DefaultComplexType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy_Abstract diff --git a/library/Zend/Soap/Wsdl/Strategy/Interface.php b/library/Zend/Soap/Wsdl/Strategy/Interface.php index d53d4f62e..8cf71dc9a 100644 --- a/library/Zend/Soap/Wsdl/Strategy/Interface.php +++ b/library/Zend/Soap/Wsdl/Strategy/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Soap_Wsdl_Strategy_Interface diff --git a/library/Zend/Tag/Cloud.php b/library/Zend/Tag/Cloud.php index 50f609f8e..30e5bb72f 100644 --- a/library/Zend/Tag/Cloud.php +++ b/library/Zend/Tag/Cloud.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cloud.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cloud.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud diff --git a/library/Zend/Tag/Cloud/Decorator/Cloud.php b/library/Zend/Tag/Cloud/Decorator/Cloud.php index 1ba44139a..f408614ca 100644 --- a/library/Zend/Tag/Cloud/Decorator/Cloud.php +++ b/library/Zend/Tag/Cloud/Decorator/Cloud.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cloud.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cloud.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tag_Cloud_Decorator_Cloud diff --git a/library/Zend/Tag/Cloud/Decorator/Exception.php b/library/Zend/Tag/Cloud/Decorator/Exception.php index 75e7a347d..8be603a9b 100644 --- a/library/Zend/Tag/Cloud/Decorator/Exception.php +++ b/library/Zend/Tag/Cloud/Decorator/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Cloud_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Decorator_Exception extends Zend_Tag_Cloud_Exception diff --git a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php index 7909eef43..20efddbcb 100644 --- a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php +++ b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlCloud.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: HtmlCloud.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Cloud_Decorator_Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Decorator_HtmlCloud extends Zend_Tag_Cloud_Decorator_Cloud diff --git a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php index 9da2db4dd..be77992d4 100644 --- a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php +++ b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlTag.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: HtmlTag.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Cloud_Decorator_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag diff --git a/library/Zend/Tag/Cloud/Decorator/Tag.php b/library/Zend/Tag/Cloud/Decorator/Tag.php index fa2b8e1b1..23fa3bdc5 100644 --- a/library/Zend/Tag/Cloud/Decorator/Tag.php +++ b/library/Zend/Tag/Cloud/Decorator/Tag.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Cloud - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tag.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tag_Cloud_Decorator_Tag diff --git a/library/Zend/Tag/Cloud/Exception.php b/library/Zend/Tag/Cloud/Exception.php index b156f128d..bf5591c0e 100644 --- a/library/Zend/Tag/Cloud/Exception.php +++ b/library/Zend/Tag/Cloud/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Cloud_Exception extends Zend_Tag_Exception diff --git a/library/Zend/Tag/Exception.php b/library/Zend/Tag/Exception.php index c23973d33..26c623f38 100644 --- a/library/Zend/Tag/Exception.php +++ b/library/Zend/Tag/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Exception extends Zend_Exception diff --git a/library/Zend/Tag/Item.php b/library/Zend/Tag/Item.php index 23b46196b..ee96c78d1 100644 --- a/library/Zend/Tag/Item.php +++ b/library/Zend/Tag/Item.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage Item - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Item.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Item.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Tag * @uses Zend_Tag_Taggable - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_Item implements Zend_Tag_Taggable diff --git a/library/Zend/Tag/ItemList.php b/library/Zend/Tag/ItemList.php index 965086b3c..0bc003dee 100644 --- a/library/Zend/Tag/ItemList.php +++ b/library/Zend/Tag/ItemList.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tag * @subpackage ItemList - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ItemList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ItemList.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tag_ItemList implements Countable, SeekableIterator, ArrayAccess diff --git a/library/Zend/Tag/Taggable.php b/library/Zend/Tag/Taggable.php index 1247f190e..2f723fa45 100644 --- a/library/Zend/Tag/Taggable.php +++ b/library/Zend/Tag/Taggable.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tag * @subpackage Item - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Taggable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Taggable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tag - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tag_Taggable diff --git a/library/Zend/Test/DbAdapter.php b/library/Zend/Test/DbAdapter.php index 1d647360e..f90bf8823 100644 --- a/library/Zend/Test/DbAdapter.php +++ b/library/Zend/Test/DbAdapter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbAdapter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbAdapter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_DbAdapter extends Zend_Db_Adapter_Abstract @@ -73,7 +73,7 @@ class Zend_Test_DbAdapter extends Zend_Db_Adapter_Abstract /** * @var string - */ + */ protected $_quoteIdentifierSymbol = ''; /** @@ -112,7 +112,7 @@ public function appendLastInsertIdToStack($id) /** * @var string - */ + */ public function setQuoteIdentifierSymbol($symbol) { $this->_quoteIdentifierSymbol = $symbol; diff --git a/library/Zend/Test/DbStatement.php b/library/Zend/Test/DbStatement.php index 8b6b5a51b..4f53417b6 100644 --- a/library/Zend/Test/DbStatement.php +++ b/library/Zend/Test/DbStatement.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbStatement.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbStatement.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_DbStatement implements Zend_Db_Statement_Interface diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery.php index dc663b11a..4dd269c8a 100644 --- a/library/Zend/Test/PHPUnit/Constraint/DomQuery.php +++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DomQuery.php 22561 2010-07-15 17:49:16Z dragonbe $ + * @version $Id: DomQuery.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see PHPUnit_Framework_Constraint */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint diff --git a/library/Zend/Test/PHPUnit/Constraint/Exception.php b/library/Zend/Test/PHPUnit/Constraint/Exception.php index 371a52656..0b9037af1 100644 --- a/library/Zend/Test/PHPUnit/Constraint/Exception.php +++ b/library/Zend/Test/PHPUnit/Constraint/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see PHPUnit_Framework_ExpectationFailedException */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_Exception extends PHPUnit_Framework_ExpectationFailedException diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect.php b/library/Zend/Test/PHPUnit/Constraint/Redirect.php index d4e18928c..72bb96f33 100644 --- a/library/Zend/Test/PHPUnit/Constraint/Redirect.php +++ b/library/Zend/Test/PHPUnit/Constraint/Redirect.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Redirect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Redirect.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see PHPUnit_Framework_Constraint */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php index 28934b264..5451b5ed8 100644 --- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php +++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResponseHeader.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ResponseHeader.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see PHPUnit_Framework_Constraint */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Constraint diff --git a/library/Zend/Test/PHPUnit/ControllerTestCase.php b/library/Zend/Test/PHPUnit/ControllerTestCase.php index 39ece68e6..69223e92e 100644 --- a/library/Zend/Test/PHPUnit/ControllerTestCase.php +++ b/library/Zend/Test/PHPUnit/ControllerTestCase.php @@ -14,17 +14,20 @@ * * @category Zend * @package Zend_Test - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ControllerTestCase.php 22291 2010-05-25 15:52:09Z bradley.holt $ + * @version $Id: ControllerTestCase.php 24594 2012-01-05 21:27:01Z matthew $ */ -/** @see PHPUnit_Framework_TestCase */ -// require_once 'PHPUnit/Framework/TestCase.php'; - /** @see PHPUnit_Runner_Version */ // require_once 'PHPUnit/Runner/Version.php'; +/** + * Depending on version, include the proper PHPUnit support + * @see PHPUnit_Autoload + */ +// require_once (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '>=')) ? 'PHPUnit/Autoload.php' : 'PHPUnit/Framework.php'; + /** @see Zend_Controller_Front */ // require_once 'Zend/Controller/Front.php'; @@ -47,7 +50,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_TestCase @@ -1117,7 +1120,7 @@ public function getFrontController() /** * Retrieve test case request object * - * @return Zend_Controller_Request_Abstract + * @return Zend_Controller_Request_HttpTestCase */ public function getRequest() { @@ -1131,7 +1134,7 @@ public function getRequest() /** * Retrieve test case response object * - * @return Zend_Controller_Response_Abstract + * @return Zend_Controller_Response_HttpTestCase */ public function getResponse() { @@ -1155,6 +1158,38 @@ public function getQuery() } return $this->_query; } + + /** + * URL Helper + * + * @param array $urlOptions + * @param string $name + * @param bool $reset + * @param bool $encode + */ + public function url($urlOptions = array(), $name = null, $reset = false, $encode = true) + { + $frontController = $this->getFrontController(); + $router = $frontController->getRouter(); + if (!$router instanceof Zend_Controller_Router_Rewrite) { + throw new Exception('This url helper utility function only works when the router is of type Zend_Controller_Router_Rewrite'); + } + if (count($router->getRoutes()) == 0) { + $router->addDefaultRoutes(); + } + return $router->assemble($urlOptions, $name, $reset, $encode); + } + + public function urlizeOptions($urlOptions, $actionControllerModuleOnly = true) + { + $ccToDash = new Zend_Filter_Word_CamelCaseToDash(); + foreach ($urlOptions as $n => $v) { + if (in_array($n, array('action', 'controller', 'module'))) { + $urlOptions[$n] = $ccToDash->filter($v); + } + } + return $urlOptions; + } /** * Increment assertion count diff --git a/library/Zend/Test/PHPUnit/DatabaseTestCase.php b/library/Zend/Test/PHPUnit/DatabaseTestCase.php index 5f1e8aa9c..9d9ff282c 100644 --- a/library/Zend/Test/PHPUnit/DatabaseTestCase.php +++ b/library/Zend/Test/PHPUnit/DatabaseTestCase.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DatabaseTestCase.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DatabaseTestCase.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Test_PHPUnit_DatabaseTestCase extends PHPUnit_Extensions_Database_TestCase diff --git a/library/Zend/Test/PHPUnit/Db/Connection.php b/library/Zend/Test/PHPUnit/Db/Connection.php index 7b67f3c7b..062abd569 100644 --- a/library/Zend/Test/PHPUnit/Db/Connection.php +++ b/library/Zend/Test/PHPUnit/Db/Connection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Connection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Connection.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Connection extends PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php index ea259b0d2..3602f885c 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbRowset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbRowset.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_DbRowset extends PHPUnit_Extensions_Database_DataSet_AbstractTable diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php index 6bdc8f016..45c62c454 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_DbTable extends PHPUnit_Extensions_Database_DataSet_QueryTable diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php index 932e23c67..abd896ae2 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableDataSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTableDataSet.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once "PHPUnit/Extensions/Database/DataSet/QueryDataSet.php"; @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet extends PHPUnit_Extensions_Database_DataSet_AbstractDataSet diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php index 5bcf8421b..12cb97e44 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryDataSet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryDataSet.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -47,7 +47,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_QueryDataSet extends PHPUnit_Extensions_Database_DataSet_QueryDataSet diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php index bae98f764..0f6e683ed 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QueryTable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QueryTable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_DataSet_QueryTable extends PHPUnit_Extensions_Database_DataSet_QueryTable diff --git a/library/Zend/Test/PHPUnit/Db/Exception.php b/library/Zend/Test/PHPUnit/Db/Exception.php index d3b8615a4..8a95a04bc 100644 --- a/library/Zend/Test/PHPUnit/Db/Exception.php +++ b/library/Zend/Test/PHPUnit/Db/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Exception extends Zend_Exception diff --git a/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php index ebd7ee02d..503dd765c 100644 --- a/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php +++ b/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Generic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Generic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -37,7 +37,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Metadata_Generic implements PHPUnit_Extensions_Database_DB_IMetaData diff --git a/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php index 666da6473..2fcf64f52 100644 --- a/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php +++ b/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DeleteAll.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DeleteAll.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -52,7 +52,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation diff --git a/library/Zend/Test/PHPUnit/Db/Operation/Insert.php b/library/Zend/Test/PHPUnit/Db/Operation/Insert.php index 4eea09ea5..d0d0cfb4f 100644 --- a/library/Zend/Test/PHPUnit/Db/Operation/Insert.php +++ b/library/Zend/Test/PHPUnit/Db/Operation/Insert.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Insert.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Insert.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -52,7 +52,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Operation_Insert implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation diff --git a/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php index 968637faf..49e35a928 100644 --- a/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php +++ b/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Truncate.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Truncate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -52,7 +52,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Database_Operation_IDatabaseOperation @@ -89,7 +89,7 @@ public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $conn */ protected function _truncate(Zend_Db_Adapter_Abstract $db, $tableName) { - $tableName = $db->quoteIdentifier($tableName); + $tableName = $db->quoteIdentifier($tableName, true); if($db instanceof Zend_Db_Adapter_Pdo_Sqlite) { $db->query('DELETE FROM '.$tableName); } else if($db instanceof Zend_Db_Adapter_Db2) { diff --git a/library/Zend/Test/PHPUnit/Db/SimpleTester.php b/library/Zend/Test/PHPUnit/Db/SimpleTester.php index fe702a629..82d6b6ec5 100644 --- a/library/Zend/Test/PHPUnit/Db/SimpleTester.php +++ b/library/Zend/Test/PHPUnit/Db/SimpleTester.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimpleTester.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SimpleTester.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -57,7 +57,7 @@ * @category Zend * @package Zend_Test * @subpackage PHPUnit - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Test_PHPUnit_Db_SimpleTester extends PHPUnit_Extensions_Database_DefaultTester diff --git a/library/Zend/Text/Exception.php b/library/Zend/Text/Exception.php index f4c072c78..9ea6bef79 100644 --- a/library/Zend/Text/Exception.php +++ b/library/Zend/Text/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text * @uses Zend_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Exception extends Zend_Exception diff --git a/library/Zend/Text/Figlet.php b/library/Zend/Text/Figlet.php index 9b680ccb0..835fecf97 100644 --- a/library/Zend/Text/Figlet.php +++ b/library/Zend/Text/Figlet.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Figlet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Figlet.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Figlet.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Figlet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Figlet diff --git a/library/Zend/Text/Figlet/Exception.php b/library/Zend/Text/Figlet/Exception.php index 3606328c4..80c67b93d 100644 --- a/library/Zend/Text/Figlet/Exception.php +++ b/library/Zend/Text/Figlet/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Figlet - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Figlet * @uses Zend_Text_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Figlet_Exception extends Zend_Text_Exception diff --git a/library/Zend/Text/Figlet/zend-framework.flf b/library/Zend/Text/Figlet/zend-framework.flf index fef6be574..f40d9ef07 100644 --- a/library/Zend/Text/Figlet/zend-framework.flf +++ b/library/Zend/Text/Figlet/zend-framework.flf @@ -17,7 +17,7 @@ Version: 1.0 obtain it through the world-wide-web, please send an email to license@zend.com so we can send you a copy immediately. - Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) ------------------------------------------------------------------------------- diff --git a/library/Zend/Text/MultiByte.php b/library/Zend/Text/MultiByte.php index bbefb2af7..fa68fd75f 100644 --- a/library/Zend/Text/MultiByte.php +++ b/library/Zend/Text/MultiByte.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MultiByte.php 21931 2010-04-18 15:25:32Z dasprid $ + * @version $Id: MultiByte.php 24763 2012-05-06 00:11:18Z adamlundrigan $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_MultiByte @@ -39,78 +39,56 @@ class Zend_Text_MultiByte * @param string $charset * @return string */ - public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'UTF-8') + public static function wordWrap($string, $width = 75, $break = "\n", $cut = false, $charset = 'utf-8') { - $result = array(); - $breakWidth = iconv_strlen($break, $charset); - - while (($stringLength = iconv_strlen($string, $charset)) > 0) { - $breakPos = iconv_strpos($string, $break, 0, $charset); - - if ($breakPos !== false && $breakPos < $width) { - if ($breakPos === $stringLength - $breakWidth) { - $subString = $string; - $cutLength = null; - } else { - $subString = iconv_substr($string, 0, $breakPos, $charset); - $cutLength = $breakPos + $breakWidth; - } + $stringWidth = iconv_strlen($string, $charset); + $breakWidth = iconv_strlen($break, $charset); + + if (strlen($string) === 0) { + return ''; + } elseif ($breakWidth === null) { + throw new Zend_Text_Exception('Break string cannot be empty'); + } elseif ($width === 0 && $cut) { + throw new Zend_Text_Exception('Can\'t force cut when width is zero'); + } + + $result = ''; + $lastStart = $lastSpace = 0; + + for ($current = 0; $current < $stringWidth; $current++) { + $char = iconv_substr($string, $current, 1, $charset); + + if ($breakWidth === 1) { + $possibleBreak = $char; } else { - $subString = iconv_substr($string, 0, $width, $charset); - - if ($subString === $string) { - $cutLength = null; - } else { - $nextChar = iconv_substr($string, $width, 1, $charset); - - if ($breakWidth === 1) { - $nextBreak = $nextChar; - } else { - $nextBreak = iconv_substr($string, $breakWidth, 1, $charset); - } - - if ($nextChar === ' ' || $nextBreak === $break) { - $afterNextChar = iconv_substr($string, $width + 1, 1, $charset); - - if ($afterNextChar === false) { - $subString .= $nextChar; - } - - $cutLength = iconv_strlen($subString, $charset) + 1; - } else { - $spacePos = iconv_strrpos($subString, ' ', $charset); - - if ($spacePos !== false) { - $subString = iconv_substr($subString, 0, $spacePos, $charset); - $cutLength = $spacePos + 1; - } else if ($cut === false) { - $spacePos = iconv_strpos($string, ' ', 0, $charset); - - if ($spacePos !== false) { - $subString = iconv_substr($string, 0, $spacePos, $charset); - $cutLength = $spacePos + 1; - } else { - $subString = $string; - $cutLength = null; - } - } else { - $subString = iconv_substr($subString, 0, $width, $charset); - $cutLength = $width; - } - } - } + $possibleBreak = iconv_substr($string, $current, $breakWidth, $charset); } - - $result[] = $subString; - - if ($cutLength !== null) { - $string = iconv_substr($string, $cutLength, ($stringLength - $cutLength), $charset); - } else { - break; + + if ($possibleBreak === $break) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart + $breakWidth, $charset); + $current += $breakWidth - 1; + $lastStart = $lastSpace = $current + 1; + } elseif ($char === ' ') { + if ($current - $lastStart >= $width) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break; + $lastStart = $current + 1; + } + + $lastSpace = $current; + } elseif ($current - $lastStart >= $width && $cut && $lastStart >= $lastSpace) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset) . $break; + $lastStart = $lastSpace = $current; + } elseif ($current - $lastStart >= $width && $lastStart < $lastSpace) { + $result .= iconv_substr($string, $lastStart, $lastSpace - $lastStart, $charset) . $break; + $lastStart = $lastSpace = $lastSpace + 1; } } - - return implode($break, $result); + + if ($lastStart !== $current) { + $result .= iconv_substr($string, $lastStart, $current - $lastStart, $charset); + } + + return $result; } /** @@ -123,13 +101,13 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals * @param string $charset * @return string */ - public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'UTF-8') + public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'utf-8') { $return = ''; $lengthOfPadding = $padLength - iconv_strlen($input, $charset); $padStringLength = iconv_strlen($padString, $charset); - if ($padStringLength === 0 || $lengthOfPadding === 0) { + if ($padStringLength === 0 || $lengthOfPadding <= 0) { $return = $input; } else { $repeatCount = floor($lengthOfPadding / $padStringLength); diff --git a/library/Zend/Text/Table.php b/library/Zend/Text/Table.php index dea5a1640..c1c829ce3 100644 --- a/library/Zend/Text/Table.php +++ b/library/Zend/Text/Table.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Table.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table @@ -341,6 +341,7 @@ public function appendRow($row) } // require_once 'Zend/Text/Table/Row.php'; + // require_once 'Zend/Text/Table/Column.php'; $data = $row; $row = new Zend_Text_Table_Row(); diff --git a/library/Zend/Text/Table/Column.php b/library/Zend/Text/Table/Column.php index 0b0631a04..714835e37 100644 --- a/library/Zend/Text/Table/Column.php +++ b/library/Zend/Text/Table/Column.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Column.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Column.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Column diff --git a/library/Zend/Text/Table/Decorator/Ascii.php b/library/Zend/Text/Table/Decorator/Ascii.php index df5db7327..25378915e 100644 --- a/library/Zend/Text/Table/Decorator/Ascii.php +++ b/library/Zend/Text/Table/Decorator/Ascii.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ascii.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ascii.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Table * @uses Zend_Text_Table_Decorator_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Decorator_Ascii implements Zend_Text_Table_Decorator_Interface diff --git a/library/Zend/Text/Table/Decorator/Interface.php b/library/Zend/Text/Table/Decorator/Interface.php index d9a060886..abaeaae62 100644 --- a/library/Zend/Text/Table/Decorator/Interface.php +++ b/library/Zend/Text/Table/Decorator/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Text_Table_Decorator_Interface diff --git a/library/Zend/Text/Table/Decorator/Unicode.php b/library/Zend/Text/Table/Decorator/Unicode.php index cb4399be9..bbf663a2a 100644 --- a/library/Zend/Text/Table/Decorator/Unicode.php +++ b/library/Zend/Text/Table/Decorator/Unicode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Unicode.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Unicode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Table * @uses Zend_Text_Table_Decorator_Interface - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Decorator_Unicode implements Zend_Text_Table_Decorator_Interface diff --git a/library/Zend/Text/Table/Exception.php b/library/Zend/Text/Table/Exception.php index 17515bae0..48adda047 100644 --- a/library/Zend/Text/Table/Exception.php +++ b/library/Zend/Text/Table/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Text_Table * @uses Zend_Text_Exception - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Exception extends Zend_Text_Exception diff --git a/library/Zend/Text/Table/Row.php b/library/Zend/Text/Table/Row.php index 647e76e07..e8a6429ae 100644 --- a/library/Zend/Text/Table/Row.php +++ b/library/Zend/Text/Table/Row.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Row.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Row.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Text_Table - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Text_Table_Row @@ -197,11 +197,11 @@ public function render(array $columnWidths, for ($line = 0; $line < $maxHeight; $line++) { $result .= $decorator->getVertical(); - foreach ($renderedColumns as $renderedColumn) { + foreach ($renderedColumns as $index => $renderedColumn) { if (isset($renderedColumn[$line]) === true) { $result .= $renderedColumn[$line]; } else { - $result .= str_repeat(' ', strlen($renderedColumn[0])); + $result .= str_repeat(' ', $this->_columnWidths[$index]); } $result .= $decorator->getVertical(); diff --git a/library/Zend/TimeSync.php b/library/Zend/TimeSync.php index a856ac0f9..88951ac57 100644 --- a/library/Zend/TimeSync.php +++ b/library/Zend/TimeSync.php @@ -15,8 +15,8 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: TimeSync.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: TimeSync.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync implements IteratorAggregate @@ -233,7 +233,7 @@ public function getInfo() * facade and will try to return the date from the first server that * returns a valid result. * - * @param $locale - OPTIONAL locale + * @param Zend_Locale $locale - OPTIONAL locale * @return object * @throws Zend_TimeSync_Exception */ diff --git a/library/Zend/TimeSync/Exception.php b/library/Zend/TimeSync/Exception.php index d5ecae972..495a5dd72 100644 --- a/library/Zend/TimeSync/Exception.php +++ b/library/Zend/TimeSync/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync_Exception extends Zend_Exception diff --git a/library/Zend/TimeSync/Ntp.php b/library/Zend/TimeSync/Ntp.php index 05468811b..22b7d2571 100644 --- a/library/Zend/TimeSync/Ntp.php +++ b/library/Zend/TimeSync/Ntp.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ntp.php 21480 2010-03-13 22:09:26Z thomas $ + * @version $Id: Ntp.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync_Ntp extends Zend_TimeSync_Protocol diff --git a/library/Zend/TimeSync/Protocol.php b/library/Zend/TimeSync/Protocol.php index fe19c5cfc..29452758e 100644 --- a/library/Zend/TimeSync/Protocol.php +++ b/library/Zend/TimeSync/Protocol.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Protocol.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Protocol.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_TimeSync_Protocol diff --git a/library/Zend/TimeSync/Sntp.php b/library/Zend/TimeSync/Sntp.php index fd8f0e27c..3ae013cec 100644 --- a/library/Zend/TimeSync/Sntp.php +++ b/library/Zend/TimeSync/Sntp.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sntp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Sntp.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_TimeSync - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_TimeSync_Sntp extends Zend_TimeSync_Protocol diff --git a/library/Zend/Tool/Framework/Action/Base.php b/library/Zend/Tool/Framework/Action/Base.php index a4477cbe4..4034bee3e 100644 --- a/library/Zend/Tool/Framework/Action/Base.php +++ b/library/Zend/Tool/Framework/Action/Base.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Action_Base implements Zend_Tool_Framework_Action_Interface diff --git a/library/Zend/Tool/Framework/Action/Exception.php b/library/Zend/Tool/Framework/Action/Exception.php index cce13070c..7d4a21240 100644 --- a/library/Zend/Tool/Framework/Action/Exception.php +++ b/library/Zend/Tool/Framework/Action/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Action_Exception extends Zend_Tool_Framework_Exception diff --git a/library/Zend/Tool/Framework/Action/Interface.php b/library/Zend/Tool/Framework/Action/Interface.php index 86898e568..ae032abe7 100644 --- a/library/Zend/Tool/Framework/Action/Interface.php +++ b/library/Zend/Tool/Framework/Action/Interface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Action_Interface diff --git a/library/Zend/Tool/Framework/Action/Repository.php b/library/Zend/Tool/Framework/Action/Repository.php index 7227399ff..aeee42cea 100644 --- a/library/Zend/Tool/Framework/Action/Repository.php +++ b/library/Zend/Tool/Framework/Action/Repository.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Repository.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Action_Repository diff --git a/library/Zend/Tool/Framework/Client/Abstract.php b/library/Zend/Tool/Framework/Client/Abstract.php index 88f3ce23a..ebd8b9047 100644 --- a/library/Zend/Tool/Framework/Client/Abstract.php +++ b/library/Zend/Tool/Framework/Client/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23204 2010-10-21 15:35:21Z ralph $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framework_Registry_EnabledInterface @@ -61,7 +61,7 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor public function __construct($options = array()) { - // require autoloader + // require autoloader Zend_Loader_Autoloader::getInstance(); // this might look goofy, but this is setting up the @@ -70,7 +70,7 @@ public function __construct($options = array()) $registry->setClient($this); // NOTE: at this moment, $this->_registry should contain the registry object - + if ($options) { $this->setOptions($options); } @@ -110,7 +110,7 @@ public function initialize() $manifest = $this->_registry->getManifestRepository(); $manifest->addManifest(new Zend_Tool_Framework_Client_Manifest()); - + // setup the debug log if (!$this->_debugLogger instanceof Zend_Log) { // require_once 'Zend/Log.php'; @@ -177,10 +177,10 @@ public function setRegistry(Zend_Tool_Framework_Registry_Interface $registry) $this->_registry = $registry; return $this; } - + /** * getRegistry(); - * + * * @return Zend_Tool_Framework_Registry_Interface */ public function getRegistry() @@ -317,7 +317,7 @@ protected function _handleDispatch() $this->_handleDispatchExecution($provider, $methodName, $callParameters); } - + protected function _handleDispatchExecution($class, $methodName, $callParameters) { if (method_exists($class, $methodName)) { diff --git a/library/Zend/Tool/Framework/Client/Config.php b/library/Zend/Tool/Framework/Client/Config.php index 2a8241e37..28ac8fbb2 100644 --- a/library/Zend/Tool/Framework/Client/Config.php +++ b/library/Zend/Tool/Framework/Client/Config.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Config.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Config @@ -72,13 +72,13 @@ public function setConfigFilepath($configFilepath) $this->_configFilepath = $configFilepath; $this->loadConfig($configFilepath); - + return $this; } /** * Load the configuration from the given path. - * + * * @param string $configFilepath */ protected function loadConfig($configFilepath) @@ -108,7 +108,7 @@ protected function loadConfig($configFilepath) /** * Return the filepath of the configuration. - * + * * @return string */ public function getConfigFilepath() @@ -118,7 +118,7 @@ public function getConfigFilepath() /** * Get a configuration value. - * + * * @param string $name * @param string $defaultValue * @return mixed diff --git a/library/Zend/Tool/Framework/Client/Console.php b/library/Zend/Tool/Framework/Client/Console.php index 72453edb7..7107d3628 100644 --- a/library/Zend/Tool/Framework/Client/Console.php +++ b/library/Zend/Tool/Framework/Client/Console.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Console.php 23204 2010-10-21 15:35:21Z ralph $ + * @version $Id: Console.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,8 +40,10 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @todo methods need more API documentation. */ class Zend_Tool_Framework_Client_Console extends Zend_Tool_Framework_Client_Abstract @@ -73,7 +75,7 @@ class Zend_Tool_Framework_Client_Console * @var array */ protected $_classesToLoad = array(); - + /** * main() - This is typically called from zf.php. This method is a * self contained main() function. @@ -94,11 +96,11 @@ public function getName() { return 'console'; } - + /** * setConfigOptions() - * - * @param $configOptions + * + * @param array $configOptions */ public function setConfigOptions($configOptions) { @@ -108,15 +110,18 @@ public function setConfigOptions($configOptions) /** * setStorageOptions() - * - * @param $storageOptions + * + * @param array $storageOptions */ public function setStorageOptions($storageOptions) { $this->_storageOptions = $storageOptions; return $this; } - + + /** + * @param array $classesToLoad + */ public function setClassesToLoad($classesToLoad) { $this->_classesToLoad = $classesToLoad; @@ -145,10 +150,10 @@ protected function _preInit() // which classes are essential to initializing Zend_Tool_Framework_Client_Console $classesToLoad = array( - 'Zend_Tool_Framework_Client_Console_Manifest', + 'Zend_Tool_Framework_Client_Console_Manifest', 'Zend_Tool_Framework_System_Manifest' ); - + if ($this->_classesToLoad) { if (is_string($this->_classesToLoad)) { $classesToLoad[] = $this->_classesToLoad; @@ -156,7 +161,7 @@ protected function _preInit() $classesToLoad = array_merge($classesToLoad, $this->_classesToLoad); } } - + // add classes to the basic loader from the config file basicloader.classes.1 .. if (isset($config->basicloader) && isset($config->basicloader->classes)) { foreach ($config->basicloader->classes as $classKey => $className) { @@ -186,7 +191,7 @@ protected function _preDispatch() if (function_exists('posix_isatty')) { $response->addContentDecorator(new Zend_Tool_Framework_Client_Console_ResponseDecorator_Colorizer()); } - + $response->addContentDecorator(new Zend_Tool_Framework_Client_Response_ContentDecorator_Separator()) ->setDefaultDecoratorOptions(array('separator' => true)); diff --git a/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php b/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php index 0dad9a58e..a124a622a 100644 --- a/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php +++ b/library/Zend/Tool/Framework/Client/Console/ArgumentParser.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArgumentParser.php 22877 2010-08-21 19:53:14Z ramon $ + * @version $Id: ArgumentParser.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Framework_Registry_EnabledInterface diff --git a/library/Zend/Tool/Framework/Client/Console/HelpSystem.php b/library/Zend/Tool/Framework/Client/Console/HelpSystem.php index 1ed109397..4dfdd0626 100644 --- a/library/Zend/Tool/Framework/Client/Console/HelpSystem.php +++ b/library/Zend/Tool/Framework/Client/Console/HelpSystem.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelpSystem.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelpSystem.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_HelpSystem @@ -271,7 +271,7 @@ protected function _respondWithSystemInformation($providerNameFilter = null, $ac $this->_respondWithProviderName($providerMetadata); $providerNameDisplayed = true; } - + if ($includeAllSpecialties || $isSingleSpecialProviderAction) { foreach ($providerSignature->getSpecialties() as $specialtyName) { @@ -303,7 +303,7 @@ protected function _respondWithSystemInformation($providerNameFilter = null, $ac } } - + // reset the special flag for single provider action with specialty $isSingleSpecialProviderAction = false; diff --git a/library/Zend/Tool/Framework/Client/Console/Manifest.php b/library/Zend/Tool/Framework/Client/Console/Manifest.php index b0ef5e912..38873c727 100644 --- a/library/Zend/Tool/Framework/Client/Console/Manifest.php +++ b/library/Zend/Tool/Framework/Client/Console/Manifest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manifest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -54,7 +54,7 @@ * Zend_Tool_Framework_Client_ConsoleClient_Manifest * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_Manifest diff --git a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php index 09b67f5b3..e5dbfee34 100644 --- a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php +++ b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AlignCenter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AlignCenter.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_AlignCenter implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface diff --git a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php index 7b4e588b9..04f7bd5ab 100644 --- a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php +++ b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,9 +27,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Blockize.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Blockize.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_Blockize implements Zend_Tool_Framework_Client_Response_ContentDecorator_Interface diff --git a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php index 07e046ca0..ce14598c1 100644 --- a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php +++ b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Colorizer.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Colorizer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Colorizer.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_Colorizer diff --git a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php index e7e983656..69c0ab1ee 100644 --- a/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php +++ b/library/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Indention.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Indention.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php"; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Console_ResponseDecorator_Indention diff --git a/library/Zend/Tool/Framework/Client/Exception.php b/library/Zend/Tool/Framework/Client/Exception.php index a96845baa..283e16072 100644 --- a/library/Zend/Tool/Framework/Client/Exception.php +++ b/library/Zend/Tool/Framework/Client/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Exception extends Zend_Tool_Framework_Exception diff --git a/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php b/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php index e9e0ebdef..f2ab291a6 100644 --- a/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php +++ b/library/Zend/Tool/Framework/Client/Interactive/InputHandler.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputHandler.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputHandler.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Interactive_InputHandler diff --git a/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php b/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php index 555493c12..0012500c3 100644 --- a/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php +++ b/library/Zend/Tool/Framework/Client/Interactive/InputInterface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Interactive_InputInterface diff --git a/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php b/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php index ded06736f..99911a4a9 100644 --- a/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php +++ b/library/Zend/Tool/Framework/Client/Interactive/InputRequest.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputRequest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputRequest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Interactive_InputRequest diff --git a/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php b/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php index 62a4740f8..658733334 100644 --- a/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php +++ b/library/Zend/Tool/Framework/Client/Interactive/InputResponse.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputResponse.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: InputResponse.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Interactive_InputResponse diff --git a/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php b/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php index 644b78a2f..2ffa2b3bf 100644 --- a/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php +++ b/library/Zend/Tool/Framework/Client/Interactive/OutputInterface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OutputInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: OutputInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Interactive_OutputInterface diff --git a/library/Zend/Tool/Framework/Client/Manifest.php b/library/Zend/Tool/Framework/Client/Manifest.php index ed44fa8f3..7d84d8d08 100644 --- a/library/Zend/Tool/Framework/Client/Manifest.php +++ b/library/Zend/Tool/Framework/Client/Manifest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Manifest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -54,7 +54,7 @@ * Zend_Tool_Framework_Client_ConsoleClient_Manifest * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Manifest @@ -140,7 +140,7 @@ public function getMetadata() if ($specialty == '_Global') { continue; } - + $metadatas[] = new Zend_Tool_Framework_Metadata_Tool(array( 'name' => 'normalizedSpecialtyName', 'value' => $lowerFilter->filter($specialty), diff --git a/library/Zend/Tool/Framework/Client/Request.php b/library/Zend/Tool/Framework/Client/Request.php index 7fda55bd5..98258bbaf 100644 --- a/library/Zend/Tool/Framework/Client/Request.php +++ b/library/Zend/Tool/Framework/Client/Request.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Request.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Request diff --git a/library/Zend/Tool/Framework/Client/Response.php b/library/Zend/Tool/Framework/Client/Response.php index 33de021e7..90a8cc3ba 100644 --- a/library/Zend/Tool/Framework/Client/Response.php +++ b/library/Zend/Tool/Framework/Client/Response.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Response.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Response diff --git a/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php b/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php index 3c604e5dc..9529aaee8 100644 --- a/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php +++ b/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Response_ContentDecorator_Interface diff --git a/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php b/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php index a1c6468db..d39bc48f1 100644 --- a/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php +++ b/library/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Separator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Separator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Response_ContentDecorator_Separator diff --git a/library/Zend/Tool/Framework/Client/Storage.php b/library/Zend/Tool/Framework/Client/Storage.php index ef79c077f..d7d35189f 100644 --- a/library/Zend/Tool/Framework/Client/Storage.php +++ b/library/Zend/Tool/Framework/Client/Storage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Storage diff --git a/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php b/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php index bc2b9c170..be1ac5b4e 100644 --- a/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php +++ b/library/Zend/Tool/Framework/Client/Storage/AdapterInterface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: AdapterInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Client_Storage_AdapterInterface diff --git a/library/Zend/Tool/Framework/Client/Storage/Directory.php b/library/Zend/Tool/Framework/Client/Storage/Directory.php index 8f271398e..1b276e337 100644 --- a/library/Zend/Tool/Framework/Client/Storage/Directory.php +++ b/library/Zend/Tool/Framework/Client/Storage/Directory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Directory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Client_Storage_Directory diff --git a/library/Zend/Tool/Framework/Exception.php b/library/Zend/Tool/Framework/Exception.php index b65ea4aaa..996012ff2 100644 --- a/library/Zend/Tool/Framework/Exception.php +++ b/library/Zend/Tool/Framework/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Exception extends Zend_Exception diff --git a/library/Zend/Tool/Framework/Loader/Abstract.php b/library/Zend/Tool/Framework/Loader/Abstract.php index b8a0f1507..429f683d1 100644 --- a/library/Zend/Tool/Framework/Loader/Abstract.php +++ b/library/Zend/Tool/Framework/Loader/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,10 +33,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -abstract class Zend_Tool_Framework_Loader_Abstract +abstract class Zend_Tool_Framework_Loader_Abstract implements Zend_Tool_Framework_Loader_Interface, Zend_Tool_Framework_Registry_EnabledInterface { /** diff --git a/library/Zend/Tool/Framework/Loader/BasicLoader.php b/library/Zend/Tool/Framework/Loader/BasicLoader.php index 8f6ebf184..df3bdbe83 100644 --- a/library/Zend/Tool/Framework/Loader/BasicLoader.php +++ b/library/Zend/Tool/Framework/Loader/BasicLoader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BasicLoader.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: BasicLoader.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,10 +40,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Framework_Loader_BasicLoader +class Zend_Tool_Framework_Loader_BasicLoader implements Zend_Tool_Framework_Loader_Interface, Zend_Tool_Framework_Registry_EnabledInterface { /** @@ -55,14 +55,14 @@ class Zend_Tool_Framework_Loader_BasicLoader * @var array */ protected $_classesToLoad = array(); - + public function __construct($options = array()) { if ($options) { $this->setOptions($options); } } - + public function setOptions(Array $options) { foreach ($options as $optionName => $optionValue) { @@ -72,7 +72,7 @@ public function setOptions(Array $options) } } } - + /** * setRegistry() - required by the enabled interface to get an instance of * the registry @@ -95,17 +95,17 @@ public function setClassesToLoad(array $classesToLoad) $this->_classesToLoad = $classesToLoad; return $this; } - + public function load() { $manifestRegistry = $this->_registry->getManifestRepository(); $providerRegistry = $this->_registry->getProviderRepository(); - + $loadedClasses = array(); - + // loop through the loaded classes and ensure that foreach ($this->_classesToLoad as $class) { - + if (!class_exists($class)) { Zend_Loader::loadClass($class); } @@ -153,5 +153,5 @@ private function _isProviderImplementation($reflectionClass) && !$providerRegistry->hasProvider($reflectionClass->getName(), false) ); } - + } \ No newline at end of file diff --git a/library/Zend/Tool/Framework/Loader/IncludePathLoader.php b/library/Zend/Tool/Framework/Loader/IncludePathLoader.php index bf001c1f3..814157dcd 100644 --- a/library/Zend/Tool/Framework/Loader/IncludePathLoader.php +++ b/library/Zend/Tool/Framework/Loader/IncludePathLoader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IncludePathLoader.php 20904 2010-02-04 16:18:18Z matthew $ + * @version $Id: IncludePathLoader.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Loader_IncludePathLoader extends Zend_Tool_Framework_Loader_Abstract diff --git a/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php b/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php index 4873a0557..36343702f 100644 --- a/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php +++ b/library/Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecursiveFilterIterator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecursiveFilterIterator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator extends RecursiveFilterIterator diff --git a/library/Zend/Tool/Framework/Loader/Interface.php b/library/Zend/Tool/Framework/Loader/Interface.php index 00d4b4455..286791690 100644 --- a/library/Zend/Tool/Framework/Loader/Interface.php +++ b/library/Zend/Tool/Framework/Loader/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 21308 2010-03-03 15:42:27Z elazar $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Loader_Interface diff --git a/library/Zend/Tool/Framework/Manifest/ActionManifestable.php b/library/Zend/Tool/Framework/Manifest/ActionManifestable.php index 2f864ca8a..7b856e2e4 100644 --- a/library/Zend/Tool/Framework/Manifest/ActionManifestable.php +++ b/library/Zend/Tool/Framework/Manifest/ActionManifestable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActionManifestable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_ActionManifestable extends Zend_Tool_Framework_Manifest_Interface diff --git a/library/Zend/Tool/Framework/Manifest/ActionMetadata.php b/library/Zend/Tool/Framework/Manifest/ActionMetadata.php new file mode 100644 index 000000000..33b5bad9c --- /dev/null +++ b/library/Zend/Tool/Framework/Manifest/ActionMetadata.php @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ActionMetadata.php 24594 2012-01-05 21:27:01Z matthew $ + */ + +/** + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Framework_Manifest_ActionMetadata +{ + +} diff --git a/library/Zend/Tool/Framework/Manifest/Exception.php b/library/Zend/Tool/Framework/Manifest/Exception.php index 04b78c8f1..ba2dfab35 100644 --- a/library/Zend/Tool/Framework/Manifest/Exception.php +++ b/library/Zend/Tool/Framework/Manifest/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Manifest_Exception extends Zend_Tool_Framework_Exception diff --git a/library/Zend/Tool/Framework/Manifest/Indexable.php b/library/Zend/Tool/Framework/Manifest/Indexable.php index 430b0901a..384f3b6e9 100644 --- a/library/Zend/Tool/Framework/Manifest/Indexable.php +++ b/library/Zend/Tool/Framework/Manifest/Indexable.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Indexable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Indexable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_Indexable extends Zend_Tool_Framework_Manifest_Interface diff --git a/library/Zend/Tool/Framework/Manifest/Interface.php b/library/Zend/Tool/Framework/Manifest/Interface.php index 7f0ce98d8..1a82ac748 100644 --- a/library/Zend/Tool/Framework/Manifest/Interface.php +++ b/library/Zend/Tool/Framework/Manifest/Interface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_Interface diff --git a/library/Zend/Tool/Framework/Manifest/Metadata.php b/library/Zend/Tool/Framework/Manifest/Metadata.php new file mode 100644 index 000000000..9d3e98519 --- /dev/null +++ b/library/Zend/Tool/Framework/Manifest/Metadata.php @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: Metadata.php 24594 2012-01-05 21:27:01Z matthew $ + */ + +/** + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Framework_Manifest_Metadata +{ + +} diff --git a/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php b/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php index 3d18c5f4d..2c3aeeb83 100644 --- a/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php +++ b/library/Zend/Tool/Framework/Manifest/MetadataManifestable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MetadataManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: MetadataManifestable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_MetadataManifestable extends Zend_Tool_Framework_Manifest_Interface diff --git a/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php b/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php index 113339772..c7de601e5 100644 --- a/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php +++ b/library/Zend/Tool/Framework/Manifest/ProviderManifestable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProviderManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProviderManifestable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Manifest_ProviderManifestable extends Zend_Tool_Framework_Manifest_Interface diff --git a/library/Zend/Tool/Framework/Manifest/ProviderMetadata.php b/library/Zend/Tool/Framework/Manifest/ProviderMetadata.php new file mode 100644 index 000000000..08419ee0e --- /dev/null +++ b/library/Zend/Tool/Framework/Manifest/ProviderMetadata.php @@ -0,0 +1,31 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ProviderMetadata.php 24594 2012-01-05 21:27:01Z matthew $ + */ + +/** + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Framework_Manifest_ProviderMetadata +{ + +} diff --git a/library/Zend/Tool/Framework/Manifest/Repository.php b/library/Zend/Tool/Framework/Manifest/Repository.php index d3c23d4c5..977cf373c 100644 --- a/library/Zend/Tool/Framework/Manifest/Repository.php +++ b/library/Zend/Tool/Framework/Manifest/Repository.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Repository.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Manifest_Repository @@ -100,7 +100,7 @@ public function addManifest(Zend_Tool_Framework_Manifest_Interface $manifest) if (is_string($provider)) { $provider = new $provider(); } - + if (!$provider instanceof Zend_Tool_Framework_Provider_Interface) { // require_once 'Zend/Tool/Framework/Manifest/Exception.php'; throw new Zend_Tool_Framework_Manifest_Exception( @@ -183,7 +183,7 @@ public function process() } $metadata = new Zend_Tool_Framework_Metadata_Dynamic($metadata); } - + if (!$metadata instanceof Zend_Tool_Framework_Metadata_Interface) { // require_once 'Zend/Tool/Framework/Manifest/Exception.php'; throw new Zend_Tool_Framework_Manifest_Exception( diff --git a/library/Zend/Tool/Framework/Metadata/Attributable.php b/library/Zend/Tool/Framework/Metadata/Attributable.php index 51fce14d6..a931ffdce 100644 --- a/library/Zend/Tool/Framework/Metadata/Attributable.php +++ b/library/Zend/Tool/Framework/Metadata/Attributable.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Attributable.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Attributable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Metadata_Attributable diff --git a/library/Zend/Tool/Framework/Metadata/Basic.php b/library/Zend/Tool/Framework/Metadata/Basic.php index 4014b1caf..0c5e560a7 100644 --- a/library/Zend/Tool/Framework/Metadata/Basic.php +++ b/library/Zend/Tool/Framework/Metadata/Basic.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Basic.php 22662 2010-07-24 17:37:36Z mabe $ + * @version $Id: Basic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,10 +33,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Framework_Metadata_Basic +class Zend_Tool_Framework_Metadata_Basic implements Zend_Tool_Framework_Metadata_Interface, Zend_Tool_Framework_Metadata_Attributable { diff --git a/library/Zend/Tool/Framework/Metadata/Dynamic.php b/library/Zend/Tool/Framework/Metadata/Dynamic.php index b8b5a31da..2ebc69140 100644 --- a/library/Zend/Tool/Framework/Metadata/Dynamic.php +++ b/library/Zend/Tool/Framework/Metadata/Dynamic.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dynamic.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Dynamic.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,10 +33,10 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Framework_Metadata_Dynamic +class Zend_Tool_Framework_Metadata_Dynamic implements Zend_Tool_Framework_Metadata_Interface, Zend_Tool_Framework_Metadata_Attributable { @@ -66,7 +66,7 @@ public function __construct($options = array()) $this->setOptions($options); } } - + public function setOptions(Array $options = array()) { foreach ($options as $optName => $optValue) { @@ -74,11 +74,11 @@ public function setOptions(Array $options = array()) $this->{$methodName}($optValue); } } - + /** * setType() - * - * @param $type + * + * @param string $type * @return Zend_Tool_Framework_Metadata_Dynamic */ public function setType($type) @@ -86,7 +86,7 @@ public function setType($type) $this->_type = $type; return $this; } - + /** * getType() * @@ -101,8 +101,8 @@ public function getType() /** * setName() - * - * @param $name + * + * @param string $name * @return Zend_Tool_Framework_Metadata_Dynamic */ public function setName($name) @@ -110,7 +110,7 @@ public function setName($name) $this->_name = $name; return $this; } - + /** * getName() * @@ -125,8 +125,8 @@ public function getName() /** * setValue() - * - * @param $value + * + * @param mixed $value * @return Zend_Tool_Framework_Metadata_Dynamic */ public function setValue($value) @@ -134,7 +134,7 @@ public function setValue($value) $this->_value = $value; return $this; } - + /** * getValue() * diff --git a/library/Zend/Tool/Framework/Metadata/Interface.php b/library/Zend/Tool/Framework/Metadata/Interface.php index 1aa2498fe..3be84b300 100644 --- a/library/Zend/Tool/Framework/Metadata/Interface.php +++ b/library/Zend/Tool/Framework/Metadata/Interface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Metadata_Interface @@ -48,5 +48,5 @@ public function getName(); * */ public function getValue(); - + } diff --git a/library/Zend/Tool/Framework/Metadata/Tool.php b/library/Zend/Tool/Framework/Metadata/Tool.php index 88f1e91b0..b67d97cdc 100644 --- a/library/Zend/Tool/Framework/Metadata/Tool.php +++ b/library/Zend/Tool/Framework/Metadata/Tool.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tool.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Tool.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Metadata_Tool extends Zend_Tool_Framework_Metadata_Basic diff --git a/library/Zend/Tool/Framework/Provider/Abstract.php b/library/Zend/Tool/Framework/Provider/Abstract.php index f4abf41e8..5e1583475 100644 --- a/library/Zend/Tool/Framework/Provider/Abstract.php +++ b/library/Zend/Tool/Framework/Provider/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -40,7 +40,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Framework_Provider_Abstract diff --git a/library/Zend/Tool/Framework/Provider/DocblockManifestable.php b/library/Zend/Tool/Framework/Provider/DocblockManifestable.php index 308c7de98..45a821971 100644 --- a/library/Zend/Tool/Framework/Provider/DocblockManifestable.php +++ b/library/Zend/Tool/Framework/Provider/DocblockManifestable.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DocblockManifestable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DocblockManifestable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_DocblockManifestInterface diff --git a/library/Zend/Tool/Framework/Provider/Exception.php b/library/Zend/Tool/Framework/Provider/Exception.php index 120c7e160..6bc256c68 100644 --- a/library/Zend/Tool/Framework/Provider/Exception.php +++ b/library/Zend/Tool/Framework/Provider/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Provider_Exception extends Zend_Tool_Framework_Exception diff --git a/library/Zend/Tool/Framework/Provider/Initializable.php b/library/Zend/Tool/Framework/Provider/Initializable.php index e7470a9a7..4afa444fb 100644 --- a/library/Zend/Tool/Framework/Provider/Initializable.php +++ b/library/Zend/Tool/Framework/Provider/Initializable.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Interactable.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -22,7 +22,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Initializable diff --git a/library/Zend/Tool/Framework/Provider/Interactable.php b/library/Zend/Tool/Framework/Provider/Interactable.php index 0c4335d37..ba96568ee 100644 --- a/library/Zend/Tool/Framework/Provider/Interactable.php +++ b/library/Zend/Tool/Framework/Provider/Interactable.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interactable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interactable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Interactable diff --git a/library/Zend/Tool/Framework/Provider/Interface.php b/library/Zend/Tool/Framework/Provider/Interface.php index c9d1c0539..91b37963c 100644 --- a/library/Zend/Tool/Framework/Provider/Interface.php +++ b/library/Zend/Tool/Framework/Provider/Interface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Interface diff --git a/library/Zend/Tool/Framework/Provider/Pretendable.php b/library/Zend/Tool/Framework/Provider/Pretendable.php index 22947a73d..d60346eab 100644 --- a/library/Zend/Tool/Framework/Provider/Pretendable.php +++ b/library/Zend/Tool/Framework/Provider/Pretendable.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pretendable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pretendable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Provider_Pretendable diff --git a/library/Zend/Tool/Framework/Provider/Repository.php b/library/Zend/Tool/Framework/Provider/Repository.php index d49a5ca1e..fd20809ea 100644 --- a/library/Zend/Tool/Framework/Provider/Repository.php +++ b/library/Zend/Tool/Framework/Provider/Repository.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: Repository.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Provider_Repository @@ -163,7 +163,7 @@ public function process() //foreach ($this->_unprocessedProviders as $providerName => $provider) { reset($this->_unprocessedProviders); while ($this->_unprocessedProviders) { - + $providerName = key($this->_unprocessedProviders); $provider = array_shift($this->_unprocessedProviders); diff --git a/library/Zend/Tool/Framework/Provider/Signature.php b/library/Zend/Tool/Framework/Provider/Signature.php index 1da2e9e37..0cba38554 100644 --- a/library/Zend/Tool/Framework/Provider/Signature.php +++ b/library/Zend/Tool/Framework/Provider/Signature.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Signature.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: Signature.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -41,7 +41,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Provider_Signature implements Zend_Tool_Framework_Registry_EnabledInterface diff --git a/library/Zend/Tool/Framework/Registry.php b/library/Zend/Tool/Framework/Registry.php index ec072ca6c..8fec79407 100644 --- a/library/Zend/Tool/Framework/Registry.php +++ b/library/Zend/Tool/Framework/Registry.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Registry.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Interface diff --git a/library/Zend/Tool/Framework/Registry/EnabledInterface.php b/library/Zend/Tool/Framework/Registry/EnabledInterface.php index de9484f14..cced7b1d8 100644 --- a/library/Zend/Tool/Framework/Registry/EnabledInterface.php +++ b/library/Zend/Tool/Framework/Registry/EnabledInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EnabledInterface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EnabledInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Registry_EnabledInterface diff --git a/library/Zend/Tool/Framework/Registry/Exception.php b/library/Zend/Tool/Framework/Registry/Exception.php index 6585e2e20..51f490d11 100644 --- a/library/Zend/Tool/Framework/Registry/Exception.php +++ b/library/Zend/Tool/Framework/Registry/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Framework/Exception.php'; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_Registry_Exception extends Zend_Tool_Framework_Exception diff --git a/library/Zend/Tool/Framework/Registry/Interface.php b/library/Zend/Tool/Framework/Registry/Interface.php index 8e9289a42..bd8c687b5 100644 --- a/library/Zend/Tool/Framework/Registry/Interface.php +++ b/library/Zend/Tool/Framework/Registry/Interface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Framework_Registry_Interface diff --git a/library/Zend/Tool/Framework/System/Action/Create.php b/library/Zend/Tool/Framework/System/Action/Create.php index a7e60222e..68d76bf9a 100644 --- a/library/Zend/Tool/Framework/System/Action/Create.php +++ b/library/Zend/Tool/Framework/System/Action/Create.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Create.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Create.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Action_Create extends Zend_Tool_Framework_Action_Base diff --git a/library/Zend/Tool/Framework/System/Action/Delete.php b/library/Zend/Tool/Framework/System/Action/Delete.php index 540747dc9..74f278f39 100644 --- a/library/Zend/Tool/Framework/System/Action/Delete.php +++ b/library/Zend/Tool/Framework/System/Action/Delete.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Delete.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Delete.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Action_Delete extends Zend_Tool_Framework_Action_Base diff --git a/library/Zend/Tool/Framework/System/Manifest.php b/library/Zend/Tool/Framework/System/Manifest.php index e21912221..cfd52bb82 100644 --- a/library/Zend/Tool/Framework/System/Manifest.php +++ b/library/Zend/Tool/Framework/System/Manifest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manifest.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Framework/Manifest/ProviderManifestable.php'; @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Manifest diff --git a/library/Zend/Tool/Framework/System/Provider/Config.php b/library/Zend/Tool/Framework/System/Provider/Config.php index 0040a4369..f19b6f213 100644 --- a/library/Zend/Tool/Framework/System/Provider/Config.php +++ b/library/Zend/Tool/Framework/System/Provider/Config.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,9 +46,9 @@ * @package Zend_Tool * @package Framework * @uses Zend_Tool_Framework_Provider_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 23206 2010-10-21 15:49:31Z ralph $ + * @version $Id: Config.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Provider_Abstract { @@ -59,11 +59,11 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro /** * array of specialties handled by this provider - * + * * @var array */ protected $_specialties = array('Manifest', 'Provider'); - + /** * @param string $type */ diff --git a/library/Zend/Tool/Framework/System/Provider/Manifest.php b/library/Zend/Tool/Framework/System/Provider/Manifest.php index bcb10d3ec..3b7a2f55e 100644 --- a/library/Zend/Tool/Framework/System/Provider/Manifest.php +++ b/library/Zend/Tool/Framework/System/Provider/Manifest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Manifest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Provider_Manifest diff --git a/library/Zend/Tool/Framework/System/Provider/Phpinfo.php b/library/Zend/Tool/Framework/System/Provider/Phpinfo.php index 34de664c7..f500ae6e5 100644 --- a/library/Zend/Tool/Framework/System/Provider/Phpinfo.php +++ b/library/Zend/Tool/Framework/System/Provider/Phpinfo.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phpinfo.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phpinfo.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Framework/Provider/Interface.php'; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Provider_Phpinfo implements Zend_Tool_Framework_Provider_Interface diff --git a/library/Zend/Tool/Framework/System/Provider/Version.php b/library/Zend/Tool/Framework/System/Provider/Version.php index 8876a2e36..4cff5d533 100644 --- a/library/Zend/Tool/Framework/System/Provider/Version.php +++ b/library/Zend/Tool/Framework/System/Provider/Version.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Version.php 22763 2010-08-02 02:59:36Z ramon $ + * @version $Id: Version.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Framework/Registry.php'; @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Framework_System_Provider_Version diff --git a/library/Zend/Tool/Project/Context/Content/Engine.php b/library/Zend/Tool/Project/Context/Content/Engine.php index 6f6f9c6bd..1885fbb7a 100644 --- a/library/Zend/Tool/Project/Context/Content/Engine.php +++ b/library/Zend/Tool/Project/Context/Content/Engine.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Engine.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Engine.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Content_Engine diff --git a/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php b/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php index 96e9eedc8..1e875d1b6 100644 --- a/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php +++ b/library/Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CodeGenerator.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CodeGenerator.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Content_Engine_CodeGenerator diff --git a/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php b/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php index 75ee9bc76..4b92522bc 100644 --- a/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php +++ b/library/Zend/Tool/Project/Context/Content/Engine/Phtml.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Phtml.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Phtml.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Content_Engine_Phtml diff --git a/library/Zend/Tool/Project/Context/Exception.php b/library/Zend/Tool/Project/Context/Exception.php index bcfc1303c..cbc768a00 100644 --- a/library/Zend/Tool/Project/Context/Exception.php +++ b/library/Zend/Tool/Project/Context/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Project/Exception.php'; @@ -24,7 +24,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Exception extends Zend_Tool_Project_Exception diff --git a/library/Zend/Tool/Project/Context/Filesystem/Abstract.php b/library/Zend/Tool/Project/Context/Filesystem/Abstract.php index ccadfd514..08c3fdb46 100644 --- a/library/Zend/Tool/Project/Context/Filesystem/Abstract.php +++ b/library/Zend/Tool/Project/Context/Filesystem/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Project_Context_Filesystem_Abstract implements Zend_Tool_Project_Context_Interface diff --git a/library/Zend/Tool/Project/Context/Filesystem/Directory.php b/library/Zend/Tool/Project/Context/Filesystem/Directory.php index f754558ce..77b4f634b 100644 --- a/library/Zend/Tool/Project/Context/Filesystem/Directory.php +++ b/library/Zend/Tool/Project/Context/Filesystem/Directory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Directory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Directory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Filesystem_Directory extends Zend_Tool_Project_Context_Filesystem_Abstract @@ -41,14 +41,14 @@ class Zend_Tool_Project_Context_Filesystem_Directory extends Zend_Tool_Project_C /** * getName() - * + * * @return string */ public function getName() { return 'directory'; } - + /** * create() * diff --git a/library/Zend/Tool/Project/Context/Filesystem/File.php b/library/Zend/Tool/Project/Context/Filesystem/File.php index 2d7802d49..4e7de251e 100644 --- a/library/Zend/Tool/Project/Context/Filesystem/File.php +++ b/library/Zend/Tool/Project/Context/Filesystem/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20901 2010-02-04 16:06:12Z ralph $ + * @version $Id: File.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,28 +33,28 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Filesystem_File extends Zend_Tool_Project_Context_Filesystem_Abstract { protected $_fileOnlyContext = null; - + protected $_filesystemName = null; - + protected $_content = null; - + /** * getName() - * + * * @return string */ public function getName() { return 'file'; } - + /** * init() * @@ -65,12 +65,12 @@ public function init() if ($this->_resource->hasAttribute('filesystemName')) { $this->_filesystemName = $this->_resource->getAttribute('filesystemName'); } - - // check to see if this file is + + // check to see if this file is if ($this->getName() == 'file') { $this->_initFileOnlyContext(); } - + // @potential-todo check to ensure that this 'file' resource has no children parent::init(); return $this; @@ -89,7 +89,7 @@ public function getPersistentAttributes() } return $returnAttrs; } - + /** * setResource() * @@ -101,10 +101,10 @@ public function setResource(Zend_Tool_Project_Profile_Resource $resource) $this->_resource->setAppendable(false); return $this; } - + /** * getResource() - * + * * @return Zend_Tool_Project_Profile_Resource */ public function getResource() @@ -170,5 +170,5 @@ protected function _initFileOnlyContext() $this->_filesystemName = 'file.txt'; } } - + } diff --git a/library/Zend/Tool/Project/Context/Interface.php b/library/Zend/Tool/Project/Context/Interface.php index 13363fecb..de82a9c83 100644 --- a/library/Zend/Tool/Project/Context/Interface.php +++ b/library/Zend/Tool/Project/Context/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_Interface diff --git a/library/Zend/Tool/Project/Context/Repository.php b/library/Zend/Tool/Project/Context/Repository.php index c38bb14c1..ab01ca63f 100644 --- a/library/Zend/Tool/Project/Context/Repository.php +++ b/library/Zend/Tool/Project/Context/Repository.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Repository.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Repository.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Project/Context/System/Interface.php'; @@ -26,7 +26,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Repository implements Countable diff --git a/library/Zend/Tool/Project/Context/System/Interface.php b/library/Zend/Tool/Project/Context/System/Interface.php index 1395e9b70..3ad866cf7 100644 --- a/library/Zend/Tool/Project/Context/System/Interface.php +++ b/library/Zend/Tool/Project/Context/System/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_System_Interface diff --git a/library/Zend/Tool/Project/Context/System/NotOverwritable.php b/library/Zend/Tool/Project/Context/System/NotOverwritable.php index 0387e2e46..21738c224 100644 --- a/library/Zend/Tool/Project/Context/System/NotOverwritable.php +++ b/library/Zend/Tool/Project/Context/System/NotOverwritable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NotOverwritable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NotOverwritable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_System_NotOverwritable diff --git a/library/Zend/Tool/Project/Context/System/ProjectDirectory.php b/library/Zend/Tool/Project/Context/System/ProjectDirectory.php index af68eeb6a..d3033f082 100644 --- a/library/Zend/Tool/Project/Context/System/ProjectDirectory.php +++ b/library/Zend/Tool/Project/Context/System/ProjectDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProjectDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -48,7 +48,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_System_ProjectDirectory diff --git a/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php b/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php index 3347aac18..d2b1e1cf8 100644 --- a/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php +++ b/library/Zend/Tool/Project/Context/System/ProjectProfileFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProfileFile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: ProjectProfileFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -48,7 +48,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_System_ProjectProfileFile @@ -66,7 +66,7 @@ class Zend_Tool_Project_Context_System_ProjectProfileFile * @var Zend_Tool_Project_Profile */ protected $_profile = null; - + /** * getName() * @@ -76,7 +76,7 @@ public function getName() { return 'ProjectProfileFile'; } - + /** * setProfile() * diff --git a/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php b/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php index e613c34a0..0398ef378 100644 --- a/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php +++ b/library/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProvidersDirectory.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: ProjectProvidersDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -43,7 +43,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_System_ProjectProvidersDirectory @@ -66,13 +66,13 @@ public function getName() { return 'ProjectProvidersDirectory'; } - + public function loadProviders(Zend_Tool_Framework_Registry_Interface $registry) { if (file_exists($this->getPath())) { $providerRepository = $registry->getProviderRepository(); - + foreach (new DirectoryIterator($this->getPath()) as $item) { if ($item->isFile() && (($suffixStart = strpos($item->getFilename(), 'Provider.php')) !== false)) { $className = substr($item->getFilename(), 0, $suffixStart+8); diff --git a/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php b/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php index 041444b2e..5f0ec2971 100644 --- a/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php +++ b/library/Zend/Tool/Project/Context/System/TopLevelRestrictable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TopLevelRestrictable.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TopLevelRestrictable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Context_System_TopLevelRestrictable diff --git a/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php b/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php index f14b61697..50a5522a2 100644 --- a/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php +++ b/library/Zend/Tool/Project/Context/Zf/AbstractClassFile.php @@ -15,11 +15,16 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AbstractClassFile.php 23417 2010-11-20 16:24:35Z ramon $ + * @version $Id: AbstractClassFile.php 24594 2012-01-05 21:27:01Z matthew $ */ +/** + * Zend_Tool_Project_Context_Filesystem_File + */ +// require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; + /** * This class is the front most class for utilizing Zend_Tool_Project * @@ -28,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Project_Context_Zf_AbstractClassFile extends Zend_Tool_Project_Context_Filesystem_File @@ -37,8 +42,8 @@ abstract class Zend_Tool_Project_Context_Zf_AbstractClassFile extends Zend_Tool_ /** * getFullClassName() * - * @param $localClassName - * @param $classContextName + * @param string $localClassName + * @param string $classContextName */ public function getFullClassName($localClassName, $classContextName = null) { @@ -62,7 +67,8 @@ public function getFullClassName($localClassName, $classContextName = null) $prefix = $containingResource->getAttribute('classNamePrefix'); $fullClassName = $prefix; } elseif ($containingResource->getName() == 'ModuleDirectory') { - $prefix = ucfirst($containingResource->getAttribute('moduleName')) . '_'; + $filter = new Zend_Filter_Word_DashToCamelCase(); + $prefix = $filter->filter(ucfirst($containingResource->getAttribute('moduleName'))) . '_'; $fullClassName = $prefix; } } diff --git a/library/Zend/Tool/Project/Context/Zf/ActionMethod.php b/library/Zend/Tool/Project/Context/Zf/ActionMethod.php index 5c7e6ab6a..8bd107ced 100644 --- a/library/Zend/Tool/Project/Context/Zf/ActionMethod.php +++ b/library/Zend/Tool/Project/Context/Zf/ActionMethod.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionMethod.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ActionMethod.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ActionMethod implements Zend_Tool_Project_Context_Interface diff --git a/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php b/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php index f265941ad..9f3e82e49 100644 --- a/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ApisDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ApisDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ApisDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ApisDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php b/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php index ba2e5fb5d..4e15163c7 100644 --- a/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php +++ b/library/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ApplicationConfigFile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: ApplicationConfigFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ApplicationConfigFile extends Zend_Tool_Project_Context_Filesystem_File @@ -48,7 +48,7 @@ class Zend_Tool_Project_Context_Zf_ApplicationConfigFile extends Zend_Tool_Proje * @var string */ protected $_content = null; - + /** * getName() * @@ -94,9 +94,9 @@ public function getContents() } else { $this->_content = $this->_getDefaultContents(); } - + } - + return $this->_content; } @@ -104,11 +104,11 @@ public function getAsZendConfig($section = 'production') { return new Zend_Config_Ini($this->getPath(), $section); } - + /** * addStringItem() - * - * @param string $key + * + * @param string $key * @param string $value * @param string $section * @param bool $quoteValue @@ -120,39 +120,41 @@ public function addStringItem($key, $value, $section = 'production', $quoteValue if ($quoteValue === null) { $quoteValue = preg_match('#[\"\']#', $value) ? false : true; } - + if ($quoteValue == true) { $value = '"' . $value . '"'; } - + $contentLines = preg_split('#[\n\r]#', $this->getContents()); - + $newLines = array(); $insideSection = false; - + foreach ($contentLines as $contentLineIndex => $contentLine) { - + if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) { $insideSection = true; } - + + $newLines[] = $contentLine; if ($insideSection) { // if its blank, or a section heading - if ((trim($contentLine) == null) || (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[')) { + if (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[') { + $newLines[] = $key . ' = ' . $value; + $insideSection = null; + } else if (!isset($contentLines[$contentLineIndex + 1])){ $newLines[] = $key . ' = ' . $value; $insideSection = null; } } - - $newLines[] = $contentLine; } $this->_content = implode("\n", $newLines); return $this; } - + /** - * + * * @param array $item * @param string $section * @param bool $quoteValue @@ -163,18 +165,18 @@ public function addItem($item, $section = 'production', $quoteValue = true) $stringItems = array(); $stringValues = array(); $configKeyNames = array(); - + $rii = new RecursiveIteratorIterator( new RecursiveArrayIterator($item), RecursiveIteratorIterator::SELF_FIRST ); - + $lastDepth = 0; - + // loop through array structure recursively to create proper keys foreach ($rii as $name => $value) { $lastDepth = $rii->getDepth(); - + if (is_array($value)) { array_push($configKeyNames, $name); } else { @@ -182,59 +184,59 @@ public function addItem($item, $section = 'production', $quoteValue = true) $stringValues[] = $value; } } - + foreach ($stringItems as $stringItemIndex => $stringItem) { $this->addStringItem($stringItem, $stringValues[$stringItemIndex], $section, $quoteValue); } - + return $this; } - + public function removeStringItem($key, $section = 'production') { $contentLines = file($this->getPath()); - + $newLines = array(); $insideSection = false; - + foreach ($contentLines as $contentLineIndex => $contentLine) { - + if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) { $insideSection = true; } - + if ($insideSection) { // if its blank, or a section heading if ((trim($contentLine) == null) || ($contentLines[$contentLineIndex + 1][0] == '[')) { $insideSection = null; } } - - if (!preg_match('#' . $key . '\s?=.*#', $contentLine)) { + + if (!preg_match('#' . $key . '\s?=.*#', $contentLine)) { $newLines[] = $contentLine; } } $this->_content = implode('', $newLines); } - + public function removeItem($item, $section = 'production') { $stringItems = array(); $stringValues = array(); $configKeyNames = array(); - + $rii = new RecursiveIteratorIterator( new RecursiveArrayIterator($item), RecursiveIteratorIterator::SELF_FIRST ); - + $lastDepth = 0; - + // loop through array structure recursively to create proper keys foreach ($rii as $name => $value) { $lastDepth = $rii->getDepth(); - + if (is_array($value)) { array_push($configKeyNames, $name); } else { @@ -242,14 +244,14 @@ public function removeItem($item, $section = 'production') $stringValues[] = $value; } } - + foreach ($stringItems as $stringItemIndex => $stringItem) { $this->removeStringItem($stringItem, $section); } - + return $this; } - + protected function _getDefaultContents() { @@ -279,5 +281,5 @@ protected function _getDefaultContents() return $contents; } - + } diff --git a/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php b/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php index ccf5ed5e5..fc8e23d44 100644 --- a/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ApplicationDirectory.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: ApplicationDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ApplicationDirectory extends Zend_Tool_Project_Context_Filesystem_Directory @@ -42,7 +42,7 @@ class Zend_Tool_Project_Context_Zf_ApplicationDirectory extends Zend_Tool_Projec protected $_filesystemName = 'application'; protected $_classNamePrefix = 'Application_'; - + public function init() { if ($this->_resource->hasAttribute('classNamePrefix')) { @@ -50,7 +50,7 @@ public function init() } parent::init(); } - + /** * getPersistentAttributes * @@ -62,17 +62,17 @@ public function getPersistentAttributes() 'classNamePrefix' => $this->getClassNamePrefix() ); } - + public function getName() { return 'ApplicationDirectory'; } - + public function setClassNamePrefix($classNamePrefix) { $this->_classNamePrefix = $classNamePrefix; } - + public function getClassNamePrefix() { return $this->_classNamePrefix; diff --git a/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php b/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php index 61a53e25e..f763d478d 100644 --- a/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php +++ b/library/Zend/Tool/Project/Context/Zf/BootstrapFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: BootstrapFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_BootstrapFile extends Zend_Tool_Project_Context_Filesystem_File @@ -43,12 +43,12 @@ class Zend_Tool_Project_Context_Zf_BootstrapFile extends Zend_Tool_Project_Conte * @var Zend_Tool_Project_Profile_Resource */ protected $_applicationConfigFile = null; - + /** * @var Zend_Tool_Project_Profile_Resource */ protected $_applicationDirectory = null; - + /** * @var Zend_Application */ @@ -98,7 +98,7 @@ public function getContents() return $codeGenFile->generate(); } - + public function getApplicationInstance() { if ($this->_applicationInstance == null) { @@ -106,14 +106,14 @@ public function getApplicationInstance() define('APPLICATION_PATH', $this->_applicationDirectory->getPath()); $applicationOptions = array(); $applicationOptions['config'] = $this->_applicationConfigFile->getPath(); - + $this->_applicationInstance = new Zend_Application( 'development', $applicationOptions ); } } - + return $this->_applicationInstance; } } diff --git a/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php b/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php index 60978a842..f5a9fdcb6 100644 --- a/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/CacheDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CacheDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CacheDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_CacheDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ConfigFile.php b/library/Zend/Tool/Project/Context/Zf/ConfigFile.php index a9064ad04..7d2558584 100644 --- a/library/Zend/Tool/Project/Context/Zf/ConfigFile.php +++ b/library/Zend/Tool/Project/Context/Zf/ConfigFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConfigFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ConfigFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ConfigFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php b/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php index 2b47395e6..fdfd3ad4d 100644 --- a/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ConfigsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ConfigsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ConfigsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ControllerFile.php b/library/Zend/Tool/Project/Context/Zf/ControllerFile.php index 22db27b58..105c2c6bb 100644 --- a/library/Zend/Tool/Project/Context/Zf/ControllerFile.php +++ b/library/Zend/Tool/Project/Context/Zf/ControllerFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ControllerFile.php 23204 2010-10-21 15:35:21Z ralph $ + * @version $Id: ControllerFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Context_Filesystem_File @@ -43,7 +43,7 @@ class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Cont * @var string */ protected $_moduleName = null; - + /** * @var string */ @@ -100,9 +100,11 @@ public function getControllerName() */ public function getContents() { - $className = ($this->_moduleName) ? ucfirst($this->_moduleName) . '_' : ''; - $className .= ucfirst($this->_controllerName) . 'Controller'; + $filter = new Zend_Filter_Word_DashToCamelCase(); + $className = ($this->_moduleName) ? $filter->filter(ucfirst($this->_moduleName)) . '_' : ''; + $className .= ucfirst($this->_controllerName) . 'Controller'; + $codeGenFile = new Zend_CodeGenerator_Php_File(array( 'fileName' => $this->getPath(), 'classes' => array( @@ -134,7 +136,7 @@ public function getContents() 'body' => <<<EOS \$errors = \$this->_getParam('error_handler'); -if (!\$errors) { +if (!\$errors || !\$errors instanceof ArrayObject) { \$this->view->message = 'You have reached the error page'; return; } @@ -143,21 +145,23 @@ public function getContents() case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE: case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER: case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ACTION: - // 404 error -- controller or action not found \$this->getResponse()->setHttpResponseCode(404); + \$priority = Zend_Log::NOTICE; \$this->view->message = 'Page not found'; break; default: // application error \$this->getResponse()->setHttpResponseCode(500); + \$priority = Zend_Log::CRIT; \$this->view->message = 'Application error'; break; } // Log exception, if logger available if (\$log = \$this->getLog()) { - \$log->crit(\$this->view->message, \$errors->exception); + \$log->log(\$this->view->message, \$priority, \$errors->exception); + \$log->log('Request Parameters', \$priority, \$errors->request->getParams()); } // conditionally display exceptions diff --git a/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php b/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php index d5263a95d..12b7a65eb 100644 --- a/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ControllersDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ControllersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ControllersDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ControllersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/DataDirectory.php b/library/Zend/Tool/Project/Context/Zf/DataDirectory.php index fe1bd0e45..18b785bf6 100644 --- a/library/Zend/Tool/Project/Context/Zf/DataDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/DataDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DataDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DataDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DataDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php b/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php index a4d186953..e83f4e18a 100644 --- a/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/DbTableDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: DbTableDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DbTableDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/DbTableFile.php b/library/Zend/Tool/Project/Context/Zf/DbTableFile.php index ce2a53c76..e9660f655 100644 --- a/library/Zend/Tool/Project/Context/Zf/DbTableFile.php +++ b/library/Zend/Tool/Project/Context/Zf/DbTableFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTableFile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: DbTableFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,16 +28,16 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DbTableFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile { protected $_dbTableName = null; - + protected $_actualTableName = null; - + /** * getName() * @@ -59,7 +59,7 @@ public function init() $this->_filesystemName = ucfirst($this->_dbTableName) . '.php'; parent::init(); } - + public function getPersistentAttributes() { return array('dbTableName' => $this->_dbTableName); @@ -68,7 +68,7 @@ public function getPersistentAttributes() public function getContents() { $className = $this->getFullClassName($this->_dbTableName, 'Model_DbTable'); - + $codeGenFile = new Zend_CodeGenerator_Php_File(array( 'fileName' => $this->getPath(), 'classes' => array( @@ -82,11 +82,11 @@ public function getContents() 'defaultValue' => $this->_actualTableName )) ), - + )) ) )); return $codeGenFile->generate(); } - + } diff --git a/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php b/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php index 9bb60eb4c..a603e9bdf 100644 --- a/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/DocsDirectory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: DataDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_DocsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory @@ -53,7 +53,7 @@ public function getName() { return 'DocsDirectory'; } - + public function create(){ parent::create(); } diff --git a/library/Zend/Tool/Project/Context/Zf/FormFile.php b/library/Zend/Tool/Project/Context/Zf/FormFile.php index 16207cf54..c0f82978a 100644 --- a/library/Zend/Tool/Project/Context/Zf/FormFile.php +++ b/library/Zend/Tool/Project/Context/Zf/FormFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormFile.php 23343 2010-11-15 15:33:22Z ramon $ + * @version $Id: FormFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_FormFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile diff --git a/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php b/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php index 10ab96d58..35af5b036 100644 --- a/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/FormsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_FormsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php b/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php index 42d9c5193..ef7a4d796 100644 --- a/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php +++ b/library/Zend/Tool/Project/Context/Zf/HtaccessFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtaccessFile.php 20897 2010-02-04 06:31:52Z ralph $ + * @version $Id: HtaccessFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_HtaccessFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php b/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php index dbccc674a..9b6aad8d1 100644 --- a/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php +++ b/library/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LayoutScriptFile.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: LayoutScriptFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LayoutScriptFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php b/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php index 5387146b6..bd10ca536 100644 --- a/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LayoutScriptsDirectory.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: LayoutScriptsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LayoutScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php b/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php index fc2dd6e58..c892f44ed 100644 --- a/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LayoutsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LayoutsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LayoutsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php b/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php index 8a784d698..197a52f6a 100644 --- a/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/LibraryDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LibraryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LibraryDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php b/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php index d949420b6..30f04ae5e 100644 --- a/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/LocalesDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocalesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocalesDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LocalesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php b/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php index 54c0e3144..e7f5e2807 100644 --- a/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/LogsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LogsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LogsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_LogsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ModelFile.php b/library/Zend/Tool/Project/Context/Zf/ModelFile.php index 4026c0469..a58ec91ce 100644 --- a/library/Zend/Tool/Project/Context/Zf/ModelFile.php +++ b/library/Zend/Tool/Project/Context/Zf/ModelFile.php @@ -15,11 +15,16 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModelFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModelFile.php 24594 2012-01-05 21:27:01Z matthew $ */ +/** + * Zend_Tool_Project_Context_Zf_AbstractClassFile + */ +// require_once 'Zend/Tool/Project/Context/Zf/AbstractClassFile.php'; + /** * This class is the front most class for utilizing Zend_Tool_Project * @@ -28,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModelFile extends Zend_Tool_Project_Context_Zf_AbstractClassFile @@ -38,12 +43,12 @@ class Zend_Tool_Project_Context_Zf_ModelFile extends Zend_Tool_Project_Context_Z * @var string */ protected $_modelName = 'Base'; - + /** * @var string */ protected $_filesystemName = 'modelName'; - + /** * init() * @@ -66,7 +71,7 @@ public function getPersistentAttributes() 'modelName' => $this->getModelName() ); } - + /** * getName() * @@ -81,12 +86,12 @@ public function getModelName() { return $this->_modelName; } - + public function getContents() { - + $className = $this->getFullClassName($this->_modelName, 'Model'); - + $codeGenFile = new Zend_CodeGenerator_Php_File(array( 'fileName' => $this->getPath(), 'classes' => array( @@ -97,6 +102,6 @@ public function getContents() )); return $codeGenFile->generate(); } - - + + } \ No newline at end of file diff --git a/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php b/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php index 8964a48f6..e9487873a 100644 --- a/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ModelsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModelsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModelsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModelsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php b/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php index 2addf5692..c6f3a6c2d 100644 --- a/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ModuleDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModuleDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModuleDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModuleDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php b/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php index 9c4a53038..1ccb6aa27 100644 --- a/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ModulesDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ModulesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ModulesDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ModulesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php b/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php index 2a0e13154..a8033c4c6 100644 --- a/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php +++ b/library/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProviderFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProjectProviderFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ProjectProviderFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php b/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php index 164357109..a6f3f203e 100644 --- a/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/PublicDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php b/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php index cf43c9674..c136930c1 100644 --- a/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicImagesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicImagesDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicImagesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php b/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php index 1a4198e46..b4e07b737 100644 --- a/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php +++ b/library/Zend/Tool/Project/Context/Zf/PublicIndexFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicIndexFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicIndexFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicIndexFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php b/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php index be89c63c3..469d2437e 100644 --- a/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicScriptsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php b/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php index 791e4a167..63db550e7 100644 --- a/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PublicStylesheetsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PublicStylesheetsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_PublicStylesheetsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php b/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php index 90475682f..07f350999 100644 --- a/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchIndexesDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchIndexesDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_SearchIndexesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php b/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php index cac8ad5d4..1f2148c47 100644 --- a/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/SessionsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SessionsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SessionsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_SessionsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php b/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php index 5d0eeaf10..e7453ef02 100644 --- a/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TemporaryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TemporaryDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TemporaryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php new file mode 100644 index 000000000..41fc0bddd --- /dev/null +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php @@ -0,0 +1,229 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: ActionMethod.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Interface + */ +// require_once 'Zend/Tool/Project/Context/Interface.php'; + +/** + * @see Zend_Reflection_File + */ +// require_once 'Zend/Reflection/File.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestApplicationActionMethod implements Zend_Tool_Project_Context_Interface +{ + + /** + * @var Zend_Tool_Project_Profile_Resource + */ + protected $_resource = null; + + /** + * @var Zend_Tool_Project_Profile_Resource + */ + protected $_testApplicationControllerResource = null; + + /** + * @var string + */ + protected $_testApplicationControllerPath = ''; + + /** + * @var string + */ + protected $_forActionName = null; + + /** + * init() + * + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function init() + { + $this->_forActionName = $this->_resource->getAttribute('forActionName'); + + $this->_resource->setAppendable(false); + $this->_testApplicationControllerResource = $this->_resource->getParentResource(); + if (!$this->_testApplicationControllerResource->getContext() instanceof Zend_Tool_Project_Context_Zf_TestApplicationControllerFile) { + // require_once 'Zend/Tool/Project/Context/Exception.php'; + throw new Zend_Tool_Project_Context_Exception('ActionMethod must be a sub resource of a TestApplicationControllerFile'); + } + // make the ControllerFile node appendable so we can tack on the actionMethod. + $this->_resource->getParentResource()->setAppendable(true); + + $this->_testApplicationControllerPath = $this->_testApplicationControllerResource->getContext()->getPath(); + + return $this; + } + + /** + * getPersistentAttributes + * + * @return array + */ + public function getPersistentAttributes() + { + return array( + 'forActionName' => $this->getForActionName() + ); + } + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestApplicationActionMethod'; + } + + /** + * setResource() + * + * @param Zend_Tool_Project_Profile_Resource $resource + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function setResource(Zend_Tool_Project_Profile_Resource $resource) + { + $this->_resource = $resource; + return $this; + } + + /** + * getActionName() + * + * @return string + */ + public function getForActionName() + { + return $this->_forActionName; + } + + /** + * create() + * + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function create() + { + $file = $this->_testApplicationControllerPath; + + if (!file_exists($file)) { + // require_once 'Zend/Tool/Project/Context/Exception.php'; + throw new Zend_Tool_Project_Context_Exception( + 'Could not create action within test controller ' . $file + . ' with action name ' . $this->_forActionName + ); + } + + $actionParam = $this->getForActionName(); + $controllerParam = $this->_resource->getParentResource()->getForControllerName(); + //$moduleParam = null;// + + /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */ + $controllerDirectoryResource = $this->_resource->getParentResource()->getParentResource(); + if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') { + $moduleParam = $controllerDirectoryResource->getParentResource()->getForModuleName(); + } else { + $moduleParam = 'default'; + } + + + + if ($actionParam == 'index' && $controllerParam == 'Index' && $moduleParam == 'default') { + $assert = '$this->assertQueryContentContains("div#welcome h3", "This is your project\'s main page");'; + } else { + $assert = <<<EOS +\$this->assertQueryContentContains( + 'div#view-content p', + 'View script for controller <b>' . \$params['controller'] . '</b> and script/action name <b>' . \$params['action'] . '</b>' + ); +EOS; + } + + $codeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($file, true, true); + $codeGenFile->getClass()->setMethod(array( + 'name' => 'test' . ucfirst($actionParam) . 'Action', + 'body' => <<<EOS +\$params = array('action' => '$actionParam', 'controller' => '$controllerParam', 'module' => '$moduleParam'); +\$urlParams = \$this->urlizeOptions(\$params); +\$url = \$this->url(\$urlParams); +\$this->dispatch(\$url); + +// assertions +\$this->assertModule(\$urlParams['module']); +\$this->assertController(\$urlParams['controller']); +\$this->assertAction(\$urlParams['action']); +$assert + +EOS + )); + + file_put_contents($file, $codeGenFile->generate()); + + return $this; + } + + /** + * delete() + * + * @return Zend_Tool_Project_Context_Zf_ActionMethod + */ + public function delete() + { + // @todo do this + return $this; + } + + /** + * hasActionMethod() + * + * @param string $controllerPath + * @param string $actionName + * @return bool + */ + /* + public static function hasActionMethod($controllerPath, $actionName) + { + if (!file_exists($controllerPath)) { + return false; + } + + $controllerCodeGenFile = Zend_CodeGenerator_Php_File::fromReflectedFileName($controllerPath, true, true); + return $controllerCodeGenFile->getClass()->hasMethod('test' . $actionName . 'Action'); + } + */ + +} \ No newline at end of file diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php index 72b2e1378..5d94c1b94 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationBootstrapFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php index 7086e4b9d..c265caf37 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationControllerDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationControllerDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php index 2fce0aaca..0640398a0 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationControllerFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationControllerFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationControllerFile extends Zend_Tool_Project_Context_Filesystem_File @@ -67,6 +67,27 @@ public function init() return $this; } + /** + * getPersistentAttributes() + * + * @return unknown + */ + public function getPersistentAttributes() + { + $attributes = array(); + + if ($this->_forControllerName) { + $attributes['forControllerName'] = $this->getForControllerName(); + } + + return $attributes; + } + + public function getForControllerName() + { + return $this->_forControllerName; + } + /** * getContents() * @@ -78,23 +99,26 @@ public function getContents() $filter = new Zend_Filter_Word_DashToCamelCase(); $className = $filter->filter($this->_forControllerName) . 'ControllerTest'; - + + /* @var $controllerDirectoryResource Zend_Tool_Project_Profile_Resource */ + $controllerDirectoryResource = $this->_resource->getParentResource(); + if ($controllerDirectoryResource->getParentResource()->getName() == 'TestApplicationModuleDirectory') { + $className = $filter->filter(ucfirst($controllerDirectoryResource->getParentResource()->getForModuleName())) + . '_' . $className; + } + $codeGenFile = new Zend_CodeGenerator_Php_File(array( - 'requiredFiles' => array( - 'PHPUnit/Framework/TestCase.php' - ), 'classes' => array( new Zend_CodeGenerator_Php_Class(array( 'name' => $className, - 'extendedClass' => 'PHPUnit_Framework_TestCase', + 'extendedClass' => 'Zend_Test_PHPUnit_ControllerTestCase', 'methods' => array( new Zend_CodeGenerator_Php_Method(array( 'name' => 'setUp', - 'body' => ' /* Setup Routine */' - )), - new Zend_CodeGenerator_Php_Method(array( - 'name' => 'tearDown', - 'body' => ' /* Tear Down Routine */' + 'body' => <<<EOS +\$this->bootstrap = new Zend_Application(APPLICATION_ENV, APPLICATION_PATH . '/configs/application.ini'); +parent::setUp(); +EOS )) ) )) diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php index 95b999841..cd7d9cf98 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestApplicationDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestApplicationDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestApplicationDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php new file mode 100644 index 000000000..30c811d7f --- /dev/null +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php @@ -0,0 +1,98 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_Directory + */ +// require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestApplicationModuleDirectory extends Zend_Tool_Project_Context_Filesystem_Directory +{ + + + /** + * @var string + */ + protected $_forModuleName = null; + + /** + * @var string + */ + protected $_filesystemName = 'moduleDirectory'; + + /** + * init() + * + * @return Zend_Tool_Project_Context_Zf_ControllerFile + */ + public function init() + { + $this->_filesystemName = $this->_forModuleName = $this->_resource->getAttribute('forModuleName'); + parent::init(); + return $this; + } + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestApplicationModuleDirectory'; + } + + /** + * getPersistentAttributes + * + * @return array + */ + public function getPersistentAttributes() + { + return array( + 'forModuleName' => $this->getForModuleName() + ); + } + + /** + * getModuleName() + * + * @return string + */ + public function getForModuleName() + { + return $this->_forModuleName; + } + + +} \ No newline at end of file diff --git a/library/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php new file mode 100644 index 000000000..1257b9e3e --- /dev/null +++ b/library/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php @@ -0,0 +1,57 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: TestApplicationControllerDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_Directory + */ +// require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestApplicationModulesDirectory extends Zend_Tool_Project_Context_Filesystem_Directory +{ + + /** + * @var string + */ + protected $_filesystemName = 'modules'; + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestApplicationModulesDirectory'; + } + +} \ No newline at end of file diff --git a/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php b/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php index 1b061b258..b232865ec 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php +++ b/library/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryBootstrapFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php index 3dba2d03e..4f33f8cbb 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php b/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php index 359e419e0..89dd0dc83 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php +++ b/library/Zend/Tool/Project/Context/Zf/TestLibraryFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryFile extends Zend_Tool_Project_Context_Filesystem_File diff --git a/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php index 33420771f..f014f9770 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestLibraryNamespaceDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestLibraryNamespaceDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestLibraryNamespaceDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php b/library/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php new file mode 100644 index 000000000..57202f54e --- /dev/null +++ b/library/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php @@ -0,0 +1,88 @@ +<?php +/** + * Zend Framework + * + * LICENSE + * + * This source file is subject to the new BSD license that is bundled + * with this package in the file LICENSE.txt. + * It is also available through the world-wide-web at this URL: + * http://framework.zend.com/license/new-bsd + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@zend.com so we can send you a copy immediately. + * + * @category Zend + * @package Zend_Tool + * @subpackage Framework + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * @version $Id: TestApplicationBootstrapFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + */ + +/** + * @see Zend_Tool_Project_Context_Filesystem_File + */ +// require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; + +/** + * This class is the front most class for utilizing Zend_Tool_Project + * + * A profile is a hierarchical set of resources that keep track of + * items within a specific project. + * + * @category Zend + * @package Zend_Tool + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ +class Zend_Tool_Project_Context_Zf_TestPHPUnitBootstrapFile extends Zend_Tool_Project_Context_Filesystem_File +{ + + /** + * @var string + */ + protected $_filesystemName = 'bootstrap.php'; + + /** + * getName() + * + * @return string + */ + public function getName() + { + return 'TestPHPUnitBootstrapFile'; + } + + /** + * getContents() + * + * @return string + */ + public function getContents() + { + $codeGenerator = new Zend_CodeGenerator_Php_File(array( + 'body' => <<<EOS +// Define path to application directory +defined('APPLICATION_PATH') + || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application')); + +// Define application environment +defined('APPLICATION_ENV') + || define('APPLICATION_ENV', (getenv('APPLICATION_ENV') ? getenv('APPLICATION_ENV') : 'testing')); + +// Ensure library/ is on include_path +set_include_path(implode(PATH_SEPARATOR, array( + realpath(APPLICATION_PATH . '/../library'), + get_include_path(), +))); + +// require_once 'Zend/Loader/Autoloader.php'; +Zend_Loader_Autoloader::getInstance(); + +EOS + )); + return $codeGenerator->generate(); + } + +} diff --git a/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php b/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php index d4830afc7..e05329aa4 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php +++ b/library/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestPHPUnitConfigFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestPHPUnitConfigFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestPHPUnitConfigFile extends Zend_Tool_Project_Context_Filesystem_File @@ -53,5 +53,29 @@ public function getName() { return 'TestPHPUnitConfigFile'; } + + public function getContents() + { + return <<<EOS +<phpunit bootstrap="./bootstrap.php"> + <testsuite name="Application Test Suite"> + <directory>./application</directory> + </testsuite> + <testsuite name="Library Test Suite"> + <directory>./library</directory> + </testsuite> + + <filter> + <!-- If Zend Framework is inside your project's library, uncomment this filter --> + <!-- + <whitelist> + <directory suffix=".php">../../library/Zend</directory> + </whitelist> + --> + </filter> +</phpunit> + +EOS; + } } diff --git a/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php b/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php index 941c555df..e09199e15 100644 --- a/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/TestsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TestsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TestsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_TestsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php b/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php index 5709d84a8..d05aaefa3 100644 --- a/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/UploadsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: UploadsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: UploadsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_UploadsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php b/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php index 0cfe7edaa..5959cc5c3 100644 --- a/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewControllerScriptsDirectory.php 23343 2010-11-15 15:33:22Z ramon $ + * @version $Id: ViewControllerScriptsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -49,7 +49,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewControllerScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php b/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php index 317c21163..9a3a19206 100644 --- a/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewFiltersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewFiltersDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewFiltersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php b/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php index 52fc7fb3a..9a9df1cd0 100644 --- a/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewHelpersDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewHelpersDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewHelpersDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php b/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php index 1b8fee9c3..810b40adc 100644 --- a/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php +++ b/library/Zend/Tool/Project/Context/Zf/ViewScriptFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewScriptFile.php 23343 2010-11-15 15:33:22Z ramon $ + * @version $Id: ViewScriptFile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -49,7 +49,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewScriptFile extends Zend_Tool_Project_Context_Filesystem_File @@ -130,6 +130,18 @@ public function getContents() { $contents = ''; + $controllerName = $this->_resource->getParentResource()->getAttribute('forControllerName'); + + $viewsDirectoryResource = $this->_resource + ->getParentResource() // view script + ->getParentResource() // view controller dir + ->getParentResource(); // views dir + if ($viewsDirectoryResource->getParentResource()->getName() == 'ModuleDirectory') { + $moduleName = $viewsDirectoryResource->getParentResource()->getModuleName(); + } else { + $moduleName = 'default'; + } + if ($this->_filesystemName == 'error.phtml') { // should also check that the above directory is forController=error $contents .= <<<EOS <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> @@ -143,7 +155,7 @@ public function getContents() <h2><?php echo \$this->message ?></h2> <?php if (isset(\$this->exception)): ?> - + <h3>Exception information:</h3> <p> <b>Message:</b> <?php echo \$this->exception->getMessage() ?> @@ -154,15 +166,16 @@ public function getContents() </pre> <h3>Request Parameters:</h3> - <pre><?php echo var_export(\$this->request->getParams(), true) ?> + <pre><?php echo \$this->escape(var_export(\$this->request->getParams(), true)) ?> </pre> + <?php endif ?> </body> </html> EOS; - } elseif ($this->_forActionName == 'index' && $this->_resource->getParentResource()->getAttribute('forControllerName') == 'Index') { + } elseif ($this->_forActionName == 'index' && $controllerName == 'Index' && $moduleName == 'default') { $contents =<<<EOS <style> @@ -211,8 +224,14 @@ public function getContents() EOS; } else { - $contents = '<br /><br /><center>View script for controller <b>' . $this->_resource->getParentResource()->getAttribute('forControllerName') . '</b>' - . ' and script/action name <b>' . $this->_forActionName . '</b></center>'; + $controllerName = $this->_resource->getParentResource()->getAttribute('forControllerName'); + $actionName = $this->_forActionName; + $contents = <<<EOS +<br /><br /> +<div id="view-content"> + <p>View script for controller <b>$controllerName</b> and script/action name <b>$actionName</b></p> +</div> +EOS; } return $contents; } diff --git a/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php b/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php index df2608f6e..5127b14a6 100644 --- a/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewScriptsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewScriptsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewScriptsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php b/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php index 69d3f8a35..386ff3844 100644 --- a/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ViewsDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewsDirectory.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ViewsDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ViewsDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php b/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php index 91115bd89..4ef9317cd 100644 --- a/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php +++ b/library/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZfStandardLibraryDirectory.php 20904 2010-02-04 16:18:18Z matthew $ + * @version $Id: ZfStandardLibraryDirectory.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Context_Zf_ZfStandardLibraryDirectory extends Zend_Tool_Project_Context_Filesystem_Directory diff --git a/library/Zend/Tool/Project/Exception.php b/library/Zend/Tool/Project/Exception.php index 211b0525a..5a57a7d42 100644 --- a/library/Zend/Tool/Project/Exception.php +++ b/library/Zend/Tool/Project/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Exception extends Zend_Exception diff --git a/library/Zend/Tool/Project/Profile.php b/library/Zend/Tool/Project/Profile.php index 9eb75181c..91488929e 100644 --- a/library/Zend/Tool/Project/Profile.php +++ b/library/Zend/Tool/Project/Profile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profile.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Profile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Container @@ -48,7 +48,7 @@ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Conta * @var bool */ protected static $_traverseEnabled = false; - + /** * Constructor, standard usage would allow the setting of options * diff --git a/library/Zend/Tool/Project/Profile/Exception.php b/library/Zend/Tool/Project/Profile/Exception.php index e5adbdd1c..a8b1a07f6 100644 --- a/library/Zend/Tool/Project/Profile/Exception.php +++ b/library/Zend/Tool/Project/Profile/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Exception extends Zend_Tool_Project_Exception diff --git a/library/Zend/Tool/Project/Profile/FileParser/Interface.php b/library/Zend/Tool/Project/Profile/FileParser/Interface.php index 4021c36f4..5f3833075 100644 --- a/library/Zend/Tool/Project/Profile/FileParser/Interface.php +++ b/library/Zend/Tool/Project/Profile/FileParser/Interface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Tool_Project_Profile_FileParser_Interface diff --git a/library/Zend/Tool/Project/Profile/FileParser/Xml.php b/library/Zend/Tool/Project/Profile/FileParser/Xml.php index 5a4bfb41c..2d8efefcb 100644 --- a/library/Zend/Tool/Project/Profile/FileParser/Xml.php +++ b/library/Zend/Tool/Project/Profile/FileParser/Xml.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Xml.php 24594 2012-01-05 21:27:01Z matthew $ */ // require_once 'Zend/Tool/Project/Profile/FileParser/Interface.php'; @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_FileParser_Xml implements Zend_Tool_Project_Profile_FileParser_Interface @@ -72,11 +72,11 @@ public function serialize(Zend_Tool_Project_Profile $profile) if ($profile->hasAttribute('type')) { $xmlElement->addAttribute('type', $profile->getAttribute('type')); } - + if ($profile->hasAttribute('version')) { $xmlElement->addAttribute('version', $profile->getAttribute('version')); } - + self::_serializeRecurser($profile, $xmlElement); $doc = new DOMDocument('1.0'); @@ -111,15 +111,15 @@ public function unserialize($data, Zend_Tool_Project_Profile $profile) if ($xmlDataIterator->getName() != 'projectProfile') { throw new Exception('Profiles must start with a projectProfile node'); } - + if (isset($xmlDataIterator['type'])) { $this->_profile->setAttribute('type', (string) $xmlDataIterator['type']); } - + if (isset($xmlDataIterator['version'])) { $this->_profile->setAttribute('version', (string) $xmlDataIterator['version']); } - + // start un-serialization of the xml doc $this->_unserializeRecurser($xmlDataIterator); diff --git a/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php b/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php index 9c94c9a9d..5fd284f2d 100644 --- a/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php +++ b/library/Zend/Tool/Project/Profile/Iterator/ContextFilter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContextFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ContextFilter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Iterator_ContextFilter extends RecursiveFilterIterator @@ -135,7 +135,7 @@ public function setAcceptNames($acceptNames) foreach ($acceptNames as $n => $v) { $acceptNames[$n] = strtolower($v); } - + $this->_acceptNames = $acceptNames; return $this; } @@ -155,7 +155,7 @@ public function setDenyNames($denyNames) foreach ($denyNames as $n => $v) { $denyNames[$n] = strtolower($v); } - + $this->_denyNames = $denyNames; return $this; } diff --git a/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php b/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php index dee203720..eef914326 100644 --- a/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php +++ b/library/Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EnabledResourceFilter.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: EnabledResourceFilter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter extends RecursiveFilterIterator diff --git a/library/Zend/Tool/Project/Profile/Resource.php b/library/Zend/Tool/Project/Profile/Resource.php index 7157d8c3b..8399d558c 100644 --- a/library/Zend/Tool/Project/Profile/Resource.php +++ b/library/Zend/Tool/Project/Profile/Resource.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Resource.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Resource extends Zend_Tool_Project_Profile_Resource_Container diff --git a/library/Zend/Tool/Project/Profile/Resource/Container.php b/library/Zend/Tool/Project/Profile/Resource/Container.php index dc8c9fbab..ee63d96c4 100644 --- a/library/Zend/Tool/Project/Profile/Resource/Container.php +++ b/library/Zend/Tool/Project/Profile/Resource/Container.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Container.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, Countable @@ -50,7 +50,7 @@ class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, * @var bool */ protected $_appendable = true; - + /** * @var array */ @@ -253,10 +253,10 @@ public function getAttribute($name) { return (array_key_exists($name, $this->_attributes)) ? $this->_attributes[$name] : null; } - + /** * hasAttribute() - * + * * @param string $name * @return bool */ diff --git a/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php b/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php index f087d5df6..b41840240 100644 --- a/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php +++ b/library/Zend/Tool/Project/Profile/Resource/SearchConstraints.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SearchConstraints.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: SearchConstraints.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Profile_Resource_SearchConstraints diff --git a/library/Zend/Tool/Project/Provider/Abstract.php b/library/Zend/Tool/Project/Provider/Abstract.php index dae7c0dea..b8ecbac87 100644 --- a/library/Zend/Tool/Project/Provider/Abstract.php +++ b/library/Zend/Tool/Project/Provider/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23202 2010-10-21 15:08:15Z ralph $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -50,7 +50,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Tool_Project_Provider_Abstract @@ -77,7 +77,7 @@ public function initialize() { // initialize the ZF Contexts (only once per php request) if (!self::$_isInitialized) { - + // load all base contexts ONCE $contextRegistry = Zend_Tool_Project_Context_Repository::getInstance(); $contextRegistry->addContextsFromDirectory( @@ -86,7 +86,7 @@ public function initialize() $contextRegistry->addContextsFromDirectory( dirname(dirname(__FILE__)) . '/Context/Filesystem/', 'Zend_Tool_Project_Context_Filesystem_' ); - + // determine if there are project specfic providers ONCE $profilePath = $this->_findProfileDirectory(); if ($this->_hasProjectProviderDirectory($profilePath . DIRECTORY_SEPARATOR . '.zfproject.xml')) { @@ -95,7 +95,7 @@ public function initialize() $ppd = $profile->search('ProjectProvidersDirectory'); $ppd->loadProviders($this->_registry); } - + self::$_isInitialized = true; } @@ -118,9 +118,9 @@ public function getContextClasses() * - if an enpoint variable has been registered in teh client registry - key=workingDirectory * - if an ENV variable with the key ZFPROJECT_PATH is found * - * @param $loadProfileFlag bool Whether or not to throw an exception when no profile is found - * @param $projectDirectory string The project directory to use to search - * @param $searchParentDirectories bool Whether or not to search upper level direcotries + * @param bool $loadProfileFlag Whether or not to throw an exception when no profile is found + * @param string $projectDirectory The project directory to use to search + * @param bool $searchParentDirectories Whether or not to search upper level direcotries * @return Zend_Tool_Project_Profile */ protected function _loadProfile($loadProfileFlag = self::NO_PROFILE_THROW_EXCEPTION, $projectDirectory = null, $searchParentDirectories = true) @@ -134,14 +134,14 @@ protected function _loadProfile($loadProfileFlag = self::NO_PROFILE_THROW_EXCEPT return false; } } - + $profile = new Zend_Tool_Project_Profile(); $profile->setAttribute('projectDirectory', $foundPath); $profile->loadFromFile(); $this->_loadedProfile = $profile; return $profile; } - + protected function _findProfileDirectory($projectDirectory = null, $searchParentDirectories = true) { // use the cwd if no directory was provided @@ -166,7 +166,7 @@ protected function _findProfileDirectory($projectDirectory = null, $searchParent unset($profile); return $projectDirectoryAssembled; } - + // break after first run if we are not to check upper directories if ($searchParentDirectories == false) { break; @@ -174,10 +174,10 @@ protected function _findProfileDirectory($projectDirectory = null, $searchParent array_pop($parentDirectoriesArray); } - + return false; } - + /** * Load the project profile from the current working directory, if not throw exception * @@ -248,19 +248,19 @@ protected function _hasProjectProviderDirectory($pathToProfileFile) if (!file_exists($pathToProfileFile)) { return false; } - + $contents = file_get_contents($pathToProfileFile); if (strstr($contents, '<projectProvidersDirectory') === false) { return false; } - + if (strstr($contents, '<projectProvidersDirectory enabled="false"')) { return false; } - + return true; } - + /** * _loadContextClassesIntoRegistry() - This is called by the constructor * so that child providers can provide a list of contexts to load into the diff --git a/library/Zend/Tool/Project/Provider/Action.php b/library/Zend/Tool/Project/Provider/Action.php index 24850e524..e54c4c33e 100644 --- a/library/Zend/Tool/Project/Provider/Action.php +++ b/library/Zend/Tool/Project/Provider/Action.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Action.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Action @@ -92,7 +92,7 @@ public static function hasResource(Zend_Tool_Project_Profile $profile, $actionNa if ($controllerFile == null) { throw new Zend_Tool_Project_Provider_Exception('Controller ' . $controllerName . ' was not found.'); } - + return (($controllerFile->search(array('actionMethod' => array('actionName' => $actionName)))) instanceof Zend_Tool_Project_Profile_Resource); } @@ -131,33 +131,50 @@ public function create($name, $controllerName = 'Index', $viewIncluded = true, $ $this->_loadProfile(); + // get request/response object + $request = $this->_registry->getRequest(); + $response = $this->_registry->getResponse(); + + // determine if testing is enabled in the project + // require_once 'Zend/Tool/Project/Provider/Test.php'; + $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); + + if ($testingEnabled && !Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $testingEnabled = false; + $response->appendContent( + 'Note: PHPUnit is required in order to generate controller test stubs.', + array('color' => array('yellow')) + ); + } + // Check that there is not a dash or underscore, return if doesnt match regex if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Action names should be camel cased.'); } - + $originalName = $name; $originalControllerName = $controllerName; - + // ensure it is camelCase (lower first letter) $name = strtolower(substr($name, 0, 1)) . substr($name, 1); - + // ensure controller is MixedCase $controllerName = ucfirst($controllerName); - + if (self::hasResource($this->_loadedProfile, $name, $controllerName, $module)) { throw new Zend_Tool_Project_Provider_Exception('This controller (' . $controllerName . ') already has an action named (' . $name . ')'); } - - $actionMethod = self::createResource($this->_loadedProfile, $name, $controllerName, $module); - // get request/response object - $request = $this->_registry->getRequest(); - $response = $this->_registry->getResponse(); - + $actionMethodResource = self::createResource($this->_loadedProfile, $name, $controllerName, $module); + + $testActionMethodResource = null; + if ($testingEnabled) { + $testActionMethodResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $controllerName, $name, $module); + } + // alert the user about inline converted names $tense = (($request->isPretend()) ? 'would be' : 'is'); - + if ($name !== $originalName) { $response->appendContent( 'Note: The canonical action name that ' . $tense @@ -166,7 +183,7 @@ public function create($name, $controllerName = 'Index', $viewIncluded = true, $ array('color' => array('yellow')) ); } - + if ($controllerName !== $originalControllerName) { $response->appendContent( 'Note: The canonical controller name that ' . $tense @@ -175,20 +192,31 @@ public function create($name, $controllerName = 'Index', $viewIncluded = true, $ array('color' => array('yellow')) ); } - + unset($tense); - + if ($request->isPretend()) { $response->appendContent( 'Would create an action named ' . $name . - ' inside controller at ' . $actionMethod->getParentResource()->getContext()->getPath() + ' inside controller at ' . $actionMethodResource->getParentResource()->getContext()->getPath() ); + + if ($testActionMethodResource) { + $response->appendContent('Would create an action test in ' . $testActionMethodResource->getParentResource()->getContext()->getPath()); + } + } else { $response->appendContent( 'Creating an action named ' . $name . - ' inside controller at ' . $actionMethod->getParentResource()->getContext()->getPath() + ' inside controller at ' . $actionMethodResource->getParentResource()->getContext()->getPath() ); - $actionMethod->create(); + $actionMethodResource->create(); + + if ($testActionMethodResource) { + $response->appendContent('Creating an action test in ' . $testActionMethodResource->getParentResource()->getContext()->getPath()); + $testActionMethodResource->create(); + } + $this->_storeProfile(); } diff --git a/library/Zend/Tool/Project/Provider/Application.php b/library/Zend/Tool/Project/Provider/Application.php index bdd2b068c..021d9352c 100644 --- a/library/Zend/Tool/Project/Provider/Application.php +++ b/library/Zend/Tool/Project/Provider/Application.php @@ -15,39 +15,39 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Application.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Application.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Project_Provider_Application +class Zend_Tool_Project_Provider_Application extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable { - + protected $_specialties = array('ClassNamePrefix'); - + /** - * - * @param $classNamePrefix Prefix of classes - * @param $force + * + * @param string $classNamePrefix Prefix of classes + * @param bool $force */ public function changeClassNamePrefix($classNamePrefix /* , $force = false */) { $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $originalClassNamePrefix = $classNamePrefix; - + if (substr($classNamePrefix, -1) != '_') { $classNamePrefix .= '_'; } - + $configFileResource = $profile->search('ApplicationConfigFile'); $zc = $configFileResource->getAsZendConfig('production'); if ($zc->appnamespace == $classNamePrefix) { @@ -57,31 +57,31 @@ public function changeClassNamePrefix($classNamePrefix /* , $force = false */) // remove the old $configFileResource->removeStringItem('appnamespace', 'production'); $configFileResource->create(); - + // add the new $configFileResource->addStringItem('appnamespace', $classNamePrefix, 'production', true); $configFileResource->create(); - + // update the project profile $applicationDirectory = $profile->search('ApplicationDirectory'); $applicationDirectory->setClassNamePrefix($classNamePrefix); $response = $this->_registry->getResponse(); - + if ($originalClassNamePrefix !== $classNamePrefix) { $response->appendContent( 'Note: the name provided "' . $originalClassNamePrefix . '" was' . ' altered to "' . $classNamePrefix . '" for correctness.', array('color' => 'yellow') ); - } - + } + // note to the user $response->appendContent('Note: All existing models will need to be altered to this new namespace by hand', array('color' => 'yellow')); $response->appendContent('application.ini updated with new appnamespace ' . $classNamePrefix); - + // store profile $this->_storeProfile(); } - + } diff --git a/library/Zend/Tool/Project/Provider/Controller.php b/library/Zend/Tool/Project/Provider/Controller.php index b604f5de3..337ab7767 100644 --- a/library/Zend/Tool/Project/Provider/Controller.php +++ b/library/Zend/Tool/Project/Provider/Controller.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Controller.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Controller.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Controller @@ -57,7 +57,7 @@ public static function createResource(Zend_Tool_Project_Profile $profile, $contr } $newController = $controllersDirectory->createResource( - 'controllerFile', + 'controllerFile', array('controllerName' => $controllerName, 'moduleName' => $moduleName) ); @@ -70,7 +70,7 @@ public static function createResource(Zend_Tool_Project_Profile $profile, $contr * @param Zend_Tool_Project_Profile $profile * @param string $controllerName * @param string $moduleName - * @return Zend_Tool_Project_Profile_Resource + * @return boolean */ public static function hasResource(Zend_Tool_Project_Profile $profile, $controllerName, $moduleName = null) { @@ -79,7 +79,7 @@ public static function hasResource(Zend_Tool_Project_Profile $profile, $controll } $controllersDirectory = self::_getControllersDirectoryResource($profile, $moduleName); - return (($controllersDirectory->search(array('controllerFile' => array('controllerName' => $controllerName)))) instanceof Zend_Tool_Project_Profile_Resource); + return ($controllersDirectory &&($controllersDirectory->search(array('controllerFile' => array('controllerName' => $controllerName)))) instanceof Zend_Tool_Project_Profile_Resource); } /** @@ -112,10 +112,25 @@ public function create($name, $indexActionIncluded = true, $module = null) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); + // get request & response + $request = $this->_registry->getRequest(); + $response = $this->_registry->getResponse(); + // determine if testing is enabled in the project // require_once 'Zend/Tool/Project/Provider/Test.php'; $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); + if ($testingEnabled && !Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $testingEnabled = false; + $response->appendContent( + 'Note: PHPUnit is required in order to generate controller test stubs.', + array('color' => array('yellow')) + ); + } + + $originalName = $name; + $name = ucfirst($name); + if (self::hasResource($this->_loadedProfile, $name, $module)) { throw new Zend_Tool_Project_Provider_Exception('This project already has a controller named ' . $name); } @@ -124,14 +139,7 @@ public function create($name, $indexActionIncluded = true, $module = null) if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Controller names should be camel cased.'); } - - $originalName = $name; - $name = ucfirst($name); - - // get request & response - $request = $this->_registry->getRequest(); - $response = $this->_registry->getResponse(); - + try { $controllerResource = self::createResource($this->_loadedProfile, $name, $module); if ($indexActionIncluded) { @@ -139,7 +147,7 @@ public function create($name, $indexActionIncluded = true, $module = null) $indexActionViewResource = Zend_Tool_Project_Provider_View::createResource($this->_loadedProfile, 'index', $name, $module); } if ($testingEnabled) { - $testControllerResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module); + $testActionResource = Zend_Tool_Project_Provider_Test::createApplicationResource($this->_loadedProfile, $name, 'index', $module); } } catch (Exception $e) { @@ -158,19 +166,19 @@ public function create($name, $indexActionIncluded = true, $module = null) ); unset($tense); } - + // do the creation if ($request->isPretend()) { - + $response->appendContent('Would create a controller at ' . $controllerResource->getContext()->getPath()); if (isset($indexActionResource)) { $response->appendContent('Would create an index action method in controller ' . $name); $response->appendContent('Would create a view script for the index action method at ' . $indexActionViewResource->getContext()->getPath()); } - - if ($testControllerResource) { - $response->appendContent('Would create a controller test file at ' . $testControllerResource->getContext()->getPath()); + + if ($testingEnabled) { + $response->appendContent('Would create a controller test file at ' . $testActionResource->getParentResource()->getContext()->getPath()); } } else { @@ -185,9 +193,10 @@ public function create($name, $indexActionIncluded = true, $module = null) $indexActionViewResource->create(); } - if ($testControllerResource) { - $response->appendContent('Creating a controller test file at ' . $testControllerResource->getContext()->getPath()); - $testControllerResource->create(); + if ($testingEnabled) { + $response->appendContent('Creating a controller test file at ' . $testActionResource->getParentResource()->getContext()->getPath()); + $testActionResource->getParentResource()->create(); + $testActionResource->create(); } $this->_storeProfile(); diff --git a/library/Zend/Tool/Project/Provider/DbAdapter.php b/library/Zend/Tool/Project/Provider/DbAdapter.php index f78d864ee..2ad062dae 100644 --- a/library/Zend/Tool/Project/Provider/DbAdapter.php +++ b/library/Zend/Tool/Project/Provider/DbAdapter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbAdapter.php 20852 2010-02-02 21:59:18Z ralph $ + * @version $Id: DbAdapter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,46 +33,46 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_DbAdapter extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Interactable, Zend_Tool_Framework_Provider_Pretendable { - + protected $_appConfigFilePath = null; - + protected $_config = null; - + protected $_sectionName = 'production'; - + public function configure($dsn = null, /* $interactivelyPrompt = false, */ $sectionName = 'production') { $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $appConfigFileResource = $profile->search('applicationConfigFile'); - + if ($appConfigFileResource == false) { throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.'); } - + $this->_appConfigFilePath = $appConfigFileResource->getPath(); - + $this->_config = new Zend_Config_Ini($this->_appConfigFilePath, null, array('skipExtends' => true, 'allowModifications' => true)); - + if ($sectionName != 'production') { $this->_sectionName = $sectionName; } - + if (!isset($this->_config->{$this->_sectionName})) { throw new Zend_Tool_Project_Exception('The config does not have a ' . $this->_sectionName . ' section.'); } - + if (isset($this->_config->{$this->_sectionName}->resources->db)) { throw new Zend_Tool_Project_Exception('The config already has a db resource configured in section ' . $this->_sectionName . '.'); } - + if ($dsn) { $this->_configureViaDSN($dsn); //} elseif ($interactivelyPrompt) { @@ -80,44 +80,44 @@ public function configure($dsn = null, /* $interactivelyPrompt = false, */ $sect } else { $this->_registry->getResponse()->appendContent('Nothing to do!'); } - - + + } - + protected function _configureViaDSN($dsn) { $dsnVars = array(); - + if (strpos($dsn, '=') === false) { throw new Zend_Tool_Project_Provider_Exception('At least one name value pair is expected, typcially ' - . 'in the format of "adapter=Mysqli&username=uname&password=mypass&dbname=mydb"' + . 'in the format of "adapter=Mysqli&username=uname&password=mypass&dbname=mydb"' ); } - + parse_str($dsn, $dsnVars); // parse_str suffers when magic_quotes is enabled if (get_magic_quotes_gpc()) { array_walk_recursive($dsnVars, array($this, '_cleanMagicQuotesInValues')); } - + $dbConfigValues = array('resources' => array('db' => null)); - + if (isset($dsnVars['adapter'])) { $dbConfigValues['resources']['db']['adapter'] = $dsnVars['adapter']; unset($dsnVars['adapter']); } - + $dbConfigValues['resources']['db']['params'] = $dsnVars; - + $isPretend = $this->_registry->getRequest()->isPretend(); // get the config resource $applicationConfig = $this->_loadedProfile->search('ApplicationConfigFile'); $applicationConfig->addItem($dbConfigValues, $this->_sectionName, null); - + $response = $this->_registry->getResponse(); - + if ($isPretend) { $response->appendContent('A db configuration for the ' . $this->_sectionName . ' section would be written to the application config file with the following contents: ' @@ -130,10 +130,10 @@ protected function _configureViaDSN($dsn) ); } } - + protected function _cleanMagicQuotesInValues(&$value, $key) { $value = stripslashes($value); } - + } diff --git a/library/Zend/Tool/Project/Provider/DbTable.php b/library/Zend/Tool/Project/Provider/DbTable.php index 729f1294a..02e2953fa 100644 --- a/library/Zend/Tool/Project/Provider/DbTable.php +++ b/library/Zend/Tool/Project/Provider/DbTable.php @@ -15,29 +15,29 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: DbTable.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Tool_Project_Provider_DbTable +class Zend_Tool_Project_Provider_DbTable extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable { - + protected $_specialties = array('FromDatabase'); - + /** * @var Zend_Filter */ protected $_nameFilter = null; - + public static function createResource(Zend_Tool_Project_Profile $profile, $dbTableName, $actualTableName, $moduleName = null) { $profileSearchParams = array(); @@ -47,25 +47,25 @@ public static function createResource(Zend_Tool_Project_Profile $profile, $dbTab } $profileSearchParams[] = 'modelsDirectory'; - + $modelsDirectory = $profile->search($profileSearchParams); - + if (!($modelsDirectory instanceof Zend_Tool_Project_Profile_Resource)) { throw new Zend_Tool_Project_Provider_Exception( 'A models directory was not found' . (($moduleName) ? ' for module ' . $moduleName . '.' : '.') ); } - + if (!($dbTableDirectory = $modelsDirectory->search('DbTableDirectory'))) { $dbTableDirectory = $modelsDirectory->createResource('DbTableDirectory'); } - + $dbTableFile = $dbTableDirectory->createResource('DbTableFile', array('dbTableName' => $dbTableName, 'actualTableName' => $actualTableName)); - + return $dbTableFile; } - + public static function hasResource(Zend_Tool_Project_Profile $profile, $dbTableName, $moduleName = null) { $profileSearchParams = array(); @@ -75,20 +75,20 @@ public static function hasResource(Zend_Tool_Project_Profile $profile, $dbTableN } $profileSearchParams[] = 'modelsDirectory'; - + $modelsDirectory = $profile->search($profileSearchParams); - + if (!($modelsDirectory instanceof Zend_Tool_Project_Profile_Resource) || !($dbTableDirectory = $modelsDirectory->search('DbTableDirectory'))) { return false; } - + $dbTableFile = $dbTableDirectory->search(array('DbTableFile' => array('dbTableName' => $dbTableName))); - + return ($dbTableFile instanceof Zend_Tool_Project_Profile_Resource) ? true : false; } - - + + public function create($name, $actualTableName, $module = null, $forceOverwrite = false) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); @@ -97,14 +97,14 @@ public function create($name, $actualTableName, $module = null, $forceOverwrite if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('DbTable names should be camel cased.'); } - + $originalName = $name; $name = ucfirst($name); - + if ($actualTableName == '') { throw new Zend_Tool_Project_Provider_Exception('You must provide both the DbTable name as well as the actual db table\'s name.'); } - + if (self::hasResource($this->_loadedProfile, $name, $module)) { throw new Zend_Tool_Project_Provider_Exception('This project already has a DbTable named ' . $name); } @@ -112,10 +112,10 @@ public function create($name, $actualTableName, $module = null, $forceOverwrite // get request/response object $request = $this->_registry->getRequest(); $response = $this->_registry->getResponse(); - + // alert the user about inline converted names $tense = (($request->isPretend()) ? 'would be' : 'is'); - + if ($name !== $originalName) { $response->appendContent( 'Note: The canonical model name that ' . $tense @@ -124,7 +124,7 @@ public function create($name, $actualTableName, $module = null, $forceOverwrite array('color' => array('yellow')) ); } - + try { $tableResource = self::createResource($this->_loadedProfile, $name, $actualTableName, $module); } catch (Exception $e) { @@ -142,38 +142,43 @@ public function create($name, $actualTableName, $module = null, $forceOverwrite $this->_storeProfile(); } } - + + /** + * @param string $module Module name action should be applied to. + * @param bool $forceOverwrite Whether should force overwriting previous classes generated + * @return void + */ public function createFromDatabase($module = null, $forceOverwrite = false) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $bootstrapResource = $this->_loadedProfile->search('BootstrapFile'); - + /* @var $zendApp Zend_Application */ $zendApp = $bootstrapResource->getApplicationInstance(); - + try { $zendApp->bootstrap('db'); } catch (Zend_Application_Exception $e) { throw new Zend_Tool_Project_Provider_Exception('Db resource not available, you might need to configure a DbAdapter.'); return; } - + /* @var $db Zend_Db_Adapter_Abstract */ $db = $zendApp->getBootstrap()->getResource('db'); - + $tableResources = array(); foreach ($db->listTables() as $actualTableName) { - + $dbTableName = $this->_convertTableNameToClassName($actualTableName); - + if (!$forceOverwrite && self::hasResource($this->_loadedProfile, $dbTableName, $module)) { throw new Zend_Tool_Project_Provider_Exception( 'This DbTable resource already exists, if you wish to overwrite it, ' . 'pass the "forceOverwrite" flag to this provider.' ); } - + $tableResources[] = self::createResource( $this->_loadedProfile, $dbTableName, @@ -181,11 +186,11 @@ public function createFromDatabase($module = null, $forceOverwrite = false) $module ); } - + if (count($tableResources) == 0) { $this->_registry->getResponse()->appendContent('There are no tables in the selected database to write.'); } - + // do the creation if ($this->_registry->getRequest()->isPretend()) { @@ -202,10 +207,10 @@ public function createFromDatabase($module = null, $forceOverwrite = false) $this->_storeProfile(); } - - + + } - + protected function _convertTableNameToClassName($tableName) { if ($this->_nameFilter == null) { @@ -213,8 +218,8 @@ protected function _convertTableNameToClassName($tableName) $this->_nameFilter ->addFilter(new Zend_Filter_Word_UnderscoreToCamelCase()); } - + return $this->_nameFilter->filter($tableName); } - + } \ No newline at end of file diff --git a/library/Zend/Tool/Project/Provider/Exception.php b/library/Zend/Tool/Project/Provider/Exception.php index 49619395f..3263a401e 100644 --- a/library/Zend/Tool/Project/Provider/Exception.php +++ b/library/Zend/Tool/Project/Provider/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Exception extends Zend_Tool_Project_Exception diff --git a/library/Zend/Tool/Project/Provider/Form.php b/library/Zend/Tool/Project/Provider/Form.php index 90948f583..14bc520b2 100644 --- a/library/Zend/Tool/Project/Provider/Form.php +++ b/library/Zend/Tool/Project/Provider/Form.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 23209 2010-10-21 16:09:34Z ralph $ + * @version $Id: Form.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Form extends Zend_Tool_Project_Provider_Abstract @@ -45,7 +45,7 @@ public static function createResource(Zend_Tool_Project_Profile $profile, $formN } $newForm = $formsDirectory->createResource( - 'formFile', + 'formFile', array('formName' => $formName, 'moduleName' => $moduleName) ); @@ -69,7 +69,7 @@ public static function hasResource(Zend_Tool_Project_Profile $profile, $formName $formsDirectory = self::_getFormsDirectoryResource($profile, $moduleName); return (($formsDirectory->search(array('formFile' => array('formName' => $formName)))) instanceof Zend_Tool_Project_Profile_Resource); } - + /** * _getFormsDirectoryResource() * @@ -89,7 +89,7 @@ protected static function _getFormsDirectoryResource(Zend_Tool_Project_Profile $ return $profile->search($profileSearchParams); } - + public function enable($module = null) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); @@ -98,7 +98,7 @@ public function enable($module = null) $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); $formDirectoryResource = self::_getFormsDirectoryResource($this->_loadedProfile, $module); - + if ($formDirectoryResource->isEnabled()) { throw new Zend_Tool_Project_Provider_Exception('This project already has forms enabled.'); } else { @@ -108,12 +108,12 @@ public function enable($module = null) $this->_registry->getResponse()->appendContent('Enabling forms directory at ' . $formDirectoryResource->getContext()->getPath()); $formDirectoryResource->setEnabled(true); $formDirectoryResource->create(); - $this->_storeProfile(); + $this->_storeProfile(); } } } - + /** * Create a new form * @@ -135,9 +135,9 @@ public function create($name, $module = null) if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Form names should be camel cased.'); } - + $name = ucwords($name); - + try { $formResource = self::createResource($this->_loadedProfile, $name, $module); diff --git a/library/Zend/Tool/Project/Provider/Layout.php b/library/Zend/Tool/Project/Provider/Layout.php index 84c8f8e4d..22bed45c7 100644 --- a/library/Zend/Tool/Project/Provider/Layout.php +++ b/library/Zend/Tool/Project/Provider/Layout.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Layout.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,82 +28,113 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Layout extends Zend_Tool_Project_Provider_Abstract implements Zend_Tool_Framework_Provider_Pretendable { - + /** + * @var string Layout path + */ + protected $_layoutPath = 'APPLICATION_PATH "/layouts/scripts/"'; + public static function createResource(Zend_Tool_Project_Profile $profile, $layoutName = 'layout') { $applicationDirectory = $profile->search('applicationDirectory'); $layoutDirectory = $applicationDirectory->search('layoutsDirectory'); - + if ($layoutDirectory == false) { $layoutDirectory = $applicationDirectory->createResource('layoutsDirectory'); } - + $layoutScriptsDirectory = $layoutDirectory->search('layoutScriptsDirectory'); - + if ($layoutScriptsDirectory == false) { $layoutScriptsDirectory = $layoutDirectory->createResource('layoutScriptsDirectory'); } - + $layoutScriptFile = $layoutScriptsDirectory->search('layoutScriptFile', array('layoutName' => 'layout')); if ($layoutScriptFile == false) { $layoutScriptFile = $layoutScriptsDirectory->createResource('layoutScriptFile', array('layoutName' => 'layout')); } - + return $layoutScriptFile; } - + public function enable() { $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); - + $applicationConfigResource = $profile->search('ApplicationConfigFile'); if (!$applicationConfigResource) { throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.'); } - + $zc = $applicationConfigResource->getAsZendConfig(); - - if (isset($zc->resources) && isset($zf->resources->layout)) { + + if (isset($zc->resources) && isset($zc->resources->layout)) { $this->_registry->getResponse()->appendContent('A layout resource already exists in this project\'s application configuration file.'); return; } - - $layoutPath = 'APPLICATION_PATH "/layouts/scripts/"'; - + if ($this->_registry->getRequest()->isPretend()) { $this->_registry->getResponse()->appendContent('Would add "resources.layout.layoutPath" key to the application config file.'); } else { - $applicationConfigResource->addStringItem('resources.layout.layoutPath', $layoutPath, 'production', false); - $applicationConfigResource->create(); + $applicationConfigResource->addStringItem('resources.layout.layoutPath', $this->_layoutPath, 'production', false); + $applicationConfigResource->create(); + + $this->_registry->getResponse()->appendContent('A layout entry has been added to the application config file.'); $layoutScriptFile = self::createResource($profile); - - $layoutScriptFile->create(); - - $this->_registry->getResponse()->appendContent( - 'Layouts have been enabled, and a default layout created at ' - . $layoutScriptFile->getPath() - ); - - $this->_registry->getResponse()->appendContent('A layout entry has been added to the application config file.'); + if (!$layoutScriptFile->exists()) { + $layoutScriptFile->create(); + $this->_registry->getResponse()->appendContent( + 'A default layout has been created at ' + . $layoutScriptFile->getPath() + ); + + } + + $this->_storeProfile(); } - - - } - + public function disable() { - // @todo + $profile = $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); + + $applicationConfigResource = $this->_getApplicationConfigResource($profile); + $zc = $applicationConfigResource->getAsZendConfig(); + + if (isset($zc->resources) && !isset($zc->resources->layout)) { + $this->_registry->getResponse()->appendContent('No layout configuration exists in application config file.'); + return; + } + + if ($this->_registry->getRequest()->isPretend()) { + $this->_registry->getResponse()->appendContent('Would remove "resources.layout.layoutPath" key from the application config file.'); + } else { + + // Remove the resources.layout.layoutPath directive from application config + $applicationConfigResource->removeStringItem('resources.layout.layoutPath', $this->_layoutPath, 'production', false); + $applicationConfigResource->create(); + + // Tell the user about the good work we've done + $this->_registry->getResponse()->appendContent('Layout entry has been removed from the application config file.'); + + $this->_storeProfile(); + } + } + + protected function _getApplicationConfigResource(Zend_Tool_Project_Profile $profile) + { + $applicationConfigResource = $profile->search('ApplicationConfigFile'); + if (!$applicationConfigResource) { + throw new Zend_Tool_Project_Exception('A project with an application config file is required to use this provider.'); + } + + return $applicationConfigResource; } - - - } diff --git a/library/Zend/Tool/Project/Provider/Manifest.php b/library/Zend/Tool/Project/Provider/Manifest.php index f58a2531d..71ca8a7c9 100644 --- a/library/Zend/Tool/Project/Provider/Manifest.php +++ b/library/Zend/Tool/Project/Provider/Manifest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manifest.php 22607 2010-07-17 08:39:49Z torio $ + * @version $Id: Manifest.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Manifest implements @@ -43,33 +43,33 @@ class Zend_Tool_Project_Provider_Manifest implements public function getProviders() { // the order here will represent what the output will look like when iterating a manifest - + return array( // top level project & profile providers 'Zend_Tool_Project_Provider_Profile', 'Zend_Tool_Project_Provider_Project', - + // app layer provider 'Zend_Tool_Project_Provider_Application', - + // MVC layer providers 'Zend_Tool_Project_Provider_Model', 'Zend_Tool_Project_Provider_View', 'Zend_Tool_Project_Provider_Controller', 'Zend_Tool_Project_Provider_Action', - + // hMVC provider 'Zend_Tool_Project_Provider_Module', - + // application problem providers 'Zend_Tool_Project_Provider_Form', 'Zend_Tool_Project_Provider_Layout', 'Zend_Tool_Project_Provider_DbAdapter', 'Zend_Tool_Project_Provider_DbTable', - + // provider within project provider 'Zend_Tool_Project_Provider_ProjectProvider', - + ); } } diff --git a/library/Zend/Tool/Project/Provider/Model.php b/library/Zend/Tool/Project/Provider/Model.php index 07c954bc3..bd0e224e6 100644 --- a/library/Zend/Tool/Project/Provider/Model.php +++ b/library/Zend/Tool/Project/Provider/Model.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Model.php 20851 2010-02-02 21:45:51Z ralph $ + * @version $Id: Model.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Model extends Zend_Tool_Project_Provider_Abstract @@ -45,7 +45,7 @@ public static function createResource(Zend_Tool_Project_Profile $profile, $model } $newModel = $modelsDirectory->createResource( - 'modelFile', + 'modelFile', array('modelName' => $modelName, 'moduleName' => $moduleName) ); @@ -67,9 +67,14 @@ public static function hasResource(Zend_Tool_Project_Profile $profile, $modelNam } $modelsDirectory = self::_getModelsDirectoryResource($profile, $moduleName); + + if (!$modelsDirectory instanceof Zend_Tool_Project_Profile_Resource) { + return false; + } + return (($modelsDirectory->search(array('modelFile' => array('modelName' => $modelName)))) instanceof Zend_Tool_Project_Profile_Resource); } - + /** * _getModelsDirectoryResource() * @@ -89,7 +94,7 @@ protected static function _getModelsDirectoryResource(Zend_Tool_Project_Profile return $profile->search($profileSearchParams); } - + /** * Create a new model * @@ -101,9 +106,9 @@ public function create($name, $module = null) $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); $originalName = $name; - + $name = ucwords($name); - + // determine if testing is enabled in the project $testingEnabled = false; //Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); $testModelResource = null; @@ -112,18 +117,18 @@ public function create($name, $module = null) if (preg_match('#[_-]#', $name)) { throw new Zend_Tool_Project_Provider_Exception('Model names should be camel cased.'); } - + if (self::hasResource($this->_loadedProfile, $name, $module)) { throw new Zend_Tool_Project_Provider_Exception('This project already has a model named ' . $name); } - + // get request/response object $request = $this->_registry->getRequest(); $response = $this->_registry->getResponse(); - + // alert the user about inline converted names $tense = (($request->isPretend()) ? 'would be' : 'is'); - + if ($name !== $originalName) { $response->appendContent( 'Note: The canonical model name that ' . $tense @@ -132,7 +137,7 @@ public function create($name, $module = null) array('color' => array('yellow')) ); } - + try { $modelResource = self::createResource($this->_loadedProfile, $name, $module); diff --git a/library/Zend/Tool/Project/Provider/Module.php b/library/Zend/Tool/Project/Provider/Module.php index 0fd8051a1..b6784c031 100644 --- a/library/Zend/Tool/Project/Provider/Module.php +++ b/library/Zend/Tool/Project/Provider/Module.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Module.php 23419 2010-11-20 21:37:46Z ramon $ + * @version $Id: Module.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -43,7 +43,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Module @@ -136,6 +136,10 @@ public function create($name) //, $moduleProfile = null) { $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); + // determine if testing is enabled in the project + // require_once 'Zend/Tool/Project/Provider/Test.php'; + //$testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); + $resources = self::createResources($this->_loadedProfile, $name); $response = $this->_registry->getResponse(); diff --git a/library/Zend/Tool/Project/Provider/Profile.php b/library/Zend/Tool/Project/Provider/Profile.php index ab1fc80e7..8ae6b63a5 100644 --- a/library/Zend/Tool/Project/Provider/Profile.php +++ b/library/Zend/Tool/Project/Provider/Profile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Profile.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Profile extends Zend_Tool_Project_Provider_Abstract diff --git a/library/Zend/Tool/Project/Provider/Project.php b/library/Zend/Tool/Project/Provider/Project.php index a8e5ff9d9..9da6abac4 100644 --- a/library/Zend/Tool/Project/Provider/Project.php +++ b/library/Zend/Tool/Project/Provider/Project.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Project.php 20898 2010-02-04 07:03:46Z ralph $ + * @version $Id: Project.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Project @@ -91,13 +91,18 @@ public function create($path, $nameOfProfile = null, $fileOfProfile = null) $newProfile->loadFromData(); $response = $this->_registry->getResponse(); - + $response->appendContent('Creating project at ' . $path); $response->appendContent('Note: ', array('separator' => false, 'color' => 'yellow')); $response->appendContent( 'This command created a web project, ' . 'for more information setting up your VHOST, please see docs/README'); + if (!Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $response->appendContent('Testing Note: ', array('separator' => false, 'color' => 'yellow')); + $response->appendContent('PHPUnit was not found in your include_path, therefore no testing actions will be created.'); + } + foreach ($newProfile->getIterator() as $resource) { $resource->create(); } @@ -120,9 +125,16 @@ public function showInfo() protected function _getDefaultProfile() { + $testAction = ''; + if (Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { + $testAction = ' <testApplicationActionMethod forActionName="index" />'; + } + + $version = Zend_Version::VERSION; + $data = <<<EOS <?xml version="1.0" encoding="UTF-8"?> -<projectProfile type="default" version="1.10"> +<projectProfile type="default" version="$version"> <projectDirectory> <projectProfileFile /> <applicationDirectory> @@ -179,19 +191,22 @@ protected function _getDefaultProfile() <temporaryDirectory enabled="false" /> <testsDirectory> <testPHPUnitConfigFile /> + <testPHPUnitBootstrapFile /> <testApplicationDirectory> - <testApplicationBootstrapFile /> - </testApplicationDirectory> - <testLibraryDirectory> - <testLibraryBootstrapFile /> - </testLibraryDirectory> + <testApplicationControllerDirectory> + <testApplicationControllerFile filesystemName="IndexControllerTest.php" forControllerName="Index"> +$testAction + </testApplicationControllerFile> + </testApplicationControllerDirectory> + </testApplicationDirectory> + <testLibraryDirectory /> </testsDirectory> </projectDirectory> </projectProfile> EOS; return $data; } - + public static function getDefaultReadmeContents($caller = null) { $projectDirResource = $caller->getResource()->getProfile()->search('projectDirectory'); @@ -201,13 +216,13 @@ public static function getDefaultReadmeContents($caller = null) } else { $path = '/path/to/public'; } - + return <<< EOS README ====== This directory should be used to place project specfic documentation including -but not limited to project notes, generated API/phpdoc documentation, or +but not limited to project notes, generated API/phpdoc documentation, or manual files generated or hand written. Ideally, this directory would remain in your development environment only and should not be deployed with your application to it's final production location. @@ -224,14 +239,14 @@ public static function getDefaultReadmeContents($caller = null) # This should be omitted in the production environment SetEnv APPLICATION_ENV development - + <Directory "$path"> Options Indexes MultiViews FollowSymLinks AllowOverride All Order allow,deny Allow from all </Directory> - + </VirtualHost> EOS; diff --git a/library/Zend/Tool/Project/Provider/ProjectProvider.php b/library/Zend/Tool/Project/Provider/ProjectProvider.php index a422ed56b..b3b227ef6 100644 --- a/library/Zend/Tool/Project/Provider/ProjectProvider.php +++ b/library/Zend/Tool/Project/Provider/ProjectProvider.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProjectProvider.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ProjectProvider.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Tool_Project_Provider_Abstract */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_ProjectProvider extends Zend_Tool_Project_Provider_Abstract diff --git a/library/Zend/Tool/Project/Provider/Test.php b/library/Zend/Tool/Project/Provider/Test.php index a7e014849..c8890bc63 100644 --- a/library/Zend/Tool/Project/Provider/Test.php +++ b/library/Zend/Tool/Project/Provider/Test.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Test.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Test.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_Test extends Zend_Tool_Project_Provider_Abstract @@ -55,6 +55,21 @@ public static function isTestingEnabled(Zend_Tool_Project_Profile $profile) return $testsDirectory->isEnabled(); } + public static function isPHPUnitAvailable() + { + if (class_exists('PHPUnit_Runner_Version', false)) { + return true; + } + + $included = @include 'PHPUnit/Runner/Version.php'; + + if ($included === false) { + return false; + } else { + return true; + } + } + /** * createApplicationResource() * @@ -76,22 +91,32 @@ public static function createApplicationResource(Zend_Tool_Project_Profile $prof $testsDirectoryResource = $profile->search('testsDirectory'); - if (($testAppDirectoryResource = $testsDirectoryResource->search('testApplicationDirectory')) === false) { - $testAppDirectoryResource = $testsDirectoryResource->createResource('testApplicationDirectory'); + // parentOfController could either be application/ or a particular module folder, which is why we use this name + if (($testParentOfControllerDirectoryResource = $testsDirectoryResource->search('testApplicationDirectory')) === false) { + $testParentOfControllerDirectoryResource = $testsDirectoryResource->createResource('testApplicationDirectory'); } if ($moduleName) { - //@todo $moduleName - $moduleName = ''; + if (($testAppModulesDirectoryResource = $testParentOfControllerDirectoryResource->search('testApplicationModulesDirectory')) === false) { + $testAppModulesDirectoryResource = $testParentOfControllerDirectoryResource->createResource('testApplicationModulesDirectory'); + } + + if (($testAppModuleDirectoryResource = $testAppModulesDirectoryResource->search(array('testApplicationModuleDirectory' => array('forModuleName' => $moduleName)))) === false) { + $testAppModuleDirectoryResource = $testAppModulesDirectoryResource->createResource('testApplicationModuleDirectory', array('forModuleName' => $moduleName)); + } + + $testParentOfControllerDirectoryResource = $testAppModuleDirectoryResource; } - if (($testAppControllerDirectoryResource = $testAppDirectoryResource->search('testApplicationControllerDirectory')) === false) { - $testAppControllerDirectoryResource = $testAppDirectoryResource->createResource('testApplicationControllerDirectory'); + if (($testAppControllerDirectoryResource = $testParentOfControllerDirectoryResource->search('testApplicationControllerDirectory', 'testApplicationModuleDirectory')) === false) { + $testAppControllerDirectoryResource = $testParentOfControllerDirectoryResource->createResource('testApplicationControllerDirectory'); } - $testAppControllerFileResource = $testAppControllerDirectoryResource->createResource('testApplicationControllerFile', array('forControllerName' => $controllerName)); - - return $testAppControllerFileResource; + if (($testAppControllerFileResource = $testAppControllerDirectoryResource->search(array('testApplicationControllerFile' => array('forControllerName' => $controllerName)))) === false) { + $testAppControllerFileResource = $testAppControllerDirectoryResource->createResource('testApplicationControllerFile', array('forControllerName' => $controllerName)); + } + + return $testAppControllerFileResource->createResource('testApplicationActionMethod', array('forActionName' => $actionName)); } /** @@ -120,7 +145,6 @@ public static function createLibraryResource(Zend_Tool_Project_Profile $profile, $currentDirectoryResource = $libraryDirectoryResource; } - } else { if (($libraryFileResource = $currentDirectoryResource->search(array('TestLibraryFile' => array('forClassName' => $libraryClassName)))) === false) { @@ -147,7 +171,7 @@ public function disable() /** * create() * - * @param unknown_type $libraryClassName + * @param string $libraryClassName */ public function create($libraryClassName) { diff --git a/library/Zend/Tool/Project/Provider/View.php b/library/Zend/Tool/Project/Provider/View.php index c37660130..ee4c0ba09 100644 --- a/library/Zend/Tool/Project/Provider/View.php +++ b/library/Zend/Tool/Project/Provider/View.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Tool * @subpackage Framework - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: View.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Tool - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstract @@ -90,7 +90,7 @@ public static function createResource(Zend_Tool_Project_Profile $profile, $actio * @param string $controllerName * @param string $actionNameOrSimpleName */ - public function create($controllerName, $actionNameOrSimpleName) + public function create($controllerName, $actionNameOrSimpleName, $module = null) { if ($controllerName == '' || $actionNameOrSimpleName == '') { @@ -100,7 +100,7 @@ public function create($controllerName, $actionNameOrSimpleName) $profile = $this->_loadProfile(); - $view = self::createResource($profile, $actionNameOrSimpleName, $controllerName); + $view = self::createResource($profile, $actionNameOrSimpleName, $controllerName, $module); if ($this->_registry->getRequest()->isPretend()) { $this->_registry->getResponse( diff --git a/library/Zend/Translate.php b/library/Zend/Translate.php index 1024007d1..107e201df 100644 --- a/library/Zend/Translate.php +++ b/library/Zend/Translate.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 22591 2010-07-16 20:58:05Z thomas $ + * @version $Id: Translate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate { diff --git a/library/Zend/Translate/Adapter.php b/library/Zend/Translate/Adapter.php index 96b0a9605..b3e3dbcff 100644 --- a/library/Zend/Translate/Adapter.php +++ b/library/Zend/Translate/Adapter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Translate * @subpackage Zend_Translate_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 22726 2010-07-30 10:52:07Z thomas $ + * @version $Id: Adapter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_Translate * @subpackage Zend_Translate_Adapter - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Translate_Adapter { @@ -212,6 +212,11 @@ public function addTranslation($options = array()) } else if (!is_array($options)) { $options = array('content' => $options); } + + if (!isset($options['content']) || empty($options['content'])) { + // require_once 'Zend/Translate/Exception.php'; + throw new Zend_Translate_Exception("Required option 'content' is missing"); + } $originate = null; if (!empty($options['locale'])) { @@ -240,9 +245,15 @@ public function addTranslation($options = array()) if (is_string($options['content']) and is_dir($options['content'])) { $options['content'] = realpath($options['content']); $prev = ''; - foreach (new RecursiveIteratorIterator( - new RecursiveDirectoryIterator($options['content'], RecursiveDirectoryIterator::KEY_AS_PATHNAME), - RecursiveIteratorIterator::SELF_FIRST) as $directory => $info) { + $iterator = new RecursiveIteratorIterator( + new RecursiveRegexIterator( + new RecursiveDirectoryIterator($options['content'], RecursiveDirectoryIterator::KEY_AS_PATHNAME), + '/^(?!.*(\.svn|\.cvs)).*$/', RecursiveRegexIterator::MATCH + ), + RecursiveIteratorIterator::SELF_FIRST + ); + + foreach ($iterator as $directory => $info) { $file = $info->getFilename(); if (is_array($options['ignore'])) { foreach ($options['ignore'] as $key => $ignore) { @@ -310,6 +321,8 @@ public function addTranslation($options = array()) } } } + + unset($iterator); } else { $this->_addTranslationData($options); } @@ -464,7 +477,7 @@ public function setLocale($locale) /** * Returns the available languages from this adapter * - * @return array + * @return array|null */ public function getList() { diff --git a/library/Zend/Translate/Adapter/Array.php b/library/Zend/Translate/Adapter/Array.php index 3e9ff0d19..3656fefa1 100644 --- a/library/Zend/Translate/Adapter/Array.php +++ b/library/Zend/Translate/Adapter/Array.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Array.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Array.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Array extends Zend_Translate_Adapter diff --git a/library/Zend/Translate/Adapter/Csv.php b/library/Zend/Translate/Adapter/Csv.php index d8666c03c..2fa602088 100644 --- a/library/Zend/Translate/Adapter/Csv.php +++ b/library/Zend/Translate/Adapter/Csv.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Csv.php 21661 2010-03-27 20:20:27Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Csv.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Csv extends Zend_Translate_Adapter diff --git a/library/Zend/Translate/Adapter/Gettext.php b/library/Zend/Translate/Adapter/Gettext.php index c92d60ea7..9bca8bc7a 100644 --- a/library/Zend/Translate/Adapter/Gettext.php +++ b/library/Zend/Translate/Adapter/Gettext.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Gettext.php 22653 2010-07-22 18:41:39Z mabe $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Gettext.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter { @@ -72,6 +72,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.'); } if (@filesize($filename) < 10) { + @fclose($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } @@ -83,6 +84,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr } else if (strtolower(substr(dechex($input[1]), -8)) == "de120495") { $this->_bigEndian = true; } else { + @fclose($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } @@ -132,6 +134,8 @@ protected function _loadTranslationData($filename, $locale, array $options = arr } } + @fclose($this->_file); + $this->_data[$locale][''] = trim($this->_data[$locale]['']); if (empty($this->_data[$locale][''])) { $this->_adapterInfo[$filename] = 'No adapter information available'; diff --git a/library/Zend/Translate/Adapter/Ini.php b/library/Zend/Translate/Adapter/Ini.php index 6ef9a12e3..b364d02a9 100644 --- a/library/Zend/Translate/Adapter/Ini.php +++ b/library/Zend/Translate/Adapter/Ini.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Ini.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Ini.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Ini extends Zend_Translate_Adapter diff --git a/library/Zend/Translate/Adapter/Qt.php b/library/Zend/Translate/Adapter/Qt.php index 27f94e6e7..5152abc85 100644 --- a/library/Zend/Translate/Adapter/Qt.php +++ b/library/Zend/Translate/Adapter/Qt.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Qt.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Qt.php 24652 2012-02-26 04:49:45Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter { @@ -74,9 +74,10 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff --git a/library/Zend/Translate/Adapter/Tbx.php b/library/Zend/Translate/Adapter/Tbx.php index 231383968..2f9a295ff 100644 --- a/library/Zend/Translate/Adapter/Tbx.php +++ b/library/Zend/Translate/Adapter/Tbx.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Tbx.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Tbx.php 24652 2012-02-26 04:49:45Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Tbx extends Zend_Translate_Adapter { @@ -69,9 +69,10 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff --git a/library/Zend/Translate/Adapter/Tmx.php b/library/Zend/Translate/Adapter/Tmx.php index ad599dfb9..58a1399c1 100644 --- a/library/Zend/Translate/Adapter/Tmx.php +++ b/library/Zend/Translate/Adapter/Tmx.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Tmx.php 21049 2010-02-13 22:52:52Z thomas $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Tmx.php 24652 2012-02-26 04:49:45Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Tmx extends Zend_Translate_Adapter { @@ -74,9 +74,10 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff --git a/library/Zend/Translate/Adapter/Xliff.php b/library/Zend/Translate/Adapter/Xliff.php index 13282208b..2d966f20d 100644 --- a/library/Zend/Translate/Adapter/Xliff.php +++ b/library/Zend/Translate/Adapter/Xliff.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Xliff.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Xliff.php 24652 2012-02-26 04:49:45Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_Xliff extends Zend_Translate_Adapter { @@ -81,9 +81,10 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff --git a/library/Zend/Translate/Adapter/XmlTm.php b/library/Zend/Translate/Adapter/XmlTm.php index f3760cd16..3ae4228da 100644 --- a/library/Zend/Translate/Adapter/XmlTm.php +++ b/library/Zend/Translate/Adapter/XmlTm.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: XmlTm.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: XmlTm.php 24652 2012-02-26 04:49:45Z adamlundrigan $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Adapter_XmlTm extends Zend_Translate_Adapter { @@ -69,9 +69,10 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_set_character_data_handler($this->_file, "_contentElement"); if (!xml_parse($this->_file, file_get_contents($filename))) { - $ex = sprintf('XML error: %s at line %d', + $ex = sprintf('XML error: %s at line %d of file %s', xml_error_string(xml_get_error_code($this->_file)), - xml_get_current_line_number($this->_file)); + xml_get_current_line_number($this->_file), + $filename); xml_parser_free($this->_file); // require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); diff --git a/library/Zend/Translate/Exception.php b/library/Zend/Translate/Exception.php index ca5aa6bfe..3c9510d33 100644 --- a/library/Zend/Translate/Exception.php +++ b/library/Zend/Translate/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_Translate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Exception extends Zend_Exception diff --git a/library/Zend/Translate/Plural.php b/library/Zend/Translate/Plural.php index 1c306e889..28e793894 100644 --- a/library/Zend/Translate/Plural.php +++ b/library/Zend/Translate/Plural.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plural.php 22518 2010-07-04 11:05:10Z thomas $ + * @version $Id: Plural.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Locale - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Translate_Plural diff --git a/library/Zend/Uri.php b/library/Zend/Uri.php index 6ad589c93..030546d81 100644 --- a/library/Zend/Uri.php +++ b/library/Zend/Uri.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Uri.php 23376 2010-11-18 21:19:24Z bittarman $ + * @version $Id: Uri.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Uri diff --git a/library/Zend/Uri/Exception.php b/library/Zend/Uri/Exception.php index ba2f1a834..c909da9c2 100644 --- a/library/Zend/Uri/Exception.php +++ b/library/Zend/Uri/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Uri_Exception extends Zend_Exception diff --git a/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php index 997a075fc..6cef7ab8f 100644 --- a/library/Zend/Uri/Http.php +++ b/library/Zend/Uri/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 23409 2010-11-19 19:55:25Z bittarman $ + * @version $Id: Http.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Uri * @uses Zend_Uri - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Uri_Http extends Zend_Uri @@ -217,24 +217,20 @@ protected function _parseUri($schemeSpecific) // Additional decomposition to get username, password, host, and port $combo = isset($matches[3]) === true ? $matches[3] : ''; - $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~'; + $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~'; $status = @preg_match($pattern, $combo, $matches); if ($status === false) { // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: authority decomposition failed'); } - - // Failed decomposition; no further processing needed - if ($status === false) { - return; - } - + // Save remaining URI components $this->_username = isset($matches[2]) === true ? $matches[2] : ''; $this->_password = isset($matches[4]) === true ? $matches[4] : ''; - $this->_host = isset($matches[5]) === true ? $matches[5] : ''; + $this->_host = isset($matches[5]) === true + ? preg_replace('~^\[([^]]+)\]$~', '\1', $matches[5]) // Strip wrapper [] from IPv6 literal + : ''; $this->_port = isset($matches[7]) === true ? $matches[7] : ''; - } /** diff --git a/library/Zend/Validate.php b/library/Zend/Validate.php index 77018fc59..1a8e1914a 100644 --- a/library/Zend/Validate.php +++ b/library/Zend/Validate.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Validate.php 21339 2010-03-05 15:32:25Z thomas $ + * @version $Id: Validate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate implements Zend_Validate_Interface diff --git a/library/Zend/Validate/Abstract.php b/library/Zend/Validate/Abstract.php index e31cc0ce4..228c7a2a5 100644 --- a/library/Zend/Validate/Abstract.php +++ b/library/Zend/Validate/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22472 2010-06-20 07:36:16Z thomas $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface diff --git a/library/Zend/Validate/Alnum.php b/library/Zend/Validate/Alnum.php index 025750ce1..49483e70b 100644 --- a/library/Zend/Validate/Alnum.php +++ b/library/Zend/Validate/Alnum.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Alnum.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Alnum.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Alnum extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Alpha.php b/library/Zend/Validate/Alpha.php index be8e6f119..a0a4f8a20 100644 --- a/library/Zend/Validate/Alpha.php +++ b/library/Zend/Validate/Alpha.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Alpha.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Alpha.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Alpha extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Barcode.php b/library/Zend/Validate/Barcode.php index e8449c434..be168986c 100644 --- a/library/Zend/Validate/Barcode.php +++ b/library/Zend/Validate/Barcode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Barcode.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Barcode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Barcode/AdapterAbstract.php b/library/Zend/Validate/Barcode/AdapterAbstract.php index 6c1b03c38..b3d630f42 100644 --- a/library/Zend/Validate/Barcode/AdapterAbstract.php +++ b/library/Zend/Validate/Barcode/AdapterAbstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: AdapterAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/AdapterInterface.php b/library/Zend/Validate/Barcode/AdapterInterface.php index 58b1f8bdb..ce6da9594 100644 --- a/library/Zend/Validate/Barcode/AdapterInterface.php +++ b/library/Zend/Validate/Barcode/AdapterInterface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AdapterInterface.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: AdapterInterface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Validate_Barcode_AdapterInterface diff --git a/library/Zend/Validate/Barcode/Code25.php b/library/Zend/Validate/Barcode/Code25.php index d042ab668..1d22f874a 100644 --- a/library/Zend/Validate/Barcode/Code25.php +++ b/library/Zend/Validate/Barcode/Code25.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code25.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code25 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Code25interleaved.php b/library/Zend/Validate/Barcode/Code25interleaved.php index eae69c01d..711375b8a 100644 --- a/library/Zend/Validate/Barcode/Code25interleaved.php +++ b/library/Zend/Validate/Barcode/Code25interleaved.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25interleaved.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code25interleaved.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code25interleaved extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Code39.php b/library/Zend/Validate/Barcode/Code39.php index 0b0675bdc..3882df259 100644 --- a/library/Zend/Validate/Barcode/Code39.php +++ b/library/Zend/Validate/Barcode/Code39.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code39.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code39 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Code39ext.php b/library/Zend/Validate/Barcode/Code39ext.php index c3d0f5207..7ac649237 100644 --- a/library/Zend/Validate/Barcode/Code39ext.php +++ b/library/Zend/Validate/Barcode/Code39ext.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39ext.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code39ext.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code39ext extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Code93.php b/library/Zend/Validate/Barcode/Code93.php index 16b7639e7..f64950d72 100644 --- a/library/Zend/Validate/Barcode/Code93.php +++ b/library/Zend/Validate/Barcode/Code93.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code93.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code93.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code93 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Code93ext.php b/library/Zend/Validate/Barcode/Code93ext.php index 78689ea50..a2184cc91 100644 --- a/library/Zend/Validate/Barcode/Code93ext.php +++ b/library/Zend/Validate/Barcode/Code93ext.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code93ext.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Code93ext.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Code93ext extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean12.php b/library/Zend/Validate/Barcode/Ean12.php index 0694de36f..8ef7958c0 100644 --- a/library/Zend/Validate/Barcode/Ean12.php +++ b/library/Zend/Validate/Barcode/Ean12.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean12.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean12.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean12 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean13.php b/library/Zend/Validate/Barcode/Ean13.php index d5387e52f..a5614d2d6 100644 --- a/library/Zend/Validate/Barcode/Ean13.php +++ b/library/Zend/Validate/Barcode/Ean13.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean13.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ean13.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean13 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean14.php b/library/Zend/Validate/Barcode/Ean14.php index 1d1bc992b..2361de1b1 100644 --- a/library/Zend/Validate/Barcode/Ean14.php +++ b/library/Zend/Validate/Barcode/Ean14.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean14.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean14.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean14 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean18.php b/library/Zend/Validate/Barcode/Ean18.php index 59f35190a..02b110dd3 100644 --- a/library/Zend/Validate/Barcode/Ean18.php +++ b/library/Zend/Validate/Barcode/Ean18.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean18.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean18.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean18 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean2.php b/library/Zend/Validate/Barcode/Ean2.php index fbb305ea4..6c0963955 100644 --- a/library/Zend/Validate/Barcode/Ean2.php +++ b/library/Zend/Validate/Barcode/Ean2.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean2.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean2.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean2 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean5.php b/library/Zend/Validate/Barcode/Ean5.php index 5c88c4728..ee341bb86 100644 --- a/library/Zend/Validate/Barcode/Ean5.php +++ b/library/Zend/Validate/Barcode/Ean5.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean5.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean5.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean5 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Ean8.php b/library/Zend/Validate/Barcode/Ean8.php index 450df7b02..b22da50b1 100644 --- a/library/Zend/Validate/Barcode/Ean8.php +++ b/library/Zend/Validate/Barcode/Ean8.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean8.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Ean8.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Ean8 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Gtin12.php b/library/Zend/Validate/Barcode/Gtin12.php index 516907a43..54f52b193 100644 --- a/library/Zend/Validate/Barcode/Gtin12.php +++ b/library/Zend/Validate/Barcode/Gtin12.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gtin12.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Gtin12.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Gtin12 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Gtin13.php b/library/Zend/Validate/Barcode/Gtin13.php index 22020e0cb..62911bd50 100644 --- a/library/Zend/Validate/Barcode/Gtin13.php +++ b/library/Zend/Validate/Barcode/Gtin13.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gtin13.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Gtin13.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Gtin13 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Gtin14.php b/library/Zend/Validate/Barcode/Gtin14.php index 277ae0645..c05210c31 100644 --- a/library/Zend/Validate/Barcode/Gtin14.php +++ b/library/Zend/Validate/Barcode/Gtin14.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gtin14.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Gtin14.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Gtin14 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Identcode.php b/library/Zend/Validate/Barcode/Identcode.php index 6cf666e64..385339650 100644 --- a/library/Zend/Validate/Barcode/Identcode.php +++ b/library/Zend/Validate/Barcode/Identcode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identcode.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Identcode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Identcode extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Intelligentmail.php b/library/Zend/Validate/Barcode/Intelligentmail.php index 51cca537e..dbee1886f 100644 --- a/library/Zend/Validate/Barcode/Intelligentmail.php +++ b/library/Zend/Validate/Barcode/Intelligentmail.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Intelligentmail.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Intelligentmail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_IntelligentMail extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Issn.php b/library/Zend/Validate/Barcode/Issn.php index abd1e188d..c9b1a9f1c 100644 --- a/library/Zend/Validate/Barcode/Issn.php +++ b/library/Zend/Validate/Barcode/Issn.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Issn.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Issn.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Issn extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Itf14.php b/library/Zend/Validate/Barcode/Itf14.php index c219a2670..2a76f70ce 100644 --- a/library/Zend/Validate/Barcode/Itf14.php +++ b/library/Zend/Validate/Barcode/Itf14.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Itf14.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Itf14.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Itf14 extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Leitcode.php b/library/Zend/Validate/Barcode/Leitcode.php index 1f51a8c6f..859ead1f3 100644 --- a/library/Zend/Validate/Barcode/Leitcode.php +++ b/library/Zend/Validate/Barcode/Leitcode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Leitcode.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Leitcode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Leitcode extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Planet.php b/library/Zend/Validate/Barcode/Planet.php index d7dad1949..cf42eda84 100644 --- a/library/Zend/Validate/Barcode/Planet.php +++ b/library/Zend/Validate/Barcode/Planet.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Planet.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Planet.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Planet extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Postnet.php b/library/Zend/Validate/Barcode/Postnet.php index 730482f12..408dfbb39 100644 --- a/library/Zend/Validate/Barcode/Postnet.php +++ b/library/Zend/Validate/Barcode/Postnet.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Postnet.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Postnet.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Postnet extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Royalmail.php b/library/Zend/Validate/Barcode/Royalmail.php index b04ab9f79..0eef1a179 100644 --- a/library/Zend/Validate/Barcode/Royalmail.php +++ b/library/Zend/Validate/Barcode/Royalmail.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Royalmail.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Royalmail.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Royalmail extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Sscc.php b/library/Zend/Validate/Barcode/Sscc.php index a7d01b2d8..6e05ea095 100644 --- a/library/Zend/Validate/Barcode/Sscc.php +++ b/library/Zend/Validate/Barcode/Sscc.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sscc.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Sscc.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Sscc extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Upca.php b/library/Zend/Validate/Barcode/Upca.php index 2f0411ef9..ced967627 100644 --- a/library/Zend/Validate/Barcode/Upca.php +++ b/library/Zend/Validate/Barcode/Upca.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upca.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Upca.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Upca extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Barcode/Upce.php b/library/Zend/Validate/Barcode/Upce.php index 99eaee932..7bf560904 100644 --- a/library/Zend/Validate/Barcode/Upce.php +++ b/library/Zend/Validate/Barcode/Upce.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upce.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Upce.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode_Upce extends Zend_Validate_Barcode_AdapterAbstract diff --git a/library/Zend/Validate/Between.php b/library/Zend/Validate/Between.php index 7245295db..91393b1a8 100644 --- a/library/Zend/Validate/Between.php +++ b/library/Zend/Validate/Between.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Between.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Between.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Between extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Callback.php b/library/Zend/Validate/Callback.php index a539ce948..3439ddf80 100644 --- a/library/Zend/Validate/Callback.php +++ b/library/Zend/Validate/Callback.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Callback.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Callback.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Callback extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Ccnum.php b/library/Zend/Validate/Ccnum.php index 8c2a8beb1..1f2fc36e0 100644 --- a/library/Zend/Validate/Ccnum.php +++ b/library/Zend/Validate/Ccnum.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ccnum.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Ccnum.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Ccnum extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/CreditCard.php b/library/Zend/Validate/CreditCard.php index 86ae383cf..ab157c03d 100644 --- a/library/Zend/Validate/CreditCard.php +++ b/library/Zend/Validate/CreditCard.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CreditCard.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: CreditCard.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_CreditCard extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Date.php b/library/Zend/Validate/Date.php index bac24aabf..26f9cfa3d 100644 --- a/library/Zend/Validate/Date.php +++ b/library/Zend/Validate/Date.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Date.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Date extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Db/Abstract.php b/library/Zend/Validate/Db/Abstract.php index 4e83d01dd..7f3d4bcbf 100644 --- a/library/Zend/Validate/Db/Abstract.php +++ b/library/Zend/Validate/Db/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 23356 2010-11-18 15:59:10Z ralph $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Validate * @uses Zend_Validate_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract @@ -276,7 +276,7 @@ public function setSchema($schema) /** * Sets the select object to be used by the validator - * + * * @param Zend_Db_Select $select * @return Zend_Validate_Db_Abstract */ @@ -340,12 +340,12 @@ protected function _query($value) /** * Run query */ - $result = $select->getAdapter()->fetchRow( $select, array('value' => $value), // this should work whether db supports positional or named params Zend_Db::FETCH_ASSOC ); + return $result; } } diff --git a/library/Zend/Validate/Db/NoRecordExists.php b/library/Zend/Validate/Db/NoRecordExists.php index 700102e43..c43e16018 100644 --- a/library/Zend/Validate/Db/NoRecordExists.php +++ b/library/Zend/Validate/Db/NoRecordExists.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NoRecordExists.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: NoRecordExists.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Validate * @uses Zend_Validate_Db_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Db_NoRecordExists extends Zend_Validate_Db_Abstract diff --git a/library/Zend/Validate/Db/RecordExists.php b/library/Zend/Validate/Db/RecordExists.php index 300f053d8..ce9eba942 100644 --- a/library/Zend/Validate/Db/RecordExists.php +++ b/library/Zend/Validate/Db/RecordExists.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RecordExists.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RecordExists.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Validate * @uses Zend_Validate_Db_Abstract - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Db_RecordExists extends Zend_Validate_Db_Abstract @@ -39,8 +39,8 @@ public function isValid($value) { $valid = true; $this->_setValue($value); - $result = $this->_query($value); + $result = $this->_query($value); if (!$result) { $valid = false; $this->_error(self::ERROR_NO_RECORD_FOUND); diff --git a/library/Zend/Validate/Digits.php b/library/Zend/Validate/Digits.php index 90ef7e4de..c0739da54 100644 --- a/library/Zend/Validate/Digits.php +++ b/library/Zend/Validate/Digits.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Digits.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Digits.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Digits extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/EmailAddress.php b/library/Zend/Validate/EmailAddress.php index 3540da770..79e259b37 100644 --- a/library/Zend/Validate/EmailAddress.php +++ b/library/Zend/Validate/EmailAddress.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailAddress.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: EmailAddress.php 24661 2012-02-26 07:32:09Z adamlundrigan $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract @@ -177,6 +177,8 @@ public function setOptions(array $options = array()) } else { $this->setHostnameValidator($options['hostname']); } + } elseif ($this->_options['hostname'] == null) { + $this->setHostnameValidator(); } if (array_key_exists('mx', $options)) { diff --git a/library/Zend/Validate/Exception.php b/library/Zend/Validate/Exception.php index fd34efe0c..841216a64 100644 --- a/library/Zend/Validate/Exception.php +++ b/library/Zend/Validate/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Exception extends Zend_Exception diff --git a/library/Zend/Validate/File/Count.php b/library/Zend/Validate/File/Count.php index a49a499a7..9fd02a289 100644 --- a/library/Zend/Validate/File/Count.php +++ b/library/Zend/Validate/File/Count.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Count.php 21325 2010-03-04 20:26:36Z thomas $ + * @version $Id: Count.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Count extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/Crc32.php b/library/Zend/Validate/File/Crc32.php index 495f24ee4..b46ccc962 100644 --- a/library/Zend/Validate/File/Crc32.php +++ b/library/Zend/Validate/File/Crc32.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crc32.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Crc32.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash diff --git a/library/Zend/Validate/File/ExcludeExtension.php b/library/Zend/Validate/File/ExcludeExtension.php index 8f8bb5c91..badfa50b5 100644 --- a/library/Zend/Validate/File/ExcludeExtension.php +++ b/library/Zend/Validate/File/ExcludeExtension.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExcludeExtension.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: ExcludeExtension.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension diff --git a/library/Zend/Validate/File/ExcludeMimeType.php b/library/Zend/Validate/File/ExcludeMimeType.php index 24c1537fa..22cbdfc43 100644 --- a/library/Zend/Validate/File/ExcludeMimeType.php +++ b/library/Zend/Validate/File/ExcludeMimeType.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExcludeMimeType.php 21935 2010-04-18 16:21:35Z thomas $ + * @version $Id: ExcludeMimeType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType diff --git a/library/Zend/Validate/File/Exists.php b/library/Zend/Validate/File/Exists.php index cef188dc2..edde941bc 100644 --- a/library/Zend/Validate/File/Exists.php +++ b/library/Zend/Validate/File/Exists.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exists.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: Exists.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Exists extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/Extension.php b/library/Zend/Validate/File/Extension.php index 71985f5e9..4a32a6fa4 100644 --- a/library/Zend/Validate/File/Extension.php +++ b/library/Zend/Validate/File/Extension.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Extension.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Extension.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Extension extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/FilesSize.php b/library/Zend/Validate/File/FilesSize.php index a418ef3bb..b0f575db5 100644 --- a/library/Zend/Validate/File/FilesSize.php +++ b/library/Zend/Validate/File/FilesSize.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FilesSize.php 20454 2010-01-20 22:50:59Z thomas $ + * @version $Id: FilesSize.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size diff --git a/library/Zend/Validate/File/Hash.php b/library/Zend/Validate/File/Hash.php index 2e4071b64..a23122974 100644 --- a/library/Zend/Validate/File/Hash.php +++ b/library/Zend/Validate/File/Hash.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hash.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Hash.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Hash extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/ImageSize.php b/library/Zend/Validate/File/ImageSize.php index 4f2915d49..cb67bdb90 100644 --- a/library/Zend/Validate/File/ImageSize.php +++ b/library/Zend/Validate/File/ImageSize.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ImageSize.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: ImageSize.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/IsCompressed.php b/library/Zend/Validate/File/IsCompressed.php index b75fe481a..fc263f8be 100644 --- a/library/Zend/Validate/File/IsCompressed.php +++ b/library/Zend/Validate/File/IsCompressed.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IsCompressed.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: IsCompressed.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType diff --git a/library/Zend/Validate/File/IsImage.php b/library/Zend/Validate/File/IsImage.php index 3b91a7198..37c777fde 100644 --- a/library/Zend/Validate/File/IsImage.php +++ b/library/Zend/Validate/File/IsImage.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IsImage.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: IsImage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType diff --git a/library/Zend/Validate/File/Md5.php b/library/Zend/Validate/File/Md5.php index 52a28f601..702974b6f 100644 --- a/library/Zend/Validate/File/Md5.php +++ b/library/Zend/Validate/File/Md5.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Md5.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Md5.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash diff --git a/library/Zend/Validate/File/MimeType.php b/library/Zend/Validate/File/MimeType.php index 8d26b17e0..80c52d5ad 100644 --- a/library/Zend/Validate/File/MimeType.php +++ b/library/Zend/Validate/File/MimeType.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeType.php 22832 2010-08-12 18:02:41Z thomas $ + * @version $Id: MimeType.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/NotExists.php b/library/Zend/Validate/File/NotExists.php index 869346f46..990017178 100644 --- a/library/Zend/Validate/File/NotExists.php +++ b/library/Zend/Validate/File/NotExists.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NotExists.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: NotExists.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_NotExists extends Zend_Validate_File_Exists diff --git a/library/Zend/Validate/File/Sha1.php b/library/Zend/Validate/File/Sha1.php index 3a8698a30..d13cf824b 100644 --- a/library/Zend/Validate/File/Sha1.php +++ b/library/Zend/Validate/File/Sha1.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sha1.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Sha1.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash diff --git a/library/Zend/Validate/File/Size.php b/library/Zend/Validate/File/Size.php index 247f2965f..81bb4d39a 100644 --- a/library/Zend/Validate/File/Size.php +++ b/library/Zend/Validate/File/Size.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Size.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Size.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Size extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/File/Upload.php b/library/Zend/Validate/File/Upload.php index 588e1f592..e140ca629 100644 --- a/library/Zend/Validate/File/Upload.php +++ b/library/Zend/Validate/File/Upload.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upload.php 22398 2010-06-09 19:05:46Z thomas $ + * @version $Id: Upload.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Upload extends Zend_Validate_Abstract @@ -136,6 +136,11 @@ public function setFiles($files = array()) $this->_files = $files; } + // see ZF-10738 + if (is_null($this->_files)) { + $this->_files = array(); + } + foreach($this->_files as $file => $content) { if (!isset($content['error'])) { unset($this->_files[$file]); diff --git a/library/Zend/Validate/File/WordCount.php b/library/Zend/Validate/File/WordCount.php index bb9364174..3500f1e18 100644 --- a/library/Zend/Validate/File/WordCount.php +++ b/library/Zend/Validate/File/WordCount.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WordCount.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: WordCount.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count diff --git a/library/Zend/Validate/Float.php b/library/Zend/Validate/Float.php index ac8fb7e6d..c7fbbeebf 100644 --- a/library/Zend/Validate/Float.php +++ b/library/Zend/Validate/Float.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Float.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Float.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Float extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/GreaterThan.php b/library/Zend/Validate/GreaterThan.php index 7c313a0bf..af2c99db4 100644 --- a/library/Zend/Validate/GreaterThan.php +++ b/library/Zend/Validate/GreaterThan.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GreaterThan.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: GreaterThan.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Hex.php b/library/Zend/Validate/Hex.php index 999dc849f..3ed422458 100644 --- a/library/Zend/Validate/Hex.php +++ b/library/Zend/Validate/Hex.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hex.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Hex.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Hex extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Hostname.php b/library/Zend/Validate/Hostname.php index a44cfcbdd..b1278eb72 100644 --- a/library/Zend/Validate/Hostname.php +++ b/library/Zend/Validate/Hostname.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hostname.php 22830 2010-08-12 16:05:09Z thomas $ + * @version $Id: Hostname.php 24632 2012-02-24 17:46:13Z adamlundrigan $ */ /** @@ -41,7 +41,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Hostname extends Zend_Validate_Abstract @@ -100,12 +100,12 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract /** * Allows all types of hostnames */ - const ALLOW_ALL = 7; + const ALLOW_URI = 8; /** * Allows all types of hostnames */ - const ALLOW_URI = 8; + const ALLOW_ALL = 15; /** * Array of valid top-level-domains @@ -133,7 +133,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws', - 'ye', 'yt', 'yu', 'za', 'zm', 'zw' + 'xxx', 'ye', 'yt', 'yu', 'za', 'zm', 'zw' ); /** @@ -283,6 +283,10 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract 'SA' => array(1 => '/^[\x{002d}.0-9\x{0621}-\x{063A}\x{0641}-\x{064A}\x{0660}-\x{0669}]{1,63}$/iu'), 'SE' => array(1 => '/^[\x{002d}0-9a-zäåéöü]{1,63}$/iu'), 'SH' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'), + 'SI' => 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'), 'SJ' => array(1 => '/^[\x{002d}0-9a-zàáä-éêñ-ôöøüčđńŋšŧž]{1,63}$/iu'), 'TH' => array(1 => '/^[\x{002d}0-9a-z\x{0E01}-\x{0E3A}\x{0E40}-\x{0E4D}\x{0E50}-\x{0E59}]{1,63}$/iu'), 'TM' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿāăąćĉċčďđēėęěĝġģĥħīįĵķĺļľŀłńņňŋőœŕŗřśŝşšţťŧūŭůűųŵŷźżž]{1,63}$/iu'), @@ -502,7 +506,7 @@ public function isValid($value) $this->_setValue($value); // Check input against IP address schema - if (preg_match('/^[0-9.a-e:.]*$/i', $value) && + if (preg_match('/^[0-9a-f:.]*$/i', $value) && $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) { if (!($this->_options['allow'] & self::ALLOW_IP)) { $this->_error(self::IP_ADDRESS_NOT_ALLOWED); @@ -512,13 +516,47 @@ public function isValid($value) } } - // Check input against DNS hostname schema + // RFC3986 3.2.2 states: + // + // The rightmost domain label of a fully qualified domain name + // in DNS may be followed by a single "." and should be if it is + // necessary to distinguish between the complete domain name and + // some local domain. + // + // (see ZF-6363) + + // Local hostnames are allowed to be partitial (ending '.') + if ($this->_options['allow'] & self::ALLOW_LOCAL) { + if (substr($value, -1) === '.') { + $value = substr($value, 0, -1); + if (substr($value, -1) === '.') { + // Empty hostnames (ending '..') are not allowed + $this->_error(self::INVALID_LOCAL_NAME); + return false; + } + } + } + $domainParts = explode('.', $value); + + // Prevent partitial IP V4 adresses (ending '.') + if ((count($domainParts) == 4) && preg_match('/^[0-9.a-e:.]*$/i', $value) && + $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) { + $this->_error(self::INVALID_LOCAL_NAME); + } + + // Check input against DNS hostname schema if ((count($domainParts) > 1) && (strlen($value) >= 4) && (strlen($value) <= 254)) { $status = false; - $origenc = iconv_get_encoding('internal_encoding'); - iconv_set_encoding('internal_encoding', 'UTF-8'); + $origenc = PHP_VERSION_ID < 50600 + ? iconv_get_encoding('internal_encoding') + : ini_get('default_charset'); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('internal_encoding', 'UTF-8'); + } else { + ini_set('default_charset', 'UTF-8'); + } do { // First check TLD $matches = array(); @@ -614,7 +652,11 @@ public function isValid($value) } } while (false); - iconv_set_encoding('internal_encoding', $origenc); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('internal_encoding', $origenc); + } else { + ini_set('default_charset', $origenc); + } // If the input passes as an Internet domain name, and domain names are allowed, then the hostname // passes validation if ($status && ($this->_options['allow'] & self::ALLOW_DNS)) { @@ -634,7 +676,7 @@ public function isValid($value) } // Check input against local network name schema; last chance to pass validation - $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/'; + $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}[\x2e]{0,1}){1,254}$/'; $status = @preg_match($regexLocal, $value); // If the input passes as a local network name, and local network names are allowed, then the diff --git a/library/Zend/Validate/Hostname/Biz.php b/library/Zend/Validate/Hostname/Biz.php index 38762217d..08da1a764 100644 --- a/library/Zend/Validate/Hostname/Biz.php +++ b/library/Zend/Validate/Hostname/Biz.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Biz.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Biz.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/library/Zend/Validate/Hostname/Cn.php b/library/Zend/Validate/Hostname/Cn.php index feee54ade..ea170722f 100644 --- a/library/Zend/Validate/Hostname/Cn.php +++ b/library/Zend/Validate/Hostname/Cn.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cn.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cn.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/library/Zend/Validate/Hostname/Com.php b/library/Zend/Validate/Hostname/Com.php index 413971fec..e33bc293d 100644 --- a/library/Zend/Validate/Hostname/Com.php +++ b/library/Zend/Validate/Hostname/Com.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Com.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Com.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/library/Zend/Validate/Hostname/Jp.php b/library/Zend/Validate/Hostname/Jp.php index 02f278e2b..bdaa803a5 100644 --- a/library/Zend/Validate/Hostname/Jp.php +++ b/library/Zend/Validate/Hostname/Jp.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Jp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Jp.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/library/Zend/Validate/Iban.php b/library/Zend/Validate/Iban.php index 427857a1c..01d62034f 100644 --- a/library/Zend/Validate/Iban.php +++ b/library/Zend/Validate/Iban.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Iban.php 22400 2010-06-09 19:25:02Z thomas $ + * @version $Id: Iban.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Iban extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Identical.php b/library/Zend/Validate/Identical.php index 3ebaf028a..a765fe448 100644 --- a/library/Zend/Validate/Identical.php +++ b/library/Zend/Validate/Identical.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identical.php 22075 2010-05-02 13:42:08Z thomas $ + * @version $Id: Identical.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Validate_Abstract */ @@ -25,7 +25,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Identical extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/InArray.php b/library/Zend/Validate/InArray.php index 567d3df4d..98bb37918 100644 --- a/library/Zend/Validate/InArray.php +++ b/library/Zend/Validate/InArray.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InArray.php 20352 2010-01-17 17:55:38Z thomas $ + * @version $Id: InArray.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_InArray extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Int.php b/library/Zend/Validate/Int.php index 2f82b98bf..df6aacf0b 100644 --- a/library/Zend/Validate/Int.php +++ b/library/Zend/Validate/Int.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Int.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Int.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Int extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Interface.php b/library/Zend/Validate/Interface.php index f683b60f0..b764c99e2 100644 --- a/library/Zend/Validate/Interface.php +++ b/library/Zend/Validate/Interface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 23262 2010-10-27 14:03:36Z matthew $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Validate_Interface diff --git a/library/Zend/Validate/Ip.php b/library/Zend/Validate/Ip.php index 091ff9b61..ed789cb0f 100644 --- a/library/Zend/Validate/Ip.php +++ b/library/Zend/Validate/Ip.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ip.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Ip.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Ip extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Isbn.php b/library/Zend/Validate/Isbn.php index 5c78872fa..ef7c8e1d0 100644 --- a/library/Zend/Validate/Isbn.php +++ b/library/Zend/Validate/Isbn.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Isbn.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Isbn.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Isbn extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/LessThan.php b/library/Zend/Validate/LessThan.php index 213c766f8..bd5be918d 100644 --- a/library/Zend/Validate/LessThan.php +++ b/library/Zend/Validate/LessThan.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LessThan.php 20182 2010-01-10 21:12:01Z thomas $ + * @version $Id: LessThan.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_LessThan extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/NotEmpty.php b/library/Zend/Validate/NotEmpty.php index 584e29088..ec4f18814 100644 --- a/library/Zend/Validate/NotEmpty.php +++ b/library/Zend/Validate/NotEmpty.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NotEmpty.php 22691 2010-07-26 19:29:14Z thomas $ + * @version $Id: NotEmpty.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/PostCode.php b/library/Zend/Validate/PostCode.php index 4aa1cd1d3..21e3c9fb0 100644 --- a/library/Zend/Validate/PostCode.php +++ b/library/Zend/Validate/PostCode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PostCode.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: PostCode.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_PostCode extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Regex.php b/library/Zend/Validate/Regex.php index 4784d2ae9..f1e69030e 100644 --- a/library/Zend/Validate/Regex.php +++ b/library/Zend/Validate/Regex.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Regex.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Regex.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Regex extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Sitemap/Changefreq.php b/library/Zend/Validate/Sitemap/Changefreq.php index 39532e777..aea86f77b 100644 --- a/library/Zend/Validate/Sitemap/Changefreq.php +++ b/library/Zend/Validate/Sitemap/Changefreq.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Changefreq.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Changefreq.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Sitemap/Lastmod.php b/library/Zend/Validate/Sitemap/Lastmod.php index 2495d0ba6..358b04ce8 100644 --- a/library/Zend/Validate/Sitemap/Lastmod.php +++ b/library/Zend/Validate/Sitemap/Lastmod.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Lastmod.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Lastmod.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Sitemap/Loc.php b/library/Zend/Validate/Sitemap/Loc.php index 15eea1186..4b3b96060 100644 --- a/library/Zend/Validate/Sitemap/Loc.php +++ b/library/Zend/Validate/Sitemap/Loc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Loc.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Loc.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -38,7 +38,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/Sitemap/Priority.php b/library/Zend/Validate/Sitemap/Priority.php index 04fd997d6..d2f5118a3 100644 --- a/library/Zend/Validate/Sitemap/Priority.php +++ b/library/Zend/Validate/Sitemap/Priority.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Priority.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: Priority.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract diff --git a/library/Zend/Validate/StringLength.php b/library/Zend/Validate/StringLength.php index 3b9479278..2644cfa6e 100644 --- a/library/Zend/Validate/StringLength.php +++ b/library/Zend/Validate/StringLength.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringLength.php 22668 2010-07-25 14:50:46Z thomas $ + * @version $Id: StringLength.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_StringLength extends Zend_Validate_Abstract @@ -199,14 +199,24 @@ public function getEncoding() public function setEncoding($encoding = null) { if ($encoding !== null) { - $orig = iconv_get_encoding('internal_encoding'); - $result = iconv_set_encoding('internal_encoding', $encoding); + $orig = PHP_VERSION_ID < 50600 + ? iconv_get_encoding('internal_encoding') + : ini_get('default_charset'); + if (PHP_VERSION_ID < 50600) { + $result = iconv_set_encoding('internal_encoding', $encoding); + } else { + $result = ini_set('default_charset', $encoding); + } if (!$result) { // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Given encoding not supported on this OS!'); } - iconv_set_encoding('internal_encoding', $orig); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('internal_encoding', $orig); + } else { + ini_set('default_charset', $orig); + } } $this->_encoding = $encoding; diff --git a/library/Zend/Version.php b/library/Zend/Version.php index 5b7767988..572a5913c 100644 --- a/library/Zend/Version.php +++ b/library/Zend/Version.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Version - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Version.php 23455 2010-11-29 16:24:55Z matthew $ + * @version $Id: Version.php 25046 2012-08-27 14:53:51Z matthew $ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Version - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Version @@ -32,14 +32,14 @@ final class Zend_Version /** * Zend Framework version identification - see compareVersion() */ - const VERSION = '1.11.1'; + const VERSION = '1.11.14'; /** * The latest stable version Zend Framework available - * + * * @var string */ - protected static $_lastestVersion; + protected static $_latestVersion; /** * Compare the specified Zend Framework version string $version @@ -60,22 +60,22 @@ public static function compareVersion($version) /** * Fetches the version of the latest stable release - * + * * @link http://framework.zend.com/download/latest * @return string */ public static function getLatest() { - if (null === self::$_lastestVersion) { - self::$_lastestVersion = 'not available'; + if (null === self::$_latestVersion) { + self::$_latestVersion = 'not available'; - $handle = fopen('http://framework.zend.com/api/zf-version', 'r'); + $handle = fopen('http://framework.zend.com/api/zf-version', 'r'); if (false !== $handle) { - self::$_lastestVersion = stream_get_contents($handle); + self::$_latestVersion = stream_get_contents($handle); fclose($handle); } } - return self::$_lastestVersion; + return self::$_latestVersion; } } diff --git a/library/Zend/View.php b/library/Zend/View.php index 4444fb028..343d8ff5c 100644 --- a/library/Zend/View.php +++ b/library/Zend/View.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: View.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View extends Zend_View_Abstract diff --git a/library/Zend/View/Abstract.php b/library/Zend/View/Abstract.php index 42b492e17..e1a5c4002 100644 --- a/library/Zend/View/Abstract.php +++ b/library/Zend/View/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 22446 2010-06-18 12:11:43Z matthew $ + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @see Zend_Loader */ @@ -33,7 +33,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Abstract implements Zend_View_Interface @@ -221,6 +221,14 @@ public function __construct($config = array()) $this->setLfiProtection($config['lfiProtectionOn']); } + if (array_key_exists('assign', $config) + && is_array($config['assign']) + ) { + foreach ($config['assign'] as $key => $value) { + $this->assign($key, $value); + } + } + $this->init(); } @@ -948,7 +956,7 @@ public function strictVars($flag = true) /** * Finds a view script from the available directories. * - * @param $name string The base name of the script. + * @param string $name The base name of the script. * @return void */ protected function _script($name) diff --git a/library/Zend/View/Exception.php b/library/Zend/View/Exception.php index 51f3f23e5..809e8aa67 100644 --- a/library/Zend/View/Exception.php +++ b/library/Zend/View/Exception.php @@ -13,9 +13,9 @@ * to license@zend.com so we can send you a copy immediately. * * @category Zend - * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @package Zend_View + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,8 +30,8 @@ * Exception for Zend_View class. * * @category Zend - * @package Zend_Date - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @package Zend_View + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Exception extends Zend_Exception diff --git a/library/Zend/View/Helper/Abstract.php b/library/Zend/View/Helper/Abstract.php index 09f009c5f..b0af6008d 100644 --- a/library/Zend/View/Helper/Abstract.php +++ b/library/Zend/View/Helper/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 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 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Abstract implements Zend_View_Helper_Interface diff --git a/library/Zend/View/Helper/Action.php b/library/Zend/View/Helper/Action.php index 01e1954a1..faeaae52f 100644 --- a/library/Zend/View/Helper/Action.php +++ b/library/Zend/View/Helper/Action.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Action.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Action.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Action extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/BaseUrl.php b/library/Zend/View/Helper/BaseUrl.php index 0dcd1e7a0..c1e2d2d9a 100644 --- a/library/Zend/View/Helper/BaseUrl.php +++ b/library/Zend/View/Helper/BaseUrl.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: BaseUrl.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: BaseUrl.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_BaseUrl extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Currency.php b/library/Zend/View/Helper/Currency.php index dcba2ee25..a617befb6 100644 --- a/library/Zend/View/Helper/Currency.php +++ b/library/Zend/View/Helper/Currency.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Currency.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: Currency.php 24769 2012-05-06 03:10:25Z adamlundrigan $ */ /** Zend_View_Helper_Abstract.php */ @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract @@ -61,8 +61,9 @@ public function __construct($currency = null) /** * Output a formatted currency * - * @param integer|float $value Currency value to output - * @param string|Zend_Locale|Zend_Currency $currency OPTIONAL Currency to use for this call + * @param integer|float $value Currency value to output + * @param string|Zend_Locale|array $currency OPTIONAL Currency to use for + * this call * @return string Formatted currency */ public function currency($value = null, $currency = null) diff --git a/library/Zend/View/Helper/Cycle.php b/library/Zend/View/Helper/Cycle.php index 7f42bb100..323393860 100644 --- a/library/Zend/View/Helper/Cycle.php +++ b/library/Zend/View/Helper/Cycle.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Cycle.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Cycle.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Cycle implements Iterator @@ -92,7 +92,7 @@ public function assign(Array $data , $name = self::DEFAULT_NAME) /** * Sets actual name of cycle * - * @param $name + * @param string $name * @return Zend_View_Helper_Cycle */ public function setName($name = self::DEFAULT_NAME) @@ -111,7 +111,6 @@ public function setName($name = self::DEFAULT_NAME) /** * Gets actual name of cycle * - * @param $name * @return string */ public function getName() diff --git a/library/Zend/View/Helper/DeclareVars.php b/library/Zend/View/Helper/DeclareVars.php index 94d3380b1..51dff0ef2 100644 --- a/library/Zend/View/Helper/DeclareVars.php +++ b/library/Zend/View/Helper/DeclareVars.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: DeclareVars.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: DeclareVars.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_DeclareVars extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Doctype.php b/library/Zend/View/Helper/Doctype.php index 9a985039a..44ee606d8 100644 --- a/library/Zend/View/Helper/Doctype.php +++ b/library/Zend/View/Helper/Doctype.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Doctype.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Doctype.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract @@ -43,6 +43,7 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract const XHTML1_STRICT = 'XHTML1_STRICT'; const XHTML1_TRANSITIONAL = 'XHTML1_TRANSITIONAL'; const XHTML1_FRAMESET = 'XHTML1_FRAMESET'; + const XHTML1_RDFA = 'XHTML1_RDFA'; const XHTML_BASIC1 = 'XHTML_BASIC1'; const XHTML5 = 'XHTML5'; const HTML4_STRICT = 'HTML4_STRICT'; @@ -87,6 +88,7 @@ public function __construct() self::XHTML1_STRICT => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">', self::XHTML1_TRANSITIONAL => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', self::XHTML1_FRAMESET => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">', + self::XHTML1_RDFA => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">', self::XHTML_BASIC1 => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">', self::XHTML5 => '<!DOCTYPE html>', self::HTML4_STRICT => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">', @@ -117,6 +119,7 @@ public function doctype($doctype = null) case self::XHTML1_TRANSITIONAL: case self::XHTML1_FRAMESET: case self::XHTML_BASIC1: + case self::XHTML1_RDFA: case self::XHTML5: case self::HTML4_STRICT: case self::HTML4_LOOSE: @@ -186,15 +189,42 @@ public function isXhtml() { return (stristr($this->getDoctype(), 'xhtml') ? true : false); } - - /** - * Is doctype HTML5? (HeadMeta uses this for validation) - * - * @return booleean - */ - public function isHtml5() { - return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false); - } + + /** + * Is doctype strict? + * + * @return boolean + */ + public function isStrict() + { + switch ( $this->getDoctype() ) + { + case self::XHTML1_STRICT: + case self::XHTML11: + case self::HTML4_STRICT: + return true; + default: + return false; + } + } + + /** + * Is doctype HTML5? (HeadMeta uses this for validation) + * + * @return booleean + */ + public function isHtml5() { + return (stristr($this->doctype(), '<!DOCTYPE html>') ? true : false); + } + + /** + * Is doctype RDFa? + * + * @return booleean + */ + public function isRdfa() { + return (stristr($this->getDoctype(), 'rdfa') ? true : false); + } /** * String representation of doctype diff --git a/library/Zend/View/Helper/Fieldset.php b/library/Zend/View/Helper/Fieldset.php index fc4135840..bc9a31ddb 100644 --- a/library/Zend/View/Helper/Fieldset.php +++ b/library/Zend/View/Helper/Fieldset.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Fieldset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Fieldset.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Fieldset extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/Form.php b/library/Zend/View/Helper/Form.php index d9a897263..a944f55c1 100644 --- a/library/Zend/View/Helper/Form.php +++ b/library/Zend/View/Helper/Form.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Form.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Form.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Form extends Zend_View_Helper_FormElement @@ -55,9 +55,20 @@ public function form($name, $attribs = null, $content = false) if (array_key_exists('id', $attribs) && empty($attribs['id'])) { unset($attribs['id']); } + + if (!empty($name) && !($this->_isXhtml() && $this->_isStrictDoctype())) { + $name = ' name="' . $this->view->escape($name) . '"'; + } else { + $name = ''; + } + + if ( array_key_exists('name', $attribs) && empty($attribs['id'])) { + unset($attribs['id']); + } $xhtml = '<form' . $id + . $name . $this->_htmlAttribs($attribs) . '>'; diff --git a/library/Zend/View/Helper/FormButton.php b/library/Zend/View/Helper/FormButton.php index 447fb38a7..589ec2699 100644 --- a/library/Zend/View/Helper/FormButton.php +++ b/library/Zend/View/Helper/FormButton.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormButton.php 22290 2010-05-25 14:27:12Z matthew $ + * @version $Id: FormButton.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormButton extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/FormCheckbox.php b/library/Zend/View/Helper/FormCheckbox.php index 313714ce6..e3c72c276 100644 --- a/library/Zend/View/Helper/FormCheckbox.php +++ b/library/Zend/View/Helper/FormCheckbox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormCheckbox.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormCheckbox extends Zend_View_Helper_FormElement @@ -81,12 +81,6 @@ public function formCheckbox($name, $value = null, $attribs = null, array $check $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // build the element $xhtml = ''; if (!$disable && !strstr($name, '[]')) { @@ -99,7 +93,7 @@ public function formCheckbox($name, $value = null, $attribs = null, array $check . $checkedOptions['checkedString'] . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff --git a/library/Zend/View/Helper/FormElement.php b/library/Zend/View/Helper/FormElement.php index a24e128bb..0afd6de01 100644 --- a/library/Zend/View/Helper/FormElement.php +++ b/library/Zend/View/Helper/FormElement.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormElement.php 22290 2010-05-25 14:27:12Z matthew $ + * @version $Id: FormElement.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_FormElement extends Zend_View_Helper_HtmlElement @@ -54,7 +54,7 @@ public function getTranslator() /** * Set translator * - * @param $translator|null Zend_Translate + * @param Zend_Translate $translator * @return Zend_View_Helper_FormElement */ public function setTranslator($translator = null) @@ -115,7 +115,7 @@ protected function _getInfo($name, $value = null, $attribs = null, } } - // If all helper options are passed as an array, attribs may have + // If all helper options are passed as an array, attribs may have // been as well if (null === $attribs) { $attribs = $info['attribs']; @@ -146,6 +146,16 @@ protected function _getInfo($name, $value = null, $attribs = null, $info['id'] = trim(strtr($info['name'], array('[' => '-', ']' => '')), '-'); } + + // Remove NULL name attribute override + if (array_key_exists('name', $attribs) && is_null($attribs['name'])) { + unset($attribs['name']); + } + + // Override name in info if specified in attribs + if (array_key_exists('name', $attribs) && $attribs['name'] != $info['name']) { + $info['name'] = $attribs['name']; + } // Determine escaping from attributes if (array_key_exists('escape', $attribs)) { @@ -178,11 +188,9 @@ protected function _getInfo($name, $value = null, $attribs = null, * * @access protected * - * @param $name The element name. - * - * @param $value The element value. - * - * @param $attribs Attributes for the element. + * @param string $name The element name. + * @param string $value The element value. + * @param array $attribs Attributes for the element. * * @return string A hidden element. */ diff --git a/library/Zend/View/Helper/FormErrors.php b/library/Zend/View/Helper/FormErrors.php index 0f4cad2a3..8affedfce 100644 --- a/library/Zend/View/Helper/FormErrors.php +++ b/library/Zend/View/Helper/FormErrors.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormErrors.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormErrors.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -32,7 +32,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormErrors extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/FormFile.php b/library/Zend/View/Helper/FormFile.php index fb07551ea..df8e81698 100644 --- a/library/Zend/View/Helper/FormFile.php +++ b/library/Zend/View/Helper/FormFile.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormFile.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormFile.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormFile extends Zend_View_Helper_FormElement @@ -62,19 +62,13 @@ public function formFile($name, $attribs = null) $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // build the element $xhtml = '<input type="file"' . ' name="' . $this->view->escape($name) . '"' . ' id="' . $this->view->escape($id) . '"' . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff --git a/library/Zend/View/Helper/FormHidden.php b/library/Zend/View/Helper/FormHidden.php index 68a49a3ed..996af12ae 100644 --- a/library/Zend/View/Helper/FormHidden.php +++ b/library/Zend/View/Helper/FormHidden.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormHidden.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormHidden.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormHidden extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/FormImage.php b/library/Zend/View/Helper/FormImage.php index e589d9627..9b032d6ae 100644 --- a/library/Zend/View/Helper/FormImage.php +++ b/library/Zend/View/Helper/FormImage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormImage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormImage.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormImage extends Zend_View_Helper_FormElement @@ -80,12 +80,6 @@ public function formImage($name, $value = null, $attribs = null) $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // build the element $xhtml = '<input type="image"' . ' name="' . $this->view->escape($name) . '"' @@ -94,7 +88,7 @@ public function formImage($name, $value = null, $attribs = null) . $value . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff --git a/library/Zend/View/Helper/FormLabel.php b/library/Zend/View/Helper/FormLabel.php index e526472a2..133fedac6 100644 --- a/library/Zend/View/Helper/FormLabel.php +++ b/library/Zend/View/Helper/FormLabel.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormLabel.php 22290 2010-05-25 14:27:12Z matthew $ + * @version $Id: FormLabel.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_View_Helper_FormElement **/ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormLabel extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/FormMultiCheckbox.php b/library/Zend/View/Helper/FormMultiCheckbox.php index f18843fc9..222e56a02 100644 --- a/library/Zend/View/Helper/FormMultiCheckbox.php +++ b/library/Zend/View/Helper/FormMultiCheckbox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormMultiCheckbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormMultiCheckbox.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormMultiCheckbox extends Zend_View_Helper_FormRadio diff --git a/library/Zend/View/Helper/FormNote.php b/library/Zend/View/Helper/FormNote.php index af13b1fef..33840264c 100644 --- a/library/Zend/View/Helper/FormNote.php +++ b/library/Zend/View/Helper/FormNote.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormNote.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormNote.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormNote extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/FormPassword.php b/library/Zend/View/Helper/FormPassword.php index aea6b118d..ec88569f2 100644 --- a/library/Zend/View/Helper/FormPassword.php +++ b/library/Zend/View/Helper/FormPassword.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormPassword.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormPassword.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormPassword extends Zend_View_Helper_FormElement @@ -74,12 +74,6 @@ public function formPassword($name, $value = null, $attribs = null) unset($attribs['renderPassword']); } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // render the element $xhtml = '<input type="password"' . ' name="' . $this->view->escape($name) . '"' @@ -87,7 +81,7 @@ public function formPassword($name, $value = null, $attribs = null) . $valueString . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff --git a/library/Zend/View/Helper/FormRadio.php b/library/Zend/View/Helper/FormRadio.php index 646a335e8..6a47de9ad 100644 --- a/library/Zend/View/Helper/FormRadio.php +++ b/library/Zend/View/Helper/FormRadio.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormRadio.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormRadio.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormRadio extends Zend_View_Helper_FormElement @@ -123,15 +123,14 @@ public function formRadio($name, $value = null, $attribs = null, // ensure value is an array to allow matching multiple times $value = (array) $value; - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - + // Set up the filter - Alnum + hyphen + underscore + // require_once 'Zend/Filter/PregReplace.php'; + $pattern = @preg_match('/\pL/u', 'a') + ? '/[^\p{L}\p{N}\-\_]/u' // Unicode + : '/[^a-zA-Z0-9\-\_]/'; // No Unicode + $filter = new Zend_Filter_PregReplace($pattern, ""); + // add radio buttons to the list. - // require_once 'Zend/Filter/Alnum.php'; - $filter = new Zend_Filter_Alnum(); foreach ($options as $opt_value => $opt_label) { // Should the label be escaped? @@ -167,7 +166,7 @@ public function formRadio($name, $value = null, $attribs = null, . $checked . $disabled . $this->_htmlAttribs($attribs) - . $endTag + . $this->getClosingBracket() . (('append' == $labelPlacement) ? $opt_label : '') . '</label>'; diff --git a/library/Zend/View/Helper/FormReset.php b/library/Zend/View/Helper/FormReset.php index 1f0f747a7..41ed4866c 100644 --- a/library/Zend/View/Helper/FormReset.php +++ b/library/Zend/View/Helper/FormReset.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormReset.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormReset.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormReset extends Zend_View_Helper_FormElement @@ -64,12 +64,6 @@ public function formReset($name = '', $value = 'Reset', $attribs = null) $disabled = ' disabled="disabled"'; } - // get closing tag - $endTag = '>'; - if ($this->view->doctype()->isXhtml()) { - $endTag = ' />'; - } - // Render button $xhtml = '<input type="reset"' . ' name="' . $this->view->escape($name) . '"' @@ -82,7 +76,7 @@ public function formReset($name = '', $value = 'Reset', $attribs = null) } // add attributes, close, and return - $xhtml .= $this->_htmlAttribs($attribs) . $endTag; + $xhtml .= $this->_htmlAttribs($attribs) . $this->getClosingBracket(); return $xhtml; } } diff --git a/library/Zend/View/Helper/FormSelect.php b/library/Zend/View/Helper/FormSelect.php index d8a23717b..22ca16343 100644 --- a/library/Zend/View/Helper/FormSelect.php +++ b/library/Zend/View/Helper/FormSelect.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormSelect.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormSelect.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormSelect extends Zend_View_Helper_FormElement @@ -123,8 +123,11 @@ public function formSelect($name, $value = null, $attribs = null, if (null !== $translator) { $opt_value = $translator->translate($opt_value); } + $opt_id = ' id="' . $this->view->escape($id) . '-optgroup-' + . $this->view->escape($opt_value) . '"'; $list[] = '<optgroup' . $opt_disable + . $opt_id . ' label="' . $this->view->escape($opt_value) .'">'; foreach ($opt_label as $val => $lab) { $list[] = $this->_build($val, $lab, $value, $disable); diff --git a/library/Zend/View/Helper/FormSubmit.php b/library/Zend/View/Helper/FormSubmit.php index 119023609..35bcdf545 100644 --- a/library/Zend/View/Helper/FormSubmit.php +++ b/library/Zend/View/Helper/FormSubmit.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormSubmit.php 23403 2010-11-19 19:23:29Z bittarman $ + * @version $Id: FormSubmit.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormSubmit extends Zend_View_Helper_FormElement @@ -67,12 +67,6 @@ public function formSubmit($name, $value = null, $attribs = null) $id = ' id="' . $this->view->escape($id) . '"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - // Render the button. $xhtml = '<input type="submit"' . ' name="' . $this->view->escape($name) . '"' @@ -80,7 +74,7 @@ public function formSubmit($name, $value = null, $attribs = null) . ' value="' . $this->view->escape($value) . '"' . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff --git a/library/Zend/View/Helper/FormText.php b/library/Zend/View/Helper/FormText.php index 2f9b437ef..45b6d0f15 100644 --- a/library/Zend/View/Helper/FormText.php +++ b/library/Zend/View/Helper/FormText.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormText.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormText.php 24751 2012-05-05 01:32:30Z adamlundrigan $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormText extends Zend_View_Helper_FormElement @@ -65,19 +65,13 @@ public function formText($name, $value = null, $attribs = null) $disabled = ' disabled="disabled"'; } - // XHTML or HTML end tag? - $endTag = ' />'; - if (($this->view instanceof Zend_View_Abstract) && !$this->view->doctype()->isXhtml()) { - $endTag= '>'; - } - $xhtml = '<input type="text"' . ' name="' . $this->view->escape($name) . '"' . ' id="' . $this->view->escape($id) . '"' . ' value="' . $this->view->escape($value) . '"' . $disabled . $this->_htmlAttribs($attribs) - . $endTag; + . $this->getClosingBracket(); return $xhtml; } diff --git a/library/Zend/View/Helper/FormTextarea.php b/library/Zend/View/Helper/FormTextarea.php index cf12c1b08..b0b93bb06 100644 --- a/library/Zend/View/Helper/FormTextarea.php +++ b/library/Zend/View/Helper/FormTextarea.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormTextarea.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormTextarea.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_FormTextarea extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/Gravatar.php b/library/Zend/View/Helper/Gravatar.php index 5d0e5b5d5..cf3d1755c 100644 --- a/library/Zend/View/Helper/Gravatar.php +++ b/library/Zend/View/Helper/Gravatar.php @@ -67,9 +67,9 @@ class Zend_View_Helper_Gravatar extends Zend_View_Helper_HtmlElement * @var array */ protected $_options = array( - 'img_size' => 80, - 'default_img' => self::DEFAULT_MM, - 'rating' => self::RATING_G, + 'img_size' => 80, + 'default_img' => self::DEFAULT_MM, + 'rating' => self::RATING_G, 'secure' => null, ); @@ -113,8 +113,8 @@ public function gravatar($email = "", $options = array(), $attribs = array()) /** * Configure state - * - * @param array $options + * + * @param array $options * @return Zend_View_Helper_Gravatar */ public function setOptions(array $options) @@ -188,8 +188,8 @@ public function setRating($rating) { switch ($rating) { case self::RATING_G: - case self::RATING_PG: - case self::RATING_R: + case self::RATING_PG: + case self::RATING_R: case self::RATING_X: $this->_options['rating'] = $rating; break; @@ -244,7 +244,7 @@ public function getEmail() public function setSecure($flag) { $this->_options['secure'] = ($flag === null) ? null : (bool) $flag; - return $this; + return $this; } /** @@ -264,8 +264,8 @@ public function getSecure() * Get attribs of image * * Warning! - * If you set src attrib, you get it, but this value will be overwritten in - * protected method _setSrcAttribForImg(). And finally your get other src + * If you set src attrib, you get it, but this value will be overwritten in + * protected method _setSrcAttribForImg(). And finally your get other src * value! * * @return array @@ -303,7 +303,7 @@ protected function _getGravatarUrl() /** * Get avatar url (including size, rating and default image oprions) - * + * * @return string */ protected function _getAvatarUrl() @@ -336,9 +336,9 @@ protected function _setSrcAttribForImg() } /** - * Return valid image tag + * Return valid image tag * - * @return string + * @return string */ public function getImgTag() { @@ -349,7 +349,7 @@ public function getImgTag() return $html; } - + /** * Return valid image tag * diff --git a/library/Zend/View/Helper/HeadLink.php b/library/Zend/View/Helper/HeadLink.php index 409dd5432..e2ce4c0d0 100644 --- a/library/Zend/View/Helper/HeadLink.php +++ b/library/Zend/View/Helper/HeadLink.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadLink.php 23249 2010-10-26 12:46:47Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadLink.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_Standalone diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php index 247f6947c..c74b3cf5a 100644 --- a/library/Zend/View/Helper/HeadMeta.php +++ b/library/Zend/View/Helper/HeadMeta.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadMeta.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadMeta.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone @@ -39,7 +39,7 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S * Types of attributes * @var array */ - protected $_typeKeys = array('name', 'http-equiv', 'charset'); + protected $_typeKeys = array('name', 'http-equiv', 'charset', 'property'); protected $_requiredKeys = array('content'); protected $_modifierKeys = array('lang', 'scheme'); @@ -98,6 +98,8 @@ protected function _normalizeType($type) return 'name'; case 'HttpEquiv': return 'http-equiv'; + case 'Property': + return 'property'; default: // require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type)); @@ -118,6 +120,10 @@ protected function _normalizeType($type) * - offsetGetHttpEquiv($index, $keyValue, $content, $modifers = array()) * - prependHttpEquiv($keyValue, $content, $modifiers = array()) * - setHttpEquiv($keyValue, $content, $modifiers = array()) + * - appendProperty($keyValue, $content, $modifiers = array()) + * - offsetGetProperty($index, $keyValue, $content, $modifiers = array()) + * - prependProperty($keyValue, $content, $modifiers = array()) + * - setProperty($keyValue, $content, $modifiers = array()) * * @param string $method * @param array $args @@ -125,7 +131,7 @@ protected function _normalizeType($type) */ public function __call($method, $args) { - if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv)$/', $method, $matches)) { + if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property)$/', $method, $matches)) { $action = $matches['action']; $type = $this->_normalizeType($matches['type']); $argc = count($args); @@ -164,10 +170,10 @@ public function __call($method, $args) /** * Create an HTML5-style meta charset tag. Something like <meta charset="utf-8"> - * + * * Not valid in a non-HTML5 doctype * - * @param string $charset + * @param string $charset * @return Zend_View_Helper_HeadMeta Provides a fluent interface */ public function setCharset($charset) @@ -202,6 +208,12 @@ protected function _isValid($item) return false; } + // <meta property= ... /> is only supported with doctype RDFa + if (!$this->view->doctype()->isRdfa() + && $item->type === 'property') { + return false; + } + return true; } @@ -344,9 +356,9 @@ public function itemToString(stdClass $item) if ($this->view instanceof Zend_View_Abstract) { if ($this->view->doctype()->isHtml5() && $type == 'charset') { - $tpl = ($this->view->doctype()->isXhtml()) - ? '<meta %s="%s"/>' - : '<meta %s="%s">'; + $tpl = ($this->view->doctype()->isXhtml()) + ? '<meta %s="%s"/>' + : '<meta %s="%s">'; } elseif ($this->view->doctype()->isXhtml()) { $tpl = '<meta %s="%s" content="%s" %s/>'; } else { @@ -363,6 +375,14 @@ public function itemToString(stdClass $item) $this->_escape($item->content), $modifiersString ); + + if (isset($item->modifiers['conditional']) + && !empty($item->modifiers['conditional']) + && is_string($item->modifiers['conditional'])) + { + $meta = '<!--[if ' . $this->_escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->'; + } + return $meta; } diff --git a/library/Zend/View/Helper/HeadScript.php b/library/Zend/View/Helper/HeadScript.php index 7ffa5d628..2eb2d8d10 100644 --- a/library/Zend/View/Helper/HeadScript.php +++ b/library/Zend/View/Helper/HeadScript.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadScript.php 20363 2010-01-17 22:55:25Z mabe $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadScript.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container_Standalone @@ -371,7 +371,6 @@ public function offsetSet($index, $value) throw $e; } - $this->_isValid($value); return $this->getContainer()->offsetSet($index, $value); } diff --git a/library/Zend/View/Helper/HeadStyle.php b/library/Zend/View/Helper/HeadStyle.php index 32df95140..c8e3883a8 100644 --- a/library/Zend/View/Helper/HeadStyle.php +++ b/library/Zend/View/Helper/HeadStyle.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadStyle.php 20104 2010-01-06 21:26:01Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadStyle.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_Standalone @@ -355,14 +355,21 @@ public function itemToString(stdClass $item, $indent) } } + $escapeStart = $indent . '<!--'. PHP_EOL; + $escapeEnd = $indent . '-->'. PHP_EOL; + if (isset($item->attributes['conditional']) + && !empty($item->attributes['conditional']) + && is_string($item->attributes['conditional']) + ) { + $escapeStart = null; + $escapeEnd = null; + } + $html = '<style type="text/css"' . $attrString . '>' . PHP_EOL - . $indent . '<!--' . PHP_EOL . $indent . $item->content . PHP_EOL . $indent . '-->' . PHP_EOL + . $escapeStart . $indent . $item->content . PHP_EOL . $escapeEnd . '</style>'; - if (isset($item->attributes['conditional']) - && !empty($item->attributes['conditional']) - && is_string($item->attributes['conditional'])) - { + if (null == $escapeStart && null == $escapeEnd) { $html = '<!--[if ' . $item->attributes['conditional'] . ']> ' . $html . '<![endif]-->'; } diff --git a/library/Zend/View/Helper/HeadTitle.php b/library/Zend/View/Helper/HeadTitle.php index 8fee4dcb4..525e276f6 100644 --- a/library/Zend/View/Helper/HeadTitle.php +++ b/library/Zend/View/Helper/HeadTitle.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: HeadTitle.php 23388 2010-11-19 00:37:55Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: HeadTitle.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * @uses Zend_View_Helper_Placeholder_Container_Standalone * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_Standalone @@ -69,10 +69,10 @@ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_ */ public function headTitle($title = null, $setType = null) { - if ($setType === null && $this->getDefaultAttachOrder() === null) { - $setType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND; - } elseif ($setType === null && $this->getDefaultAttachOrder() !== null) { - $setType = $this->getDefaultAttachOrder(); + if (null === $setType) { + $setType = (null === $this->getDefaultAttachOrder()) + ? Zend_View_Helper_Placeholder_Container_Abstract::APPEND + : $this->getDefaultAttachOrder(); } $title = (string) $title; if ($title !== '') { diff --git a/library/Zend/View/Helper/HtmlElement.php b/library/Zend/View/Helper/HtmlElement.php index d3c3588fe..052bead12 100644 --- a/library/Zend/View/Helper/HtmlElement.php +++ b/library/Zend/View/Helper/HtmlElement.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlElement.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlElement.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_HtmlElement extends Zend_View_Helper_Abstract @@ -75,6 +75,17 @@ protected function _isXhtml() return $doctype->isXhtml(); } + /** + * Is doctype strict? + * + * @return boolean + */ + protected function _isStrictDoctype() + { + $doctype = $this->view->doctype(); + return $doctype->isStrict(); + } + /** * Converts an associative array to a string of tag attributes. * @@ -98,7 +109,11 @@ protected function _htmlAttribs($attribs) // require_once 'Zend/Json.php'; $val = Zend_Json::encode($val); } - $val = preg_replace('/"([^"]*)":/', '$1:', $val); + // Escape single quotes inside event attribute values. + // This will create html, where the attribute value has + // single quotes around it, and escaped single quotes or + // non-escaped double quotes inside of it + $val = str_replace('\'', ''', $val); } else { if (is_array($val)) { $val = implode(' ', $val); diff --git a/library/Zend/View/Helper/HtmlFlash.php b/library/Zend/View/Helper/HtmlFlash.php index 17fca018e..923715996 100644 --- a/library/Zend/View/Helper/HtmlFlash.php +++ b/library/Zend/View/Helper/HtmlFlash.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlFlash.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlFlash.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlFlash extends Zend_View_Helper_HtmlObject diff --git a/library/Zend/View/Helper/HtmlList.php b/library/Zend/View/Helper/HtmlList.php index 989443052..a85a5a6b6 100644 --- a/library/Zend/View/Helper/HtmlList.php +++ b/library/Zend/View/Helper/HtmlList.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlList.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlList.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlList extends Zend_View_Helper_FormElement diff --git a/library/Zend/View/Helper/HtmlObject.php b/library/Zend/View/Helper/HtmlObject.php index 9593dfa85..0bb59753c 100644 --- a/library/Zend/View/Helper/HtmlObject.php +++ b/library/Zend/View/Helper/HtmlObject.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlObject.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlObject.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlObject extends Zend_View_Helper_HtmlElement diff --git a/library/Zend/View/Helper/HtmlPage.php b/library/Zend/View/Helper/HtmlPage.php index 0388e92df..752e3b0da 100644 --- a/library/Zend/View/Helper/HtmlPage.php +++ b/library/Zend/View/Helper/HtmlPage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlPage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlPage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlPage extends Zend_View_Helper_HtmlObject diff --git a/library/Zend/View/Helper/HtmlQuicktime.php b/library/Zend/View/Helper/HtmlQuicktime.php index a377c0a7c..820f7be5d 100644 --- a/library/Zend/View/Helper/HtmlQuicktime.php +++ b/library/Zend/View/Helper/HtmlQuicktime.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HtmlQuicktime.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HtmlQuicktime.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -29,7 +29,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_HtmlQuicktime extends Zend_View_Helper_HtmlObject diff --git a/library/Zend/View/Helper/InlineScript.php b/library/Zend/View/Helper/InlineScript.php index c80d4a6bd..18ccb7d43 100644 --- a/library/Zend/View/Helper/InlineScript.php +++ b/library/Zend/View/Helper/InlineScript.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: InlineScript.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: InlineScript.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @uses Zend_View_Helper_Head_Script * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_InlineScript extends Zend_View_Helper_HeadScript diff --git a/library/Zend/View/Helper/Interface.php b/library/Zend/View/Helper/Interface.php index 26ea148d2..5039e262f 100644 --- a/library/Zend/View/Helper/Interface.php +++ b/library/Zend/View/Helper/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_View_Helper_Interface diff --git a/library/Zend/View/Helper/Json.php b/library/Zend/View/Helper/Json.php index 46e9bd4a7..78ae38044 100644 --- a/library/Zend/View/Helper/Json.php +++ b/library/Zend/View/Helper/Json.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Json.php 23451 2010-11-28 13:10:03Z ramon $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Json.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Json extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Layout.php b/library/Zend/View/Helper/Layout.php index 4c458cad7..82d25763d 100644 --- a/library/Zend/View/Helper/Layout.php +++ b/library/Zend/View/Helper/Layout.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Layout.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Layout.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Layout extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php index c0d8ce841..81a9575c1 100644 --- a/library/Zend/View/Helper/Navigation.php +++ b/library/Zend/View/Helper/Navigation.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Navigation.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation diff --git a/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/library/Zend/View/Helper/Navigation/Breadcrumbs.php index 5298b48bd..097843c35 100644 --- a/library/Zend/View/Helper/Navigation/Breadcrumbs.php +++ b/library/Zend/View/Helper/Navigation/Breadcrumbs.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Breadcrumbs.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Breadcrumbs.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Breadcrumbs @@ -293,8 +293,8 @@ public function renderPartial(Zend_Navigation_Container $container = null, if (count($partial) != 2) { // require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( - 'Unable to render menu: A view partial supplied as ' - . 'an array must contain two values: partial view ' + 'Unable to render menu: A view partial supplied as ' + . 'an array must contain two values: partial view ' . 'script and module where script can be found' ); $e->setView($this->view); diff --git a/library/Zend/View/Helper/Navigation/Helper.php b/library/Zend/View/Helper/Navigation/Helper.php index 48c0ae8c9..690fecb31 100644 --- a/library/Zend/View/Helper/Navigation/Helper.php +++ b/library/Zend/View/Helper/Navigation/Helper.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Helper.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Helper.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_View_Helper_Navigation_Helper diff --git a/library/Zend/View/Helper/Navigation/HelperAbstract.php b/library/Zend/View/Helper/Navigation/HelperAbstract.php index 399ad68c6..d297dcf08 100644 --- a/library/Zend/View/Helper/Navigation/HelperAbstract.php +++ b/library/Zend/View/Helper/Navigation/HelperAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelperAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HelperAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Navigation_HelperAbstract @@ -377,7 +377,7 @@ public function setRole($role = null) } else { // require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( - '$role must be a string, null, or an instance of ' + '$role must be a string, null, or an instance of ' . 'Zend_Acl_Role_Interface; %s given', gettype($role) )); diff --git a/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php index 6fb663122..e840b1c48 100644 --- a/library/Zend/View/Helper/Navigation/Links.php +++ b/library/Zend/View/Helper/Navigation/Links.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Links.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Links.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Links diff --git a/library/Zend/View/Helper/Navigation/Menu.php b/library/Zend/View/Helper/Navigation/Menu.php index 365d21f63..56957a0a4 100644 --- a/library/Zend/View/Helper/Navigation/Menu.php +++ b/library/Zend/View/Helper/Navigation/Menu.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Menu.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Menu.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Menu @@ -234,6 +234,7 @@ public function htmlify(Zend_Navigation_Page $page) $element = 'a'; $attribs['href'] = $href; $attribs['target'] = $page->getTarget(); + $attribs['accesskey'] = $page->getAccessKey(); } else { $element = 'span'; } @@ -602,8 +603,8 @@ public function renderPartial(Zend_Navigation_Container $container = null, if (count($partial) != 2) { // require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( - 'Unable to render menu: A view partial supplied as ' - . 'an array must contain two values: partial view ' + 'Unable to render menu: A view partial supplied as ' + . 'an array must contain two values: partial view ' . 'script and module where script can be found' ); $e->setView($this->view); diff --git a/library/Zend/View/Helper/Navigation/Sitemap.php b/library/Zend/View/Helper/Navigation/Sitemap.php index a8ee63570..91fb016b2 100644 --- a/library/Zend/View/Helper/Navigation/Sitemap.php +++ b/library/Zend/View/Helper/Navigation/Sitemap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sitemap.php 20104 2010-01-06 21:26:01Z matthew $ + * @version $Id: Sitemap.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Navigation_Sitemap @@ -405,7 +405,7 @@ public function getDomSitemap(Zend_Navigation_Container $container = null) // prevent 1970-01-01... if ($lastmod !== false) { - $lastmod = date("Y-m-d H:i:s", $lastmod); + $lastmod = date('c', $lastmod); } if (!$this->getUseSitemapValidators() || diff --git a/library/Zend/View/Helper/PaginationControl.php b/library/Zend/View/Helper/PaginationControl.php index 12db5a73e..fde291ce5 100644 --- a/library/Zend/View/Helper/PaginationControl.php +++ b/library/Zend/View/Helper/PaginationControl.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PaginationControl.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PaginationControl.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_PaginationControl diff --git a/library/Zend/View/Helper/Partial.php b/library/Zend/View/Helper/Partial.php index a6cbe4518..8e6618300 100644 --- a/library/Zend/View/Helper/Partial.php +++ b/library/Zend/View/Helper/Partial.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Partial.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Partial.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Partial extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Partial/Exception.php b/library/Zend/View/Helper/Partial/Exception.php index 18459a01d..4d4c9dd85 100644 --- a/library/Zend/View/Helper/Partial/Exception.php +++ b/library/Zend/View/Helper/Partial/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Partial_Exception extends Zend_View_Exception diff --git a/library/Zend/View/Helper/PartialLoop.php b/library/Zend/View/Helper/PartialLoop.php index 23d6a0bf8..526d19176 100644 --- a/library/Zend/View/Helper/PartialLoop.php +++ b/library/Zend/View/Helper/PartialLoop.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: PartialLoop.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: PartialLoop.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_PartialLoop extends Zend_View_Helper_Partial diff --git a/library/Zend/View/Helper/Placeholder.php b/library/Zend/View/Helper/Placeholder.php index b8fa4648e..e40e621ca 100644 --- a/library/Zend/View/Helper/Placeholder.php +++ b/library/Zend/View/Helper/Placeholder.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Placeholder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Placeholder.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Placeholder/Container.php b/library/Zend/View/Helper/Placeholder/Container.php index afb1ef8b6..59a449530 100644 --- a/library/Zend/View/Helper/Placeholder/Container.php +++ b/library/Zend/View/Helper/Placeholder/Container.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Container.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Container.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Container extends Zend_View_Helper_Placeholder_Container_Abstract diff --git a/library/Zend/View/Helper/Placeholder/Container/Abstract.php b/library/Zend/View/Helper/Placeholder/Container/Abstract.php index 42a4a52fc..dc61587ff 100644 --- a/library/Zend/View/Helper/Placeholder/Container/Abstract.php +++ b/library/Zend/View/Helper/Placeholder/Container/Abstract.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObject diff --git a/library/Zend/View/Helper/Placeholder/Container/Exception.php b/library/Zend/View/Helper/Placeholder/Container/Exception.php index f49ef7b3a..29ca32a6f 100644 --- a/library/Zend/View/Helper/Placeholder/Container/Exception.php +++ b/library/Zend/View/Helper/Placeholder/Container/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Container_Exception extends Zend_View_Exception diff --git a/library/Zend/View/Helper/Placeholder/Container/Standalone.php b/library/Zend/View/Helper/Placeholder/Container/Standalone.php index ed692001b..5e94e7184 100644 --- a/library/Zend/View/Helper/Placeholder/Container/Standalone.php +++ b/library/Zend/View/Helper/Placeholder/Container/Standalone.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Standalone.php 20143 2010-01-08 15:17:11Z matthew $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Standalone.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_View_Helper_Abstract implements IteratorAggregate, Countable, ArrayAccess diff --git a/library/Zend/View/Helper/Placeholder/Registry.php b/library/Zend/View/Helper/Placeholder/Registry.php index 2584f7ac7..a19bc85eb 100644 --- a/library/Zend/View/Helper/Placeholder/Registry.php +++ b/library/Zend/View/Helper/Placeholder/Registry.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Registry.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Registry.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Registry @@ -85,7 +85,7 @@ public function createContainer($key, array $value = array()) { $key = (string) $key; - $this->_items[$key] = new $this->_containerClass(array()); + $this->_items[$key] = new $this->_containerClass($value); return $this->_items[$key]; } diff --git a/library/Zend/View/Helper/Placeholder/Registry/Exception.php b/library/Zend/View/Helper/Placeholder/Registry/Exception.php index 2a66f886a..821e28926 100644 --- a/library/Zend/View/Helper/Placeholder/Registry/Exception.php +++ b/library/Zend/View/Helper/Placeholder/Registry/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Placeholder_Registry_Exception extends Zend_View_Exception diff --git a/library/Zend/View/Helper/RenderToPlaceholder.php b/library/Zend/View/Helper/RenderToPlaceholder.php index db6226473..447297f0b 100644 --- a/library/Zend/View/Helper/RenderToPlaceholder.php +++ b/library/Zend/View/Helper/RenderToPlaceholder.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: RenderToPlaceholder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: RenderToPlaceholder.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -40,8 +40,8 @@ class Zend_View_Helper_RenderToPlaceholder extends Zend_View_Helper_Abstract * Renders a template and stores the rendered output as a placeholder * variable for later use. * - * @param $script The template script to render - * @param $placeholder The placeholder variable name in which to store the rendered output + * @param string $script The template script to render + * @param string $placeholder The placeholder variable name in which to store the rendered output * @return void */ public function renderToPlaceholder($script, $placeholder) diff --git a/library/Zend/View/Helper/ServerUrl.php b/library/Zend/View/Helper/ServerUrl.php index 4de0e710f..39f8861b1 100644 --- a/library/Zend/View/Helper/ServerUrl.php +++ b/library/Zend/View/Helper/ServerUrl.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServerUrl.php 23371 2010-11-18 20:49:55Z bittarman $ + * @version $Id: ServerUrl.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_ServerUrl @@ -59,7 +59,7 @@ public function __construct() $scheme = 'https'; break; default: - $scheme = 'http'; + $scheme = 'http'; } $this->setScheme($scheme); diff --git a/library/Zend/View/Helper/TinySrc.php b/library/Zend/View/Helper/TinySrc.php index b1dac6494..916b00278 100644 --- a/library/Zend/View/Helper/TinySrc.php +++ b/library/Zend/View/Helper/TinySrc.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,31 +25,31 @@ /** * Helper for generating urls and/or image tags for use with tinysrc.net * - * tinysrc.net provides an API for generating scaled, browser device-specific + * tinysrc.net provides an API for generating scaled, browser device-specific * images. In essence, you pass the API the URL to an image on your own server, * and tinysrc.net then provides the appropriate image based on the device that * accesses it. * - * Additionally, tinysrc.net allows you to specify additional configuration via + * Additionally, tinysrc.net allows you to specify additional configuration via * the API: * * - image size. You may define this as: * - explicit size * - subtractive size (size of screen minus specified number of pixels) * - percentage size (percentage of screen size)) - * - image format. This will convert the image to the given format; allowed + * - image format. This will convert the image to the given format; allowed * values are "png" or "jpeg". By default, gif images are converted to png. * * This helper allows you to specify all configuration options, as well as: * * - whether or not to generate the full image tag (or just the URL) - * - base url to images (which should include the protocol, server, and + * - base url to images (which should include the protocol, server, and * optionally port and base path) * * @see http://tinysrc.net/ * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_TinySrc extends Zend_View_Helper_HtmlElement @@ -74,9 +74,9 @@ class Zend_View_Helper_TinySrc extends Zend_View_Helper_HtmlElement /** * Default options * - * Used when determining what options were passed, and needing to merge + * Used when determining what options were passed, and needing to merge * them with default options. - * + * * @var array */ protected $_defaultOptions = array( @@ -94,9 +94,9 @@ class Zend_View_Helper_TinySrc extends Zend_View_Helper_HtmlElement /** * Generate a link or image tag pointing to tinysrc.net - * - * @param mixed $image - * @param array $options + * + * @param mixed $image + * @param array $options * @return void */ public function tinySrc($image = null, array $options = array()) @@ -111,8 +111,8 @@ public function tinySrc($image = null, array $options = array()) $url = '/' . $this->_mergeBaseUrl($options) . ltrim($image, '/'); - $src = self::TINYSRC_BASE - . $this->_mergeFormat($options) + $src = self::TINYSRC_BASE + . $this->_mergeFormat($options) . $this->_mergeDimensions($options) . $url; @@ -142,8 +142,8 @@ public function tinySrc($image = null, array $options = array()) /** * Set base URL for images - * - * @param string $url + * + * @param string $url * @return Zend_View_Helper_TinySrc */ public function setBaseUrl($url) @@ -157,7 +157,7 @@ public function setBaseUrl($url) * * If none already set, uses the ServerUrl and BaseUrl view helpers to * determine the base URL to images. - * + * * @return string */ public function getBaseUrl() @@ -172,8 +172,8 @@ public function getBaseUrl() * Set default image format * * If set, this will set the default format to use on all images. - * - * @param null|string $format + * + * @param null|string $format * @return Zend_View_Helper_TinySrc * @throws Zend_View_Exception */ @@ -196,12 +196,12 @@ public function setDefaultFormat($format = null) /** * Set default dimensions * - * If null is specified for width, default dimensions will be cleared. If + * If null is specified for width, default dimensions will be cleared. If * only width is specified, only width will be used. If either dimension * fails validation, an exception is raised. - * - * @param null|int|string $width - * @param null|int|string $height + * + * @param null|int|string $width + * @param null|int|string $height * @return Zend_View_Helper_TinySrc * @throws Zend_View_Exception */ @@ -232,8 +232,8 @@ public function setDefaultDimensions($width = null, $height = null) /** * Set state of "create tag" flag - * - * @param bool $flag + * + * @param bool $flag * @return Zend_View_Helper_TinySrc */ public function setCreateTag($flag) @@ -244,7 +244,7 @@ public function setCreateTag($flag) /** * Should the helper create an image tag? - * + * * @return bool */ public function createTag() @@ -256,8 +256,8 @@ public function createTag() * Validate a dimension * * Dimensions may be integers, optionally preceded by '-' or 'x'. - * - * @param string $dim + * + * @param string $dim * @return bool */ protected function _validateDimension($dim) @@ -270,8 +270,8 @@ protected function _validateDimension($dim) /** * Determine whether to use default base URL, or base URL from options - * - * @param array $options + * + * @param array $options * @return string */ protected function _mergeBaseUrl(array $options) @@ -284,11 +284,11 @@ protected function _mergeBaseUrl(array $options) /** * Determine whether to use default format or format provided in options. - * - * @param array $options + * + * @param array $options * @return string */ - protected function _mergeFormat(array $options) + protected function _mergeFormat(array $options) { if (in_array($options['format'], array('png', 'jpeg'))) { return '/' . $options['format']; @@ -298,8 +298,8 @@ protected function _mergeFormat(array $options) /** * Determine whether to use default dimensions, or those passed in options. - * - * @param array $options + * + * @param array $options * @return string */ protected function _mergeDimensions(array $options) diff --git a/library/Zend/View/Helper/Translate.php b/library/Zend/View/Helper/Translate.php index 8b1b49582..f1491b620 100644 --- a/library/Zend/View/Helper/Translate.php +++ b/library/Zend/View/Helper/Translate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 20140 2010-01-08 05:21:04Z thomas $ + * @version $Id: Translate.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Locale */ @@ -31,7 +31,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/Url.php b/library/Zend/View/Helper/Url.php index 04e5cdb11..2574ffcf9 100644 --- a/library/Zend/View/Helper/Url.php +++ b/library/Zend/View/Helper/Url.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Url.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Url.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_Url extends Zend_View_Helper_Abstract diff --git a/library/Zend/View/Helper/UserAgent.php b/library/Zend/View/Helper/UserAgent.php index 64e1dae66..61e66696e 100644 --- a/library/Zend/View/Helper/UserAgent.php +++ b/library/Zend/View/Helper/UserAgent.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,15 +27,22 @@ * * @package Zend_View * @subpackage Helper - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Helper_UserAgent extends Zend_View_Helper_Abstract { + /** + * UserAgent instance + * + * @var Zend_Http_UserAgent + */ + protected $_userAgent = null; + /** * Helper method: retrieve or set UserAgent instance - * - * @param null|Zend_Http_UserAgent $userAgent + * + * @param null|Zend_Http_UserAgent $userAgent * @return Zend_Http_UserAgent */ public function userAgent(Zend_Http_UserAgent $userAgent = null) @@ -48,8 +55,8 @@ public function userAgent(Zend_Http_UserAgent $userAgent = null) /** * Set UserAgent instance - * - * @param Zend_Http_UserAgent $userAgent + * + * @param Zend_Http_UserAgent $userAgent * @return Zend_View_Helper_UserAgent */ public function setUserAgent(Zend_Http_UserAgent $userAgent) @@ -62,7 +69,7 @@ public function setUserAgent(Zend_Http_UserAgent $userAgent) * Retrieve UserAgent instance * * If none set, instantiates one using no configuration - * + * * @return Zend_Http_UserAgent */ public function getUserAgent() diff --git a/library/Zend/View/Interface.php b/library/Zend/View/Interface.php index 501535e82..504e42b66 100644 --- a/library/Zend/View/Interface.php +++ b/library/Zend/View/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20210 2010-01-12 02:06:34Z yoshida@zend.co.jp $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_View_Interface diff --git a/library/Zend/View/Stream.php b/library/Zend/View/Stream.php index f4869ddc9..26e618c0a 100644 --- a/library/Zend/View/Stream.php +++ b/library/Zend/View/Stream.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stream.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -34,7 +34,7 @@ * * @category Zend * @package Zend_View - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_View_Stream diff --git a/library/Zend/Wildfire/Channel/HttpHeaders.php b/library/Zend/Wildfire/Channel/HttpHeaders.php index bf7cdc9aa..ab66b0491 100644 --- a/library/Zend/Wildfire/Channel/HttpHeaders.php +++ b/library/Zend/Wildfire/Channel/HttpHeaders.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Channel - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpHeaders.php 23096 2010-10-12 20:36:15Z cadorn $ + * @version $Id: HttpHeaders.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Wildfire_Channel_Interface */ @@ -44,7 +44,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Channel - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract implements Zend_Wildfire_Channel_Interface @@ -115,7 +115,7 @@ public static function init($class = null) /** * Get or create singleton instance * - * @param $skipCreate boolean True if an instance should not be created + * @param bool $skipCreate True if an instance should not be created * @return Zend_Wildfire_Channel_HttpHeaders */ public static function getInstance($skipCreate=false) diff --git a/library/Zend/Wildfire/Channel/Interface.php b/library/Zend/Wildfire/Channel/Interface.php index 46c9bf2ab..b4a997b6e 100644 --- a/library/Zend/Wildfire/Channel/Interface.php +++ b/library/Zend/Wildfire/Channel/Interface.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Wildfire_Channel_Interface diff --git a/library/Zend/Wildfire/Exception.php b/library/Zend/Wildfire/Exception.php index 8ac701e42..56e945571 100644 --- a/library/Zend/Wildfire/Exception.php +++ b/library/Zend/Wildfire/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Wildfire - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Exception extends Zend_Exception diff --git a/library/Zend/Wildfire/Plugin/FirePhp.php b/library/Zend/Wildfire/Plugin/FirePhp.php index 2c1cf66e7..4ec635cd9 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp.php +++ b/library/Zend/Wildfire/Plugin/FirePhp.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FirePhp.php 23066 2010-10-09 23:29:20Z cadorn $ + * @version $Id: FirePhp.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Controller_Request_Abstract */ @@ -41,7 +41,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface @@ -214,7 +214,7 @@ protected function __construct() /** * Get or create singleton instance * - * @param $skipCreate boolean True if an instance should not be created + * @param bool $skipCreate True if an instance should not be created * @return Zend_Wildfire_Plugin_FirePhp */ public static function getInstance($skipCreate=false) @@ -323,11 +323,12 @@ public function setObjectFilter($class, $filter) { * Starts a group in the Firebug Console * * @param string $title The title of the group + * @param array $options OPTIONAL Setting 'Collapsed' to true will initialize group collapsed instead of expanded * @return TRUE if the group instruction was added to the response headers or buffered. */ - public static function group($title) + public static function group($title, $options=array()) { - return self::send(null, $title, self::GROUP_START); + return self::send(null, $title, self::GROUP_START, $options); } /** @@ -488,6 +489,12 @@ public static function send($var, $label=null, $style=null, $options=array()) unset($meta['Line']); } + if ($meta['Type'] == self::GROUP_START) { + if (isset($options['Collapsed'])) { + $meta['Collapsed'] = ($options['Collapsed'])?'true':'false'; + } + } + if ($meta['Type'] == self::DUMP) { return $firephp->_recordMessage(self::STRUCTURE_URI_DUMP, @@ -515,7 +522,7 @@ protected function _getStackTrace($options) $trace = debug_backtrace(); $trace = array_splice($trace, $options['traceOffset']); - + if (!count($trace)) { return $trace; } diff --git a/library/Zend/Wildfire/Plugin/FirePhp/Message.php b/library/Zend/Wildfire/Plugin/FirePhp/Message.php index f6e2cad09..a9646f2be 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp/Message.php +++ b/library/Zend/Wildfire/Plugin/FirePhp/Message.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Plugin_FirePhp_Message diff --git a/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php b/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php index 99b13dcdc..471ba10fa 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php +++ b/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TableMessage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TableMessage.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Wildfire_Plugin_FirePhp */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_FirePhp_Message diff --git a/library/Zend/Wildfire/Plugin/Interface.php b/library/Zend/Wildfire/Plugin/Interface.php index ae948102e..2d22ce1e3 100644 --- a/library/Zend/Wildfire/Plugin/Interface.php +++ b/library/Zend/Wildfire/Plugin/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $ */ /** * @category Zend * @package Zend_Wildfire * @subpackage Plugin - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Wildfire_Plugin_Interface diff --git a/library/Zend/Wildfire/Protocol/JsonStream.php b/library/Zend/Wildfire/Protocol/JsonStream.php index 24087e66c..7dc7e55b0 100644 --- a/library/Zend/Wildfire/Protocol/JsonStream.php +++ b/library/Zend/Wildfire/Protocol/JsonStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Wildfire * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: JsonStream.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: JsonStream.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Wildfire_Plugin_Interface */ @@ -35,7 +35,7 @@ * @category Zend * @package Zend_Wildfire * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Wildfire_Protocol_JsonStream diff --git a/library/Zend/XmlRpc/Client.php b/library/Zend/XmlRpc/Client.php index 4801e7ccf..d1427815c 100644 --- a/library/Zend/XmlRpc/Client.php +++ b/library/Zend/XmlRpc/Client.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Client.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Client.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -71,7 +71,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client @@ -211,7 +211,7 @@ public function getLastResponse() /** * Returns a proxy object for more convenient method calls * - * @param $namespace Namespace to proxy or empty string for none + * @param string $namespace Namespace to proxy or empty string for none * @return Zend_XmlRpc_Client_ServerProxy */ public function getProxy($namespace = '') @@ -257,9 +257,15 @@ public function doRequest($request, $response = null) { $this->_lastRequest = $request; - iconv_set_encoding('input_encoding', 'UTF-8'); - iconv_set_encoding('output_encoding', 'UTF-8'); - iconv_set_encoding('internal_encoding', 'UTF-8'); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('input_encoding', 'UTF-8'); + iconv_set_encoding('output_encoding', 'UTF-8'); + iconv_set_encoding('internal_encoding', 'UTF-8'); + } else { + ini_set('input_encoding', 'UTF-8'); + ini_set('output_encoding', 'UTF-8'); + ini_set('default_charset', 'UTF-8'); + } $http = $this->getHttpClient(); if($http->getUri() === null) { @@ -294,7 +300,7 @@ public function doRequest($request, $response = null) $response = new Zend_XmlRpc_Response(); } $this->_lastResponse = $response; - $this->_lastResponse->loadXml($httpResponse->getBody()); + $this->_lastResponse->loadXml(trim($httpResponse->getBody())); } /** @@ -333,22 +339,33 @@ public function call($method, $params=array()) if (!is_array($params)) { $params = array($params); } - foreach ($params as $key => $param) { + foreach ($params as $key => $param) + { if ($param instanceof Zend_XmlRpc_Value) { continue; } - $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE; - foreach ($signatures as $signature) { - if (!is_array($signature)) { - continue; + if (count($signatures) > 1) { + $type = Zend_XmlRpc_Value::getXmlRpcTypeByValue($param); + foreach ($signatures as $signature) { + if (!is_array($signature)) { + continue; + } + if (isset($signature['parameters'][$key])) { + if ($signature['parameters'][$key] == $type) { + break; + } + } } + } elseif (isset($signatures[0]['parameters'][$key])) { + $type = $signatures[0]['parameters'][$key]; + } else { + $type = null; + } - if (isset($signature['parameters'][$key])) { - $type = $signature['parameters'][$key]; - $type = in_array($type, $validTypes) ? $type : Zend_XmlRpc_Value::AUTO_DETECT_TYPE; - } + if (empty($type) || !in_array($type, $validTypes)) { + $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE; } $params[$key] = Zend_XmlRpc_Value::getXmlRpcValue($param, $type); diff --git a/library/Zend/XmlRpc/Client/Exception.php b/library/Zend/XmlRpc/Client/Exception.php index fb67de47f..051accad7 100644 --- a/library/Zend/XmlRpc/Client/Exception.php +++ b/library/Zend/XmlRpc/Client/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_Exception extends Zend_XmlRpc_Exception diff --git a/library/Zend/XmlRpc/Client/FaultException.php b/library/Zend/XmlRpc/Client/FaultException.php index 4fe6b08d1..e477d6fce 100644 --- a/library/Zend/XmlRpc/Client/FaultException.php +++ b/library/Zend/XmlRpc/Client/FaultException.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FaultException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FaultException.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_FaultException extends Zend_XmlRpc_Client_Exception diff --git a/library/Zend/XmlRpc/Client/HttpException.php b/library/Zend/XmlRpc/Client/HttpException.php index e45414000..d70f7bd3d 100644 --- a/library/Zend/XmlRpc/Client/HttpException.php +++ b/library/Zend/XmlRpc/Client/HttpException.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: HttpException.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_HttpException extends Zend_XmlRpc_Client_Exception diff --git a/library/Zend/XmlRpc/Client/IntrospectException.php b/library/Zend/XmlRpc/Client/IntrospectException.php index fda05c9c6..010cd14f5 100644 --- a/library/Zend/XmlRpc/Client/IntrospectException.php +++ b/library/Zend/XmlRpc/Client/IntrospectException.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IntrospectException.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: IntrospectException.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_IntrospectException extends Zend_XmlRpc_Client_Exception diff --git a/library/Zend/XmlRpc/Client/ServerIntrospection.php b/library/Zend/XmlRpc/Client/ServerIntrospection.php index 4b4c40625..dd27aaedf 100644 --- a/library/Zend/XmlRpc/Client/ServerIntrospection.php +++ b/library/Zend/XmlRpc/Client/ServerIntrospection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServerIntrospection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ServerIntrospection.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_ServerIntrospection diff --git a/library/Zend/XmlRpc/Client/ServerProxy.php b/library/Zend/XmlRpc/Client/ServerProxy.php index 621843fec..f046cbc45 100644 --- a/library/Zend/XmlRpc/Client/ServerProxy.php +++ b/library/Zend/XmlRpc/Client/ServerProxy.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ServerProxy.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ServerProxy.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_ServerProxy diff --git a/library/Zend/XmlRpc/Exception.php b/library/Zend/XmlRpc/Exception.php index 7599743b5..f778c0a9b 100644 --- a/library/Zend/XmlRpc/Exception.php +++ b/library/Zend/XmlRpc/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Exception extends Zend_Exception diff --git a/library/Zend/XmlRpc/Fault.php b/library/Zend/XmlRpc/Fault.php index 41184cde8..2a009f620 100644 --- a/library/Zend/XmlRpc/Fault.php +++ b/library/Zend/XmlRpc/Fault.php @@ -14,9 +14,9 @@ * * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fault.php 20208 2010-01-11 22:37:37Z lars $ + * @version $Id: Fault.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -36,7 +36,7 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Fault diff --git a/library/Zend/XmlRpc/Generator/DomDocument.php b/library/Zend/XmlRpc/Generator/DomDocument.php index 087313059..071fc7b8d 100644 --- a/library/Zend/XmlRpc/Generator/DomDocument.php +++ b/library/Zend/XmlRpc/Generator/DomDocument.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Generator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DomDocument.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: DomDocument.php 24594 2012-01-05 21:27:01Z matthew $ */ /** diff --git a/library/Zend/XmlRpc/Generator/GeneratorAbstract.php b/library/Zend/XmlRpc/Generator/GeneratorAbstract.php index 0be160d3d..bfc9fbcf8 100644 --- a/library/Zend/XmlRpc/Generator/GeneratorAbstract.php +++ b/library/Zend/XmlRpc/Generator/GeneratorAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Generator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GeneratorAbstract.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: GeneratorAbstract.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -47,7 +47,7 @@ public function __construct($encoding = 'UTF-8') * Start XML element * * Method opens a new XML element with an element name and an optional value - * + * * @param string $name XML tag name * @param string $value Optional value of the XML tag * @return Zend_XmlRpc_Generator_Abstract Fluent interface @@ -86,7 +86,7 @@ abstract public function saveXml(); /** * Return encoding - * + * * @return string */ public function getEncoding() @@ -143,7 +143,7 @@ abstract protected function _writeTextData($text); /** * End XML element - * + * * @param string $name */ abstract protected function _closeElement($name); diff --git a/library/Zend/XmlRpc/Generator/XmlWriter.php b/library/Zend/XmlRpc/Generator/XmlWriter.php index 421241c9b..098ed028e 100644 --- a/library/Zend/XmlRpc/Generator/XmlWriter.php +++ b/library/Zend/XmlRpc/Generator/XmlWriter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Generator - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlWriter.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: XmlWriter.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -87,6 +87,7 @@ protected function _closeElement($name) public function saveXml() { - return $this->_xmlWriter->flush(false); + $xml = $this->_xmlWriter->flush(false); + return $xml; } -} \ No newline at end of file +} diff --git a/library/Zend/XmlRpc/Request.php b/library/Zend/XmlRpc/Request.php index ed8a0cc33..ef5493da1 100644 --- a/library/Zend/XmlRpc/Request.php +++ b/library/Zend/XmlRpc/Request.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,9 +41,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 20208 2010-01-11 22:37:37Z lars $ + * @version $Id: Request.php 25032 2012-08-17 19:45:06Z matthew $ */ class Zend_XmlRpc_Request { @@ -303,12 +303,26 @@ public function loadXml($request) return false; } + // @see ZF-12293 - disable external entities for security purposes + $loadEntities = libxml_disable_entity_loader(true); try { - $xml = new SimpleXMLElement($request); + $dom = new DOMDocument; + $dom->loadXML($request); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + // require_once 'Zend/XmlRpc/Exception.php'; + throw new Zend_XmlRpc_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + $xml = simplexml_import_dom($dom); + libxml_disable_entity_loader($loadEntities); } catch (Exception $e) { // Not valid XML $this->_fault = new Zend_XmlRpc_Fault(631); $this->_fault->setEncoding($this->getEncoding()); + libxml_disable_entity_loader($loadEntities); return false; } diff --git a/library/Zend/XmlRpc/Request/Http.php b/library/Zend/XmlRpc/Request/Http.php index 9b5aedfee..7328901bd 100644 --- a/library/Zend/XmlRpc/Request/Http.php +++ b/library/Zend/XmlRpc/Request/Http.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_XmlRpc_Request_Http extends Zend_XmlRpc_Request { diff --git a/library/Zend/XmlRpc/Request/Stdin.php b/library/Zend/XmlRpc/Request/Stdin.php index 921a0de4a..903f0d218 100644 --- a/library/Zend/XmlRpc/Request/Stdin.php +++ b/library/Zend/XmlRpc/Request/Stdin.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stdin.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Stdin.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_XmlRpc_Request_Stdin extends Zend_XmlRpc_Request { diff --git a/library/Zend/XmlRpc/Response.php b/library/Zend/XmlRpc/Response.php index c526169d4..81e5c170f 100644 --- a/library/Zend/XmlRpc/Response.php +++ b/library/Zend/XmlRpc/Response.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 21359 2010-03-07 00:54:02Z lars $ + * @version $Id: Response.php 25032 2012-08-17 19:45:06Z matthew $ */ class Zend_XmlRpc_Response { @@ -176,11 +176,27 @@ public function loadXml($response) return false; } + // @see ZF-12293 - disable external entities for security purposes + $loadEntities = libxml_disable_entity_loader(true); + $useInternalXmlErrors = libxml_use_internal_errors(true); try { - $useInternalXmlErrors = libxml_use_internal_errors(true); + $dom = new DOMDocument; + $dom->loadXML($response); + foreach ($dom->childNodes as $child) { + if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { + // require_once 'Zend/XmlRpc/Exception.php'; + throw new Zend_XmlRpc_Exception( + 'Invalid XML: Detected use of illegal DOCTYPE' + ); + } + } + // TODO: Locate why this passes tests but a simplexml import doesn't + // $xml = simplexml_import_dom($dom); $xml = new SimpleXMLElement($response); + libxml_disable_entity_loader($loadEntities); libxml_use_internal_errors($useInternalXmlErrors); } catch (Exception $e) { + libxml_disable_entity_loader($loadEntities); libxml_use_internal_errors($useInternalXmlErrors); // Not valid XML $this->_fault = new Zend_XmlRpc_Fault(651); @@ -205,6 +221,7 @@ public function loadXml($response) try { if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) { + // require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML'); } $valueXml = $xml->params->param->value->asXML(); diff --git a/library/Zend/XmlRpc/Response/Http.php b/library/Zend/XmlRpc/Response/Http.php index 4dcc5d03a..43acf44a3 100644 --- a/library/Zend/XmlRpc/Response/Http.php +++ b/library/Zend/XmlRpc/Response/Http.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,9 +29,9 @@ * @uses Zend_XmlRpc_Response * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Http.php 24594 2012-01-05 21:27:01Z matthew $ */ class Zend_XmlRpc_Response_Http extends Zend_XmlRpc_Response { diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php index bdd31a9ef..9d9659329 100644 --- a/library/Zend/XmlRpc/Server.php +++ b/library/Zend/XmlRpc/Server.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Server.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -111,7 +111,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server extends Zend_Server_Abstract diff --git a/library/Zend/XmlRpc/Server/Cache.php b/library/Zend/XmlRpc/Server/Cache.php index b5ce029cc..6d4a59930 100644 --- a/library/Zend/XmlRpc/Server/Cache.php +++ b/library/Zend/XmlRpc/Server/Cache.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Cache.php 24594 2012-01-05 21:27:01Z matthew $ */ /** Zend_Server_Cache */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Cache extends Zend_Server_Cache diff --git a/library/Zend/XmlRpc/Server/Exception.php b/library/Zend/XmlRpc/Server/Exception.php index 490137662..0ffc912ff 100644 --- a/library/Zend/XmlRpc/Server/Exception.php +++ b/library/Zend/XmlRpc/Server/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -33,7 +33,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Exception extends Zend_XmlRpc_Exception diff --git a/library/Zend/XmlRpc/Server/Fault.php b/library/Zend/XmlRpc/Server/Fault.php index 6e77caf37..9d5f612be 100644 --- a/library/Zend/XmlRpc/Server/Fault.php +++ b/library/Zend/XmlRpc/Server/Fault.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Fault.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Fault.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -44,7 +44,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Fault extends Zend_XmlRpc_Fault diff --git a/library/Zend/XmlRpc/Server/System.php b/library/Zend/XmlRpc/Server/System.php index 166ff42b4..066ffad59 100644 --- a/library/Zend/XmlRpc/Server/System.php +++ b/library/Zend/XmlRpc/Server/System.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: System.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: System.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_System diff --git a/library/Zend/XmlRpc/Value.php b/library/Zend/XmlRpc/Value.php index df2f836eb..f06e12444 100644 --- a/library/Zend/XmlRpc/Value.php +++ b/library/Zend/XmlRpc/Value.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Value.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Value.php 24594 2012-01-05 21:27:01Z matthew $ */ /** @@ -31,7 +31,7 @@ * from PHP variables, XML string or by specifing the exact XML-RPC natvie type * * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value @@ -252,6 +252,43 @@ public static function getXmlRpcValue($value, $type = self::AUTO_DETECT_TYPE) } } + /** + * Get XML-RPC type for a PHP native variable + * + * @static + * @param mixed $value + * @return string + */ + public static function getXmlRpcTypeByValue($value) + { + if (is_object($value)) { + if ($value instanceof Zend_XmlRpc_Value) { + return $value->getType(); + } elseif (($value instanceof Zend_Date) || ($value instanceof DateTime)) { + return self::XMLRPC_TYPE_DATETIME; + } + return self::getXmlRpcTypeByValue(get_object_vars($value)); + } elseif (is_array($value)) { + if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) { + return self::XMLRPC_TYPE_STRUCT; + } + return self::XMLRPC_TYPE_ARRAY; + } elseif (is_int($value)) { + return ($value > PHP_INT_MAX) ? self::XMLRPC_TYPE_I8 : self::XMLRPC_TYPE_INTEGER; + } elseif (is_double($value)) { + return self::XMLRPC_TYPE_DOUBLE; + } elseif (is_bool($value)) { + return self::XMLRPC_TYPE_BOOLEAN; + } elseif (is_null($value)) { + return self::XMLRPC_TYPE_NIL; + } elseif (is_string($value)) { + return self::XMLRPC_TYPE_STRING; + } + throw new Zend_XmlRpc_Value_Exception(sprintf( + 'No matching XMLRPC type found for php type %s.', + gettype($value) + )); + } /** * Transform a PHP native variable into a XML-RPC native value @@ -263,56 +300,52 @@ public static function getXmlRpcValue($value, $type = self::AUTO_DETECT_TYPE) */ protected static function _phpVarToNativeXmlRpc($value) { - switch (gettype($value)) { - case 'object': - // Check to see if it's an XmlRpc value - if ($value instanceof Zend_XmlRpc_Value) { - return $value; - } - - if ($value instanceof Zend_Crypt_Math_BigInteger) { - // require_once 'Zend/XmlRpc/Value/BigInteger.php'; - return new Zend_XmlRpc_Value_BigInteger($value); - } + // @see http://framework.zend.com/issues/browse/ZF-8623 + if (is_object($value)) { + if ($value instanceof Zend_XmlRpc_Value) { + return $value; + } + if ($value instanceof Zend_Crypt_Math_BigInteger) { + // require_once 'Zend/XmlRpc/Value/Exception.php'; + throw new Zend_XmlRpc_Value_Exception( + 'Using Zend_Crypt_Math_BigInteger to get an ' . + 'instance of Zend_XmlRpc_Value_BigInteger is not ' . + 'available anymore.' + ); + } + } - if ($value instanceof Zend_Date or $value instanceof DateTime) { - // require_once 'Zend/XmlRpc/Value/DateTime.php'; - return new Zend_XmlRpc_Value_DateTime($value); - } + switch (self::getXmlRpcTypeByValue($value)) + { + case self::XMLRPC_TYPE_DATETIME: + // require_once 'Zend/XmlRpc/Value/DateTime.php'; + return new Zend_XmlRpc_Value_DateTime($value); - // Otherwise, we convert the object into a struct - $value = get_object_vars($value); - // Break intentionally omitted - case 'array': - // Default native type for a PHP array (a simple numeric array) is 'array' + case self::XMLRPC_TYPE_ARRAY: // require_once 'Zend/XmlRpc/Value/Array.php'; - $obj = 'Zend_XmlRpc_Value_Array'; + return new Zend_XmlRpc_Value_Array($value); - // Determine if this is an associative array - if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) { - // require_once 'Zend/XmlRpc/Value/Struct.php'; - $obj = 'Zend_XmlRpc_Value_Struct'; - } - return new $obj($value); + case self::XMLRPC_TYPE_STRUCT: + // require_once 'Zend/XmlRpc/Value/Struct.php'; + return new Zend_XmlRpc_Value_Struct($value); - case 'integer': + case self::XMLRPC_TYPE_INTEGER: // require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); - case 'double': + case self::XMLRPC_TYPE_DOUBLE: // require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); - case 'boolean': + case self::XMLRPC_TYPE_BOOLEAN: // require_once 'Zend/XmlRpc/Value/Boolean.php'; return new Zend_XmlRpc_Value_Boolean($value); - case 'NULL': - case 'null': + case self::XMLRPC_TYPE_NIL: // require_once 'Zend/XmlRpc/Value/Nil.php'; - return new Zend_XmlRpc_Value_Nil(); + return new Zend_XmlRpc_Value_Nil; - case 'string': + case self::XMLRPC_TYPE_STRING: // Fall through to the next case default: // If type isn't identified (or identified as string), it treated as string @@ -474,7 +507,7 @@ protected static function _extractTypeAndValue(SimpleXMLElement $xml, &$type, &$ } /** - * @param $xml + * @param string $xml * @return void */ protected function _setXML($xml) diff --git a/library/Zend/XmlRpc/Value/Array.php b/library/Zend/XmlRpc/Value/Array.php index f09538318..aa2163bdf 100644 --- a/library/Zend/XmlRpc/Value/Array.php +++ b/library/Zend/XmlRpc/Value/Array.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Array.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Array extends Zend_XmlRpc_Value_Collection diff --git a/library/Zend/XmlRpc/Value/Base64.php b/library/Zend/XmlRpc/Value/Base64.php index 257d270a3..0a8479532 100644 --- a/library/Zend/XmlRpc/Value/Base64.php +++ b/library/Zend/XmlRpc/Value/Base64.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base64.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Base64.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar diff --git a/library/Zend/XmlRpc/Value/BigInteger.php b/library/Zend/XmlRpc/Value/BigInteger.php index 833b1e0f1..fb4cddae5 100644 --- a/library/Zend/XmlRpc/Value/BigInteger.php +++ b/library/Zend/XmlRpc/Value/BigInteger.php @@ -1,4 +1,5 @@ <?php + /** * Zend Framework * @@ -15,51 +16,43 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BigInteger.php 20785 2010-01-31 09:43:03Z mikaelkael $ + * @version $Id: BigInteger.php 24594 2012-01-05 21:27:01Z matthew $ */ - /** * Zend_XmlRpc_Value_Integer */ // require_once 'Zend/XmlRpc/Value/Integer.php'; - /** * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer { - /** - * @var Zend_Crypt_Math_BigInteger - */ - protected $_integer; - /** * @param mixed $value */ public function __construct($value) { // require_once 'Zend/Crypt/Math/BigInteger.php'; - $this->_integer = new Zend_Crypt_Math_BigInteger(); - $this->_value = $this->_integer->init($this->_value); - + $integer = new Zend_Crypt_Math_BigInteger; + $this->_value = $integer->init($value); $this->_type = self::XMLRPC_TYPE_I8; } - + /** - * Return bigint value object - * - * @return Zend_Crypt_Math_BigInteger + * Return bigint value + * + * @return string */ public function getValue() { - return $this->_integer; + return $this->_value; } -} +} \ No newline at end of file diff --git a/library/Zend/XmlRpc/Value/Boolean.php b/library/Zend/XmlRpc/Value/Boolean.php index f7badc485..f7be6a942 100644 --- a/library/Zend/XmlRpc/Value/Boolean.php +++ b/library/Zend/XmlRpc/Value/Boolean.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Boolean.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Boolean.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar diff --git a/library/Zend/XmlRpc/Value/Collection.php b/library/Zend/XmlRpc/Value/Collection.php index 8a282459f..d2848907f 100644 --- a/library/Zend/XmlRpc/Value/Collection.php +++ b/library/Zend/XmlRpc/Value/Collection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Collection.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Collection.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value_Collection extends Zend_XmlRpc_Value diff --git a/library/Zend/XmlRpc/Value/DateTime.php b/library/Zend/XmlRpc/Value/DateTime.php index 28cbfb5bf..94e900bfa 100644 --- a/library/Zend/XmlRpc/Value/DateTime.php +++ b/library/Zend/XmlRpc/Value/DateTime.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DateTime.php 20278 2010-01-14 14:48:59Z ralph $ + * @version $Id: DateTime.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar @@ -48,7 +48,7 @@ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar * * @var string */ - protected $_isoFormatString = 'YYYYMMddTHH:mm:ss'; + protected $_isoFormatString = 'yyyyMMddTHH:mm:ss'; /** * Set the value of a dateTime.iso8601 native type @@ -69,13 +69,13 @@ public function __construct($value) } elseif (is_numeric($value)) { // The value is numeric, we make sure it is an integer $this->_value = date($this->_phpFormatString, (int)$value); } else { - $timestamp = strtotime($value); - if ($timestamp === false || $timestamp == -1) { // cannot convert the value to a timestamp + $timestamp = new DateTime($value); + if ($timestamp === false) { // cannot convert the value to a timestamp // require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp'); } - $this->_value = date($this->_phpFormatString, $timestamp); // Convert the timestamp to iso8601 format + $this->_value = $timestamp->format($this->_phpFormatString); // Convert the timestamp to iso8601 format } } diff --git a/library/Zend/XmlRpc/Value/Double.php b/library/Zend/XmlRpc/Value/Double.php index 59bab7469..44c5e7773 100644 --- a/library/Zend/XmlRpc/Value/Double.php +++ b/library/Zend/XmlRpc/Value/Double.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Double.php 21158 2010-02-23 17:56:23Z matthew $ + * @version $Id: Double.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Double extends Zend_XmlRpc_Value_Scalar diff --git a/library/Zend/XmlRpc/Value/Exception.php b/library/Zend/XmlRpc/Value/Exception.php index 5423eaafc..b81172a8f 100644 --- a/library/Zend/XmlRpc/Value/Exception.php +++ b/library/Zend/XmlRpc/Value/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Exception extends Zend_XmlRpc_Exception diff --git a/library/Zend/XmlRpc/Value/Integer.php b/library/Zend/XmlRpc/Value/Integer.php index 1e7040ff1..46f16920a 100644 --- a/library/Zend/XmlRpc/Value/Integer.php +++ b/library/Zend/XmlRpc/Value/Integer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Integer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Integer.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar diff --git a/library/Zend/XmlRpc/Value/Nil.php b/library/Zend/XmlRpc/Value/Nil.php index 1541bdce6..662b102b9 100644 --- a/library/Zend/XmlRpc/Value/Nil.php +++ b/library/Zend/XmlRpc/Value/Nil.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Nil.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Nil.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Nil extends Zend_XmlRpc_Value_Scalar diff --git a/library/Zend/XmlRpc/Value/Scalar.php b/library/Zend/XmlRpc/Value/Scalar.php index 7c673cdbe..9b447ea12 100644 --- a/library/Zend/XmlRpc/Value/Scalar.php +++ b/library/Zend/XmlRpc/Value/Scalar.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Scalar.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Scalar.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value_Scalar extends Zend_XmlRpc_Value diff --git a/library/Zend/XmlRpc/Value/String.php b/library/Zend/XmlRpc/Value/String.php index 027131e49..31bca2d5b 100644 --- a/library/Zend/XmlRpc/Value/String.php +++ b/library/Zend/XmlRpc/Value/String.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: String.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: String.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -29,7 +29,7 @@ /** * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar diff --git a/library/Zend/XmlRpc/Value/Struct.php b/library/Zend/XmlRpc/Value/Struct.php index 1a406c8a4..5178a9f09 100644 --- a/library/Zend/XmlRpc/Value/Struct.php +++ b/library/Zend/XmlRpc/Value/Struct.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Struct.php 22024 2010-04-27 18:08:24Z matthew $ + * @version $Id: Struct.php 24594 2012-01-05 21:27:01Z matthew $ */ @@ -31,7 +31,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection From e7d51140f811767d00c24ab3cdcfc573cd4fc74c Mon Sep 17 00:00:00 2001 From: Jamie Snape <jamie.snape@kitware.com> Date: Mon, 16 Jun 2014 16:21:10 -0400 Subject: [PATCH 25/25] Add Travis CI testing --- .travis.yml | 16 ++++++++++++++++ README.md | 2 ++ tests/travis/mysql.ini | 8 ++++++++ tests/travis/pgsql.ini | 8 ++++++++ 4 files changed, 34 insertions(+) create mode 100644 .travis.yml create mode 100644 tests/travis/mysql.ini create mode 100644 tests/travis/pgsql.ini diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..0d30f9011 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: php + +php: + - 5.4 + - 5.5 + - 5.6 + +before_script: + - cp tests/travis/mysql.ini tests/configs/mysql.ini && cp tests/travis/pgsql.ini tests/configs/pgsql.ini + - mysql -u root -e 'create database midas_test;' + - psql -U postgres -c 'create database midas_test;' + +script: + - mkdir _test && cd _test + - cmake .. + - ctest -j2 -V . diff --git a/README.md b/README.md index 6385b6d51..11f775993 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Midas Platform _Version 3.x_ +[![Build Status](https://travis-ci.org/midasplatform/Midas.png?branch=master)](https://travis-ci.org/midasplatform/Midas) + Midas Platform is an open-source toolkit that enables the rapid creation of tailored, web-enabled data storage. Designed to meet the needs of advanced data-centric computing, Midas Platform addresses the growing challenge of large diff --git a/tests/travis/mysql.ini b/tests/travis/mysql.ini new file mode 100644 index 000000000..2b9fecdf0 --- /dev/null +++ b/tests/travis/mysql.ini @@ -0,0 +1,8 @@ +[testing] +database.type = pdo +database.adapter = PDO_MYSQL +database.params.host = 127.0.0.1 +database.params.port = 3306 +database.params.username = root +database.params.password = +database.params.dbname = midas_test diff --git a/tests/travis/pgsql.ini b/tests/travis/pgsql.ini new file mode 100644 index 000000000..5089868f6 --- /dev/null +++ b/tests/travis/pgsql.ini @@ -0,0 +1,8 @@ +[testing] +database.type = pdo +database.adapter = PDO_PGSQL +database.params.host = 127.0.0.1 +database.params.port = 5432 +database.params.username = postgres +database.params.password = +database.params.dbname = midas_test