Author: jablko
Date: Thu Oct 14 11:29:40 2010
New Revision: 8120
Log:
Cosmetic change
Modified:
trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.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/harvesterDeleteAction.class.php
trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php
trunk/apps/qubit/modules/oai/actions/listIdentifiersComponent.class.php
trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php
trunk/apps/qubit/modules/oai/actions/oaiAction.class.php
trunk/apps/qubit/modules/oai/templates/errorSuccess.xml.php
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/apps/qubit/modules/user/actions/editActorAclAction.class.php
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
Modified: trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/digitalobject/actions/updateAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -40,8 +40,8 @@
}
// Set the digital object's attributes
- $digitalObject->setUsageId($request->getParameter('usage_id'));
- $digitalObject->setMediaTypeId($request->getParameter('media_type_id'));
+ $digitalObject->setUsageId($request->usage_id);
+ $digitalObject->setMediaTypeId($request->media_type_id);
// Save the digital object
$digitalObject->save();
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -507,7 +507,7 @@
*/
public function deleteNotes()
{
- if (false == isset($this->request->sourceId) && is_array($deleteNotes =
$this->request->getParameter('delete_notes')) && count($deleteNotes))
+ if (false == isset($this->request->sourceId) && is_array($deleteNotes =
$this->request->delete_notes) && count($deleteNotes))
{
foreach ($deleteNotes as $noteId => $doDelete)
{
@@ -521,7 +521,7 @@
public function updateChildLevels()
{
- if (is_array($updateChildLevels =
$this->request->getParameter('updateChildLevels')) && count($updateChildLevels))
+ if (is_array($updateChildLevels = $this->request->updateChildLevels) &&
count($updateChildLevels))
{
foreach ($updateChildLevels as $childLevelFormData)
{
Modified:
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++
trunk/apps/qubit/modules/informationobject/actions/eventFormComponent.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -157,7 +157,7 @@
// Event types, Dublin Core is restricted
$eventTypes = QubitTerm::getEventTypes();
- if ('sfDcPlugin' == $request->getParameter('module'))
+ if ('sfDcPlugin' == $request->module)
{
$eventTypes = sfDcPlugin::eventTypes();
}
Modified: trunk/apps/qubit/modules/oai/actions/errorAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/errorAction.class.php Thu Oct 14
03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/errorAction.class.php Thu Oct 14
11:29:40 2010 (r8120)
@@ -53,7 +53,7 @@
}
if ($this->request->hasParameter('verb'))
{
- switch($this->request->getParameter('verb'))
+ switch($this->request->verb)
{
case 'Identify':
$this->verb = 'identify';
Modified: trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php Thu Oct
14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/getRecordComponent.class.php Thu Oct
14 11:29:40 2010 (r8120)
@@ -33,7 +33,7 @@
{
$request->setRequestFormat('xml');
- $oai_local_identifier_value = $request->getParameter('identifier');
//TODO: strip the trailing integer value from the full OAI Identifier to get
the OaiLocalIdentifier
+ $oai_local_identifier_value = $request->identifier; //TODO: strip the
trailing integer value from the full OAI Identifier to get the
OaiLocalIdentifier
$oai_local_identifier_id =
QubitOai::getOaiIdNumber($oai_local_identifier_value);
$this->informationObject =
QubitInformationObject::getRecordByOaiID($oai_local_identifier_id);
$request->setAttribute('informationObject', $this->informationObject);
Modified: trunk/apps/qubit/modules/oai/actions/harvesterDeleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterDeleteAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/harvesterDeleteAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -35,7 +35,7 @@
*/
public function execute($request)
{
- $repositoryId = $request->getParameter('repositoryId');
+ $repositoryId = $request->repositoryId;
$repository = QubitOaiRepository::getById($repositoryId);
$this->repositoryName = $repository->getName();
$repository->delete();
Modified: trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -49,7 +49,7 @@
$this->forward404();
}
- $harvestInfo =
QubitOaiHarvest::getById($request->getParameter('harvestId'));
+ $harvestInfo = QubitOaiHarvest::getById($request->harvestId);
$harvestInfo->setLastHarvestAttempt(QubitOai::getDate());
$harvestInfo->save();
$rep = $harvestInfo->getOaiRepository();
Modified: trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php Thu Oct
14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php Thu Oct
14 11:29:40 2010 (r8120)
@@ -40,10 +40,10 @@
$this->harvestJob = array();
if ($request->isMethod('post'))
{
- $this->form->bind($request->getParameter('oai_harvester'));
+ $this->form->bind($request->oai_harvester);
if ($this->form->isValid())
{
- $harvesterArr = $request->getParameter('oai_harvester');
+ $harvesterArr = $request->oai_harvester;
if (count(QubitOaiRepository::getByURI($harvesterArr['uri'])) != 0)
{
Modified:
trunk/apps/qubit/modules/oai/actions/listIdentifiersComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/listIdentifiersComponent.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/listIdentifiersComponent.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -42,7 +42,7 @@
}
else
{
- $this->from = $request->getParameter('from');
+ $this->from = $request->from;
}
if (!$request->hasParameter('until'))
@@ -51,7 +51,7 @@
}
else
{
- $this->until = $request->getParameter('until');
+ $this->until = $request->until;
}
$this->collectionsTable = QubitOai::getCollectionArray();
@@ -65,7 +65,7 @@
}
else
{
- $collection = QubitOai::getCollectionInfo($request->getParameter('set'),
$this->collectionsTable);
+ $collection = QubitOai::getCollectionInfo($request->set,
$this->collectionsTable);
}
//Get the records according to the limit dates and collection
Modified: trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php Thu Oct
14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php Thu Oct
14 11:29:40 2010 (r8120)
@@ -44,7 +44,7 @@
}
else
{
- $this->from = $request->getParameter('from');
+ $this->from = $request->from;
}
if (!$request->hasParameter('until'))
@@ -53,7 +53,7 @@
}
else
{
- $this->until = $request->getParameter('until');
+ $this->until = $request->until;
}
$this->collectionsTable = QubitOai::getCollectionArray();
@@ -67,7 +67,7 @@
}
else
{
- $collection = QubitOai::getCollectionInfo($request->getParameter('set'),
$this->collectionsTable);
+ $collection = QubitOai::getCollectionInfo($request->set,
$this->collectionsTable);
}
//Get the records according to the limit dates and collection
Modified: trunk/apps/qubit/modules/oai/actions/oaiAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/oaiAction.class.php Thu Oct 14
03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/actions/oaiAction.class.php Thu Oct 14
11:29:40 2010 (r8120)
@@ -88,7 +88,7 @@
*/
if ($this->request->hasParameter('verb'))
{
- if (!in_array($this->request->getParameter('verb'), $this->oaiVerbArr))
+ if (!in_array($this->request->verb, $this->oaiVerbArr))
{
$request->setParameter('errorCode', 'badVerb');
$request->setParameter('errorMsg', 'Value of the verb argument is not
a legal OAI-PMH verb, the verb argument is missing, or the verb argument is
repeated.');
@@ -98,8 +98,8 @@
/**
* Validate that attributes are valid
*/
- $allowedKeys =
sfConfig::get('mod_oai_'.$this->request->getParameter('verb').'Allowed');
- $mandatoryKeys =
sfConfig::get('mod_oai_'.$this->request->getParameter('verb').'Mandatory');
+ $allowedKeys = sfConfig::get('mod_oai_'.$this->request->verb.'Allowed');
+ $mandatoryKeys =
sfConfig::get('mod_oai_'.$this->request->verb.'Mandatory');
if (!QubitOai::checkBadArgument($this->attributesKeys, $allowedKeys,
$mandatoryKeys))
{
$request->setParameter('errorCode', 'badArgument');
@@ -108,7 +108,7 @@
}
// For now, if there is a metadataPrefix requested other than oai_dc,
fail the request
- $metadataPrefix = $this->request->getParameter('metadataPrefix');
+ $metadataPrefix = $this->request->metadataPrefix;
if ($metadataPrefix != '' AND $metadataPrefix != 'oai_dc')
{
$request->setParameter('errorCode', 'badVerb');
@@ -116,7 +116,7 @@
$this->forward('oai', 'error');
}
- switch($this->request->getParameter('verb'))
+ switch($this->request->verb)
{
case 'Identify':
$this->verb = 'identify';
Modified: trunk/apps/qubit/modules/oai/templates/errorSuccess.xml.php
==============================================================================
--- trunk/apps/qubit/modules/oai/templates/errorSuccess.xml.php Thu Oct 14
03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/oai/templates/errorSuccess.xml.php Thu Oct 14
11:29:40 2010 (r8120)
@@ -3,8 +3,8 @@
<responseDate><?php echo $date ?></responseDate>
<request<?php echo $sf_data->getRaw('requestAttributes')?>><?php echo
$sf_data->getRaw('path') ?></request>
<?php if (!$sf_request->hasParameter('errorMsg')): ?>
- <error code="<?php echo $sf_request->getParameter('errorCode') ?>"/>
+ <error code="<?php echo $sf_request->errorCode ?>"/>
<?php else: ?>
- <error code="<?php echo $sf_request->getParameter('errorCode') ?>"><?php
echo $sf_request->getParameter('errorMsg') ?></error>
+ <error code="<?php echo $sf_request->errorCode ?>"><?php echo
$sf_request->errorMsg ?></error>
<?php endif ?>
</OAI-PMH>
Modified: trunk/apps/qubit/modules/settings/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/listAction.class.php Thu Oct
14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Thu Oct
14 11:29:40 2010 (r8120)
@@ -71,7 +71,7 @@
{
// Global settings form submission
- if (null !== $request->getParameter('global_settings'))
+ if (null !== $request->global_settings)
{
// Hack to populate "version" and "upload_dir" fields so they display
// if validation fails. By default, their values are not included in
@@ -79,7 +79,7 @@
// <input> field is disabled.
$version = (null !== $setting =
QubitSetting::getSettingByName('version')) ?
$setting->getValue(array('sourceCulture'=>true)) : null;
$uploadDir = (null !== $setting =
QubitSetting::getSettingByName('upload_dir')) ?
$setting->getValue(array('sourceCulture'=>true)) : null;
-
$this->globalForm->bind(array_merge($request->getParameter('global_settings'),
array('version'=>$version, 'upload_dir'=>$uploadDir)));
+ $this->globalForm->bind(array_merge($request->global_settings,
array('version'=>$version, 'upload_dir'=>$uploadDir)));
if ($this->globalForm->isValid())
{
// Do update and redirect to avoid repeat submit wackiness
@@ -89,9 +89,9 @@
}
// Handle site information form submission
- if (null !== $request->getParameter('site_information'))
+ if (null !== $request->site_information)
{
-
$this->siteInformationForm->bind($request->getParameter('site_information'));
+ $this->siteInformationForm->bind($request->site_information);
if ($this->siteInformationForm->isValid())
{
// Do update and redirect to avoid repeat submit wackiness
@@ -101,9 +101,9 @@
}
// Handle default template form submission
- if (null !== $request->getParameter('default_template'))
+ if (null !== $request->default_template)
{
-
$this->defaultTemplateForm->bind($request->getParameter('default_template'));
+ $this->defaultTemplateForm->bind($request->default_template);
if ($this->defaultTemplateForm->isValid())
{
// Do update and redirect to avoid repeat submit wackiness
@@ -113,9 +113,9 @@
}
// Handle default template form submission
- if (null !== $request->getParameter('ui_label'))
+ if (null !== $request->ui_label)
{
- $this->uiLabelForm->bind($request->getParameter('ui_label'));
+ $this->uiLabelForm->bind($request->ui_label);
if ($this->uiLabelForm->isValid())
{
// Do update and redirect to avoid repeat submit wackiness
@@ -125,9 +125,9 @@
}
// Handle OAI Repository form submission
- if (null !== $request->getParameter('oai_repository'))
+ if (null !== $request->oai_repository)
{
-
$this->oaiRepositoryForm->bind($request->getParameter('oai_repository'));
+ $this->oaiRepositoryForm->bind($request->oai_repository);
if ($this->oaiRepositoryForm->isValid())
{
// Do update and redirect to avoid repeat submit wackiness
@@ -136,7 +136,7 @@
}
}
- if (null !== $language_code = $request->getParameter('language_code'))
+ if (null !== $language_code = $request->language_code)
{
try
{
Modified: trunk/apps/qubit/modules/user/actions/editActorAclAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/editActorAclAction.class.php Thu Oct
14 03:41:20 2010 (r8119)
+++ trunk/apps/qubit/modules/user/actions/editActorAclAction.class.php Thu Oct
14 11:29:40 2010 (r8120)
@@ -75,7 +75,7 @@
protected function processForm()
{
- foreach ($this->request->getParameter('acl') as $key => $value)
+ foreach ($this->request->acl as $key => $value)
{
// If key has an underscore, then we are creating a new permission
if (1 == preg_match('/([\w]+)_(.*)/', $key, $matches))
Modified:
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -100,7 +100,7 @@
protected function processForm()
{
- foreach ($this->request->getParameter('acl') as $key => $value)
+ foreach ($this->request->acl as $key => $value)
{
// If key has an underscore, then we are creating a new permission
if (1 == preg_match('/([\w]+)_(.*)/', $key, $matches))
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editActorAclAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -74,7 +74,7 @@
protected function processForm()
{
- foreach ($this->request->getParameter('acl') as $key => $value)
+ foreach ($this->request->acl as $key => $value)
{
// If key has an underscore, then we are creating a new permission
if (1 == preg_match('/([\w]+)_(.*)/', $key, $matches))
Modified:
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
==============================================================================
---
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Thu Oct 14 03:41:20 2010 (r8119)
+++
trunk/plugins/qbAclPlugin/modules/aclGroup/actions/editInformationObjectAclAction.class.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -93,7 +93,7 @@
protected function processForm()
{
- foreach ($this->request->getParameter('acl') as $key => $value)
+ foreach ($this->request->acl as $key => $value)
{
// If key has an underscore, then we are creating a new permission
if (1 == preg_match('/([\w]+)_(.*)/', $key, $matches))
Modified:
trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
==============================================================================
--- trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
Thu Oct 14 03:41:20 2010 (r8119)
+++ trunk/plugins/sfInstallPlugin/modules/sfInstallPlugin/templates/_task.php
Thu Oct 14 11:29:40 2010 (r8120)
@@ -1,6 +1,6 @@
<ol class="task-list">
- <li<?php switch ($sf_request->getParameter('action')): case 'checkSystem':
?> class="active"<?php break; case 'configureDatabase': case 'loadData': case
'configureSite': case 'finishInstall': ?> class="done"<?php endswitch; ?>>Check
system</li>
- <li<?php switch ($sf_request->getParameter('action')): case
'configureDatabase': ?> class="active"<?php break; case 'loadData': case
'configureSite': case 'finishInstall': ?> class="done"<?php endswitch;
?>>Configure database</li>
- <li<?php switch ($sf_request->getParameter('action')): case 'loadData': ?>
class="active"<?php break; case 'configureSite': case 'finishInstall': ?>
class="done"<?php endswitch; ?>>Load data</li>
- <li<?php switch ($sf_request->getParameter('action')): case 'configureSite':
?> class="active"<?php break; case 'finishInstall': ?> class="done"<?php
endswitch; ?>>Configure site</li>
+ <li<?php switch ($sf_request->action): case 'checkSystem': ?>
class="active"<?php break; case 'configureDatabase': case 'loadData': case
'configureSite': case 'finishInstall': ?> class="done"<?php endswitch; ?>>Check
system</li>
+ <li<?php switch ($sf_request->action): case 'configureDatabase': ?>
class="active"<?php break; case 'loadData': case 'configureSite': case
'finishInstall': ?> class="done"<?php endswitch; ?>>Configure database</li>
+ <li<?php switch ($sf_request->action): case 'loadData': ?>
class="active"<?php break; case 'configureSite': case 'finishInstall': ?>
class="done"<?php endswitch; ?>>Load data</li>
+ <li<?php switch ($sf_request->action): case 'configureSite': ?>
class="active"<?php break; case 'finishInstall': ?> class="done"<?php
endswitch; ?>>Configure site</li>
</ol>
--
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.
