Author: jablko
Date: Thu Oct 28 01:25:14 2010
New Revision: 8615
Log:
Cosmetic change
Modified:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
trunk/apps/qubit/modules/map/actions/indexAction.class.php
trunk/apps/qubit/modules/oai/actions/badverbComponent.class.php
trunk/apps/qubit/modules/oai/actions/errorAction.class.php
trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php
trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php
trunk/apps/qubit/modules/oai/actions/listMetadataFormatsComponent.class.php
trunk/apps/qubit/modules/oai/actions/listSetsComponent.class.php
trunk/apps/qubit/modules/oai/actions/oaiAction.class.php
trunk/lib/QubitOai.class.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitMenu.php
trunk/plugins/sfTranslatePlugin/lib/sfTranslateMessageFormat.class.php
Modified:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Thu Oct 28 01:21:18 2010 (r8614)
+++
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Thu Oct 28 01:25:14 2010 (r8615)
@@ -46,9 +46,9 @@
$this->maxUploadSize = QubitDigitalObject::getMaxUploadSize();
// Paths for uploader javascript
- $this->uploadSwfPath =
$this->getRequest()->getRelativeUrlRoot().'/vendor/yui/uploader/assets/uploader.swf';
+ $this->uploadSwfPath =
$this->request->getRelativeUrlRoot().'/vendor/yui/uploader/assets/uploader.swf';
$this->uploadResponsePath = "{$this->context->routing->generate(null,
array('module' => 'digitalobject', 'action' =>
'upload'))}?".http_build_query(array(session_name() => session_id()));
- $this->uploadTmpDir =
$this->getRequest()->getRelativeUrlRoot().'/uploads/tmp';
+ $this->uploadTmpDir = $this->request->getRelativeUrlRoot().'/uploads/tmp';
// Build form
$this->form->setValidator('files', new
QubitValidatorCountable(array('required' => true)));
Modified: trunk/apps/qubit/modules/map/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/map/actions/indexAction.class.php Thu Oct 28
01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/map/actions/indexAction.class.php Thu Oct 28
01:25:14 2010 (r8615)
@@ -32,7 +32,7 @@
//set Google Map Key assigned to this website
$this->map->setAPIKey('ABQIAAAAdK0ewFXxGGu_rho7KNhiWRS2Wh_PTvFuRUPwoFaayjCdp26BFxRbGF-EbSNwePqixB0Gu5k4DghJ7w');
- $rootURL = $this->getRequest()->getRelativeUrlRoot();
+ $rootURL = $this->request->getRelativeUrlRoot();
//add locations to map
foreach ($placeRelations as $relation)
@@ -70,7 +70,7 @@
}
//set back navigation
- $this->context->user->setAttribute('nav_context_back',
$this->getRequest()->getURI());
+ $this->context->user->setAttribute('nav_context_back',
$this->request->getURI());
//use layout that has necessary GoogleMapAPI hooks in doctype, head and
body attributes/elements
$this->setLayout('layout_map_two_column');
Modified: trunk/apps/qubit/modules/oai/actions/badverbComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/badverbComponent.class.php Thu Oct
28 01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/badverbComponent.class.php Thu Oct
28 01:25:14 2010 (r8615)
@@ -32,7 +32,7 @@
$request->setRequestFormat('xml');
$this->date = gmdate('Y-m-d\TH:i:s\Z');
$this->path = $request->getUriPrefix().$request->getPathInfo();
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified: trunk/apps/qubit/modules/oai/actions/errorAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/errorAction.class.php Thu Oct 28
01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/errorAction.class.php Thu Oct 28
01:25:14 2010 (r8615)
@@ -36,8 +36,8 @@
{
$request->setRequestFormat('xml');
$this->date = QubitOai::getDate();
- $this->path =
$this->getRequest()->getUriPrefix().$this->getRequest()->getPathInfo();
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->path = $this->request->getUriPrefix().$this->request->getPathInfo();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified: trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php Thu Oct
28 01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php Thu Oct
28 01:25:14 2010 (r8615)
@@ -42,7 +42,7 @@
$this->date = gmdate('Y-m-d\TH:i:s\Z');
$this->collectionsTable = QubitOai::getCollectionArray();
$this->path = $request->getUriPrefix().$request->getPathInfo();
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified: trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php Thu Oct
28 01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/identifyComponent.class.php Thu Oct
28 01:25:14 2010 (r8615)
@@ -41,7 +41,7 @@
$this->deletedRecord = 'no';
$this->compression = 'gzip';
$this->path = url_for('oai/oaiAction');
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified:
trunk/apps/qubit/modules/oai/actions/listMetadataFormatsComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/listMetadataFormatsComponent.class.php
Thu Oct 28 01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/listMetadataFormatsComponent.class.php
Thu Oct 28 01:25:14 2010 (r8615)
@@ -31,8 +31,8 @@
{
$request->setRequestFormat('xml');
$this->date = gmdate('Y-m-d\TH:i:s\Z');
- $this->path =
$this->getRequest()->getUriPrefix().$this->getRequest()->getPathInfo();
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->path = $this->request->getUriPrefix().$this->request->getPathInfo();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified: trunk/apps/qubit/modules/oai/actions/listSetsComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/listSetsComponent.class.php Thu Oct
28 01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/listSetsComponent.class.php Thu Oct
28 01:25:14 2010 (r8615)
@@ -36,8 +36,8 @@
{
$request->setRequestFormat('xml');
$this->date = QubitOai::getDate();
- $this->path =
$this->getRequest()->getUriPrefix().$this->getRequest()->getPathInfo();
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->path = $this->request->getUriPrefix().$this->request->getPathInfo();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified: trunk/apps/qubit/modules/oai/actions/oaiAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/oaiAction.class.php Thu Oct 28
01:21:18 2010 (r8614)
+++ trunk/apps/qubit/modules/oai/actions/oaiAction.class.php Thu Oct 28
01:25:14 2010 (r8615)
@@ -67,8 +67,8 @@
$this->forward('oai', 'error');
}*/
$this->date = QubitOai::getDate();
- $this->path =
$this->getRequest()->getUriPrefix().$this->getRequest()->getPathInfo();
- $this->attributes = $this->getRequest()->getGetParameters();
+ $this->path = $this->request->getUriPrefix().$this->request->getPathInfo();
+ $this->attributes = $this->request->getGetParameters();
$this->attributesKeys = array_keys($this->attributes);
$this->requestAttributes = '';
Modified: trunk/lib/QubitOai.class.php
==============================================================================
--- trunk/lib/QubitOai.class.php Thu Oct 28 01:21:18 2010 (r8614)
+++ trunk/lib/QubitOai.class.php Thu Oct 28 01:25:14 2010 (r8615)
@@ -278,7 +278,7 @@
public static function getRepositoryIdentifier()
{
- $repositoryIdentifier = sfContext::getInstance()->getRequest()->getHost();
+ $repositoryIdentifier = sfContext::getInstance()->request->getHost();
if ($repositoryCode = sfConfig::get('app_oai_oai_repository_code'))
{
$repositoryIdentifier .= ':'.$repositoryCode;
@@ -289,7 +289,7 @@
public static function getSampleIdentifier()
{
- $sampleIdentifier = sfContext::getInstance()->getRequest()->getHost().':';
+ $sampleIdentifier = sfContext::getInstance()->request->getHost().':';
if ($repositoryCode = sfConfig::get('app_oai_oai_repository_code'))
{
$sampleIdentifier .= $repositoryCode;
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Thu Oct 28 01:21:18 2010
(r8614)
+++ trunk/lib/model/QubitInformationObject.php Thu Oct 28 01:25:14 2010
(r8615)
@@ -1459,7 +1459,7 @@
public function getOaiIdentifier()
{
- $domain = sfContext::getInstance()->getRequest()->getHost();
+ $domain = sfContext::getInstance()->request->getHost();
$oaiRepositoryCode =
QubitSetting::getSettingByName('oai_repository_code')->getValue(array('sourceCulture'=>true));
$oaiIdentifier =
'oai:'.$domain.':'.$oaiRepositoryCode.'_'.$this->getOaiLocalIdentifier();
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Thu Oct 28 01:21:18 2010 (r8614)
+++ trunk/lib/model/QubitMenu.php Thu Oct 28 01:25:14 2010 (r8615)
@@ -48,8 +48,8 @@
{
$aliases = array(
'%profile%' => sfContext::getInstance()->routing->generate(null,
array('module' => 'user', 'id' => sfContext::getInstance()->user->getUserId())),
- '%currentId%' => sfContext::getInstance()->getRequest()->id,
- '%currentSlug%' =>
@sfContext::getInstance()->getRequest()->getAttribute('sf_route')->resource->slug
+ '%currentId%' => sfContext::getInstance()->request->id,
+ '%currentSlug%' =>
@sfContext::getInstance()->request->getAttribute('sf_route')->resource->slug
);
$path = parent::offsetGet('path', $options);
Modified: trunk/plugins/sfTranslatePlugin/lib/sfTranslateMessageFormat.class.php
==============================================================================
--- trunk/plugins/sfTranslatePlugin/lib/sfTranslateMessageFormat.class.php
Thu Oct 28 01:21:18 2010 (r8614)
+++ trunk/plugins/sfTranslatePlugin/lib/sfTranslateMessageFormat.class.php
Thu Oct 28 01:25:14 2010 (r8615)
@@ -22,7 +22,7 @@
$this->loadCatalogue($catalogue);
- $messages =
sfContext::getInstance()->getRequest()->getAttribute('messages', array());
+ $messages = sfContext::getInstance()->request->getAttribute('messages',
array());
foreach ($this->messages[$catalogue] as $variant)
{
if (isset($variant[$string]))
@@ -35,7 +35,7 @@
}
$messages[$string] = $target;
- sfContext::getInstance()->getRequest()->setAttribute('messages',
$messages);
+ sfContext::getInstance()->request->setAttribute('messages', $messages);
if (empty($target))
{
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
