Author: jablko
Date: Thu Oct 28 12:10:28 2010
New Revision: 8634
Log:
Code standard, never blank line after opening brace
Modified:
trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
trunk/apps/qubit/modules/menu/actions/browseMenuComponent.class.php
trunk/apps/qubit/modules/menu/actions/mainMenuComponent.class.php
trunk/apps/qubit/modules/menu/actions/quickLinksComponent.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/harvesterNewRepositoryAction.class.php
trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php
trunk/apps/qubit/modules/oai/actions/oaiAction.class.php
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/css/form.css
trunk/css/yui/treeview/assets/skins/qubit/treeview-skin.css
trunk/js/multiFileUpload.js
trunk/js/treeView.js
trunk/js/updateCheck.js
trunk/lib/QubitCultureFallback.class.php
trunk/lib/QubitXmlImport.class.php
trunk/lib/model/QubitDigitalObject.php
trunk/lib/model/QubitEvent.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitMenu.php
trunk/lib/model/QubitOaiHarvest.php
trunk/lib/model/QubitOaiRepository.php
trunk/lib/model/QubitProperty.php
trunk/lib/model/QubitRepository.php
trunk/lib/model/QubitSetting.php
trunk/lib/model/QubitTerm.php
trunk/lib/model/QubitUser.php
trunk/lib/task/migrate/QubitMigrate.class.php
trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php
Modified:
trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
Thu Oct 28 12:10:28 2010 (r8634)
@@ -31,7 +31,6 @@
{
if (!$this->context->user->hasCredential('administrator') ||
!sfConfig::get('app_check_for_updates'))
{
-
return sfView::NONE;
}
@@ -79,7 +78,6 @@
if (0 == $this->lastVersion || 1 > version_compare($this->lastVersion,
qubitConfiguration::VERSION))
{
-
return sfView::NONE;
}
}
Modified: trunk/apps/qubit/modules/menu/actions/browseMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/menu/actions/browseMenuComponent.class.php Thu Oct
28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/menu/actions/browseMenuComponent.class.php Thu Oct
28 12:10:28 2010 (r8634)
@@ -35,7 +35,6 @@
if (!$this->browseMenu instanceof QubitMenu)
{
-
return sfView::NONE;
}
}
Modified: trunk/apps/qubit/modules/menu/actions/mainMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/menu/actions/mainMenuComponent.class.php Thu Oct
28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/menu/actions/mainMenuComponent.class.php Thu Oct
28 12:10:28 2010 (r8634)
@@ -35,7 +35,6 @@
if (!$this->mainMenu instanceof QubitMenu)
{
-
return sfView::NONE;
}
}
Modified: trunk/apps/qubit/modules/menu/actions/quickLinksComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/menu/actions/quickLinksComponent.class.php Thu Oct
28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/menu/actions/quickLinksComponent.class.php Thu Oct
28 12:10:28 2010 (r8634)
@@ -34,7 +34,6 @@
if (!$this->quickLinksMenu instanceof QubitMenu)
{
-
return sfView::NONE;
}
}
Modified: trunk/apps/qubit/modules/oai/actions/harvesterDeleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterDeleteAction.class.php
Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/oai/actions/harvesterDeleteAction.class.php
Thu Oct 28 12:10:28 2010 (r8634)
@@ -27,7 +27,6 @@
*/
class oaiHarvesterDeleteAction extends sfAction
{
-
/*
* Executes action
*
Modified: trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/oai/actions/harvesterHarvestAction.class.php
Thu Oct 28 12:10:28 2010 (r8634)
@@ -106,7 +106,6 @@
if (!$this->noRecordsMatch)
{
-
//Container for xml import errors
$this->errorsFound = array();
$this->errorsXML = array();
Modified: trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php Thu Oct
28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/oai/actions/harvesterListAction.class.php Thu Oct
28 12:10:28 2010 (r8634)
@@ -27,7 +27,6 @@
*/
class oaiHarvesterListAction extends sfAction
{
-
/*
* Executes action
*
Modified:
trunk/apps/qubit/modules/oai/actions/harvesterNewRepositoryAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/harvesterNewRepositoryAction.class.php
Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/oai/actions/harvesterNewRepositoryAction.class.php
Thu Oct 28 12:10:28 2010 (r8634)
@@ -27,7 +27,6 @@
*/
class oaiHarvesterNewRepositoryAction extends sfAction
{
-
/*
* Executes action
*
Modified: trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php Thu Oct
28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/oai/actions/listRecordsComponent.class.php Thu Oct
28 12:10:28 2010 (r8634)
@@ -27,7 +27,6 @@
*/
class OaiListRecordsComponent extends sfComponent
{
-
public function execute($request)
{
$this->requestname = $request;
Modified: trunk/apps/qubit/modules/oai/actions/oaiAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/oai/actions/oaiAction.class.php Thu Oct 28
11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/oai/actions/oaiAction.class.php Thu Oct 28
12:10:28 2010 (r8634)
@@ -27,7 +27,6 @@
*/
class oaiOaiAction extends sfAction
{
-
public $oaiErrorArr = array(
'badArgument'=>'The request includes illegal arguments, is missing
required arguments, includes a repeated argument, or values for arguments have
an illegal syntax.',
'badResumptionToken'=>'The value of the resumptionToken argument is
invalid or expired.',
Modified: trunk/apps/qubit/modules/settings/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/listAction.class.php Thu Oct
28 11:45:11 2010 (r8633)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Thu Oct
28 12:10:28 2010 (r8634)
@@ -69,7 +69,6 @@
// Handle POST data (form submit)
if ($request->isMethod('post'))
{
-
// Global settings form submission
if (null !== $request->global_settings)
{
Modified: trunk/css/form.css
==============================================================================
--- trunk/css/form.css Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/css/form.css Thu Oct 28 12:10:28 2010 (r8634)
@@ -52,7 +52,6 @@
#language-selector .form-submit:hover
{
-
font: 11px Verdana, Arial, Sans-Serif;
margin: 5px 0 0 5px;
width: auto;
Modified: trunk/css/yui/treeview/assets/skins/qubit/treeview-skin.css
==============================================================================
--- trunk/css/yui/treeview/assets/skins/qubit/treeview-skin.css Thu Oct 28
11:45:11 2010 (r8633)
+++ trunk/css/yui/treeview/assets/skins/qubit/treeview-skin.css Thu Oct 28
12:10:28 2010 (r8634)
@@ -105,7 +105,6 @@
/* the style of the div around each node */
.ygtvitem {
-
}
/* the style of the div around each node's collection of children */
Modified: trunk/js/multiFileUpload.js
==============================================================================
--- trunk/js/multiFileUpload.js Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/js/multiFileUpload.js Thu Oct 28 12:10:28 2010 (r8634)
@@ -22,7 +22,6 @@
if (null != yuiId && !isNaN(parseInt(yuiId)))
{
-
return yuiId;
}
};
Modified: trunk/js/treeView.js
==============================================================================
--- trunk/js/treeView.js Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/js/treeView.js Thu Oct 28 12:10:28 2010 (r8634)
@@ -5,7 +5,6 @@
Qubit.treeView = Qubit.treeView || {};
Drupal.behaviors.treeView = {
-
attach: function (context)
{
// Build tree function
@@ -95,13 +94,11 @@
if (parentNode.contentElId == newParent.contentElId)
{
-
return false;
}
if ($(textNode.getEl()).has(newParent.getEl()).length)
{
-
return false;
}
@@ -165,13 +162,11 @@
if (el.parent.getElId() == destEl.getElId() ||
dest.hasClass('currentTextNode'))
{
-
return false;
}
if ($(el.getEl()).has(destEl.getEl()).length)
{
-
return false;
}
Modified: trunk/js/updateCheck.js
==============================================================================
--- trunk/js/updateCheck.js Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/js/updateCheck.js Thu Oct 28 12:10:28 2010 (r8634)
@@ -5,7 +5,6 @@
Qubit.updateCheck = Qubit.updateCheck || {};
Drupal.behaviors.updateCheck = {
-
attach: function (context)
{
var showNotification = function (version)
@@ -46,7 +45,6 @@
{
splitVersion = function (v)
{
-
return ('' + v).split('.');
};
Modified: trunk/lib/QubitCultureFallback.class.php
==============================================================================
--- trunk/lib/QubitCultureFallback.class.php Thu Oct 28 11:45:11 2010
(r8633)
+++ trunk/lib/QubitCultureFallback.class.php Thu Oct 28 12:10:28 2010
(r8634)
@@ -25,7 +25,6 @@
*/
class QubitCultureFallback
{
-
/**
* Assign fallback values for each column in the $fallbackClassName table
*
Modified: trunk/lib/QubitXmlImport.class.php
==============================================================================
--- trunk/lib/QubitXmlImport.class.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/QubitXmlImport.class.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -241,7 +241,6 @@
// go through schema map and populate objects/properties
foreach ($qubitXmlImport->schemaMap as $name => $mapping)
{
-
// if object is not defined or a valid class, we can't process this
mapping
if (empty($mapping['Object']) ||
!class_exists('Qubit'.$mapping['Object']))
{
@@ -297,7 +296,6 @@
// go through methods and populate properties
foreach ($mapping['Methods'] as $name => $methodMap)
{
-
// if method is not defined, we can't process this mapping
if (empty($methodMap['Method']) ||
!is_callable(array($currentObject, $methodMap['Method'])))
{
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Thu Oct 28 11:45:11 2010
(r8633)
+++ trunk/lib/model/QubitDigitalObject.php Thu Oct 28 12:10:28 2010
(r8634)
@@ -815,7 +815,6 @@
if ('unknown' == $mimeType)
{
-
// Use "blank" icon for unknown file types
return $genericIconPath = $genericIconDir.'/blank.png';
}
@@ -1508,7 +1507,6 @@
{
if (QubitTerm::REFERENCE_ID != $usageId)
{
-
return false;
}
@@ -1568,7 +1566,6 @@
// Test for FFmpeg library
if (!self::hasFfmpeg())
{
-
return false;
}
@@ -1749,7 +1746,6 @@
// Test for FFmpeg library
if (!self::hasFfmpeg())
{
-
return false;
}
@@ -1866,7 +1862,6 @@
$displayAsCompoundProp = QubitProperty::getOneByObjectIdAndName($this->id,
'displayAsCompound');
if (null !== $displayAsCompoundProp)
{
-
return $displayAsCompoundProp->getValue(array('sourceCulture' => true));
}
}
@@ -1883,7 +1878,6 @@
// information object
if (null === $this->informationObjectId)
{
-
return false;
}
@@ -1891,7 +1885,6 @@
$showCompoundProp = QubitProperty::getOneByObjectIdAndName($this->id,
'displayAsCompound');
if (null === $showCompoundProp || '1' !=
$showCompoundProp->getValue(array('sourceCulture' => true)) )
{
-
return false;
}
@@ -1902,7 +1895,6 @@
if (0 === count(QubitDigitalObject::get($criteria)))
{
-
return false;
}
Modified: trunk/lib/model/QubitEvent.php
==============================================================================
--- trunk/lib/model/QubitEvent.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitEvent.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -108,12 +108,10 @@
if (count($relation) > 0)
{
-
return $relation[0]->getTerm();
}
else
{
-
return null;
}
}
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Thu Oct 28 11:45:11 2010
(r8633)
+++ trunk/lib/model/QubitInformationObject.php Thu Oct 28 12:10:28 2010
(r8634)
@@ -1098,7 +1098,6 @@
// only create an linked Actor if the event or relation type is indicated
if (!isset($options['event_type_id']) &&
!isset($options['relation_type_id']))
{
-
return;
}
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitMenu.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -151,34 +151,29 @@
// an action from staticpage module (See FIXME below)
if ($currentModule == 'staticpage' && in_array($currentAction,
array('edit', 'index', 'list', 'static')))
{
-
return false;
}
// Yucky Hack, Part Deux: Don't display any active menu options when
// displaying search results
if ($currentModule == 'search' && $currentAction == 'search')
{
-
return false;
}
// 'Hacks 3: Return of the Hack' Select the 'archival description' button
// when uploading digital object
if ($currentModule == 'digitalobject' && $currentAction == 'edit')
{
-
return ($this->getPath() == 'informationobject/list');
}
// And even more hacks
else if (in_array($currentModule, array('sfIsadPlugin', 'sfRadPlugin',
'sfDcPlugin', 'sfModsPlugin')))
{
-
return ($this->getPath() == 'informationobject/list');
}
// son of hack
if (in_array($currentModule, array('term', 'taxonomy')))
{
-
return ($this->getPath() == 'taxonomy/list');
}
@@ -219,7 +214,6 @@
{
if ($menu->isSelected())
{
-
return true;
}
}
@@ -404,7 +398,6 @@
// Attempt to grab topMenu object via id
if (null === $topMenu = QubitMenu::getById($id))
{
-
return false;
}
Modified: trunk/lib/model/QubitOaiHarvest.php
==============================================================================
--- trunk/lib/model/QubitOaiHarvest.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitOaiHarvest.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -27,7 +27,6 @@
*/
class QubitOaiHarvest extends BaseOaiHarvest
{
-
/**
* Get last harvest for a repository
* @var int id, the id for the repository
Modified: trunk/lib/model/QubitOaiRepository.php
==============================================================================
--- trunk/lib/model/QubitOaiRepository.php Thu Oct 28 11:45:11 2010
(r8633)
+++ trunk/lib/model/QubitOaiRepository.php Thu Oct 28 12:10:28 2010
(r8634)
@@ -27,7 +27,6 @@
*/
class QubitOaiRepository extends BaseOaiRepository
{
-
/**
* Get all OAI-PMH Repositories
* @return QubitQuery collection of OAI-PMH Repositories
Modified: trunk/lib/model/QubitProperty.php
==============================================================================
--- trunk/lib/model/QubitProperty.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitProperty.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -95,7 +95,6 @@
{
if (strlen($sourceCultureValue = $this->getValue(array('sourceCulture' =>
'true'))) > 0 && $sfUserCulture != $this->getSourceCulture())
{
-
return $sourceCultureValue;
}
Modified: trunk/lib/model/QubitRepository.php
==============================================================================
--- trunk/lib/model/QubitRepository.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitRepository.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -105,7 +105,6 @@
{
if ($this->getCountryCode())
{
-
return format_country($this->getCountryCode());
}
}
@@ -116,7 +115,6 @@
{
if ($countryCode = $this->getPrimaryContact()->getCountryCode())
{
-
return $countryCode;
}
}
@@ -126,7 +124,6 @@
{
if ($countryCode = $contact->getCountryCode())
{
-
return $countryCode;
}
}
Modified: trunk/lib/model/QubitSetting.php
==============================================================================
--- trunk/lib/model/QubitSetting.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitSetting.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -87,7 +87,6 @@
{
if (strlen($sourceCultureValue = $this->getValue(array('sourceCulture' =>
true))) > 0 && $culture != $this->getSourceCulture())
{
-
return $sourceCultureValue;
}
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitTerm.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -281,12 +281,10 @@
if (count($notes) > 0)
{
-
return $notes[0]->getContent($options = array('cultureFallback' =>
true));
}
else
{
-
return $this->getName();
}
}
@@ -430,7 +428,6 @@
{
if (!$parentTerm = QubitTerm::getById($parentTermId))
{
-
return false;
}
@@ -519,7 +516,6 @@
$stmt->execute();
if (count($row = $stmt->fetch()))
{
-
return intval($row[0]);
}
Modified: trunk/lib/model/QubitUser.php
==============================================================================
--- trunk/lib/model/QubitUser.php Thu Oct 28 11:45:11 2010 (r8633)
+++ trunk/lib/model/QubitUser.php Thu Oct 28 12:10:28 2010 (r8634)
@@ -143,7 +143,6 @@
// A user is always part of the authenticated group
if (in_array(QubitAclGroup::AUTHENTICATED_ID, $checkGroups))
{
-
return true;
}
Modified: trunk/lib/task/migrate/QubitMigrate.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate.class.php Thu Oct 28 11:45:11
2010 (r8633)
+++ trunk/lib/task/migrate/QubitMigrate.class.php Thu Oct 28 12:10:28
2010 (r8634)
@@ -178,13 +178,11 @@
if (isset($columns[$searchColumn]) &&
$columns[$searchColumn][$searchKey] == $searchValue[$searchKey])
{
-
return $key;
}
}
else if (isset($columns[$searchColumn]) && $columns[$searchColumn] ==
$searchValue)
{
-
return $key;
}
}
@@ -223,7 +221,6 @@
// If pivotKey doesn't exist, then just return a simple array merge
if (!isset($originalData[$pivotKey]))
{
-
return array_merge($originalData, $newData);
}
Modified: trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php Thu Oct 28
11:45:11 2010 (r8633)
+++ trunk/plugins/qbAclPlugin/lib/model/QubitAclPermission.php Thu Oct 28
12:10:28 2010 (r8634)
@@ -139,7 +139,6 @@
// If no conditional specified, than always return true
if (0 == strlen($conditional = $this->conditional))
{
-
return true;
}
--
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.
