Author: jablko
Date: Sun Oct 24 11:30:29 2010
New Revision: 8415
Log:
Cosmetic change, for consistency
Modified:
trunk/apps/qubit/modules/browse/actions/listAction.class.php
trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/function/actions/listAction.class.php
trunk/apps/qubit/modules/i18n/actions/updateAction.class.php
trunk/apps/qubit/modules/map/actions/indexAction.class.php
trunk/apps/qubit/modules/object/actions/importAction.class.php
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/place/actions/actions.class.php
trunk/apps/qubit/modules/search/actions/indexAction.class.php
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/apps/qubit/modules/term/actions/editAction.class.php
trunk/apps/qubit/modules/user/actions/editAction.class.php
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
trunk/apps/qubit/modules/user/actions/indexAction.class.php
trunk/apps/qubit/modules/user/actions/indexActorAclAction.class.php
trunk/apps/qubit/modules/user/actions/indexInformationObjectAclAction.class.php
trunk/apps/qubit/modules/user/actions/indexTermAclAction.class.php
trunk/apps/qubit/modules/user/actions/loginAction.class.php
trunk/apps/qubit/modules/user/actions/logoutAction.class.php
trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php
trunk/lib/QubitCultureFallback.class.php
trunk/lib/QubitXmlImport.class.php
trunk/lib/helper/QubitHelper.php
trunk/lib/model/QubitInformationObject.php
trunk/lib/model/QubitMenu.php
trunk/lib/model/QubitSetting.php
trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
trunk/plugins/sfHistoryPlugin/lib/sfHistoryPluginFilter.class.php
trunk/plugins/sfTranslatePlugin/modules/sfTranslatePlugin/actions/translateAction.class.php
Modified: trunk/apps/qubit/modules/browse/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/browse/actions/listAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/browse/actions/listAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -27,52 +27,52 @@
switch($this->browseList)
{
case 'subject':
- $this->getUser()->setAttribute('browse_list', 'subject');
+ $this->context->user->setAttribute('browse_list', 'subject');
$this->redirect(array('module' => 'taxonomy', 'action' => 'browse',
'id' => QubitTaxonomy::SUBJECT_ID));
break;
case 'materialtype':
- $this->getUser()->setAttribute('browse_list', 'materialtype');
+ $this->context->user->setAttribute('browse_list', 'materialtype');
$this->redirect(array('module' => 'taxonomy', 'action' => 'browse',
'id' => QubitTaxonomy::MATERIAL_TYPE_ID));
break;
case 'place':
- $this->getUser()->setAttribute('browse_list', 'place');
+ $this->context->user->setAttribute('browse_list', 'place');
$this->redirect(array('module' => 'taxonomy', 'action' => 'browse',
'id' => QubitTaxonomy::PLACE_ID));
break;
case 'actor':
- $this->getUser()->setAttribute('browse_list', 'actor');
+ $this->context->user->setAttribute('browse_list', 'actor');
$this->redirect(array('module' => 'actor', 'action' => 'browse'));
break;
case 'function':
- $this->getUser()->setAttribute('browse_list', 'function');
+ $this->context->user->setAttribute('browse_list', 'function');
$this->redirect(array('module' => 'function', 'action' => 'list'));
break;
case 'name':
- $this->getUser()->setAttribute('browse_list', 'name');
+ $this->context->user->setAttribute('browse_list', 'name');
$this->redirect(array('module' => 'actor', 'action' => 'browse'));
break;
case 'repository':
- $this->getUser()->setAttribute('browse_list', 'repository');
+ $this->context->user->setAttribute('browse_list', 'repository');
$this->redirect(array('module' => 'repository', 'action' => 'browse'));
break;
case 'mediatype':
- $this->getUser()->setAttribute('browse_list', 'mediatype');
+ $this->context->user->setAttribute('browse_list', 'mediatype');
$this->redirect(array('module' => 'digitalobject', 'action' =>
'list'));
break;
case 'informationobject':
- $this->getUser()->setAttribute('browse_list', 'informationobject');
+ $this->context->user->setAttribute('browse_list', 'informationobject');
$this->redirect(array('module' => 'informationobject', 'action' =>
'browse'));
break;
case 'recentUpdates':
- $this->getUser()->setAttribute('browse_list', 'recentUpdates');
+ $this->context->user->setAttribute('browse_list', 'recentUpdates');
$this->informationObjects =
informationObjectPeer::getRecentChanges(10);
$this->setTemplate('recentList');
break;
Modified:
trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
Sun Oct 24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/default/actions/updateCheckComponent.class.php
Sun Oct 24 11:30:29 2010 (r8415)
@@ -29,7 +29,7 @@
{
public function execute($request)
{
- if (!$this->getUser()->hasCredential('administrator') ||
!sfConfig::get('app_check_for_updates'))
+ if (!$this->context->user->hasCredential('administrator') ||
!sfConfig::get('app_check_for_updates'))
{
return sfView::NONE;
@@ -43,7 +43,7 @@
$this->updateCheckData['address'] = $request->getUriPrefix() .
$request->getScriptName() . $request->getPathInfo();
$this->updateCheckData['version'] = qubitConfiguration::VERSION.' -
'.sfConfig::get('app_version');
- if (null === ($this->updateCheckData['distribution'] =
$this->getUser()->getAttribute('distribution')))
+ if (null === ($this->updateCheckData['distribution'] =
$this->context->user->getAttribute('distribution')))
{
$packageXmlPath = sfConfig::get('sf_config_dir').'/package.xml';
if (file_exists($packageXmlPath))
@@ -53,7 +53,7 @@
$fd = FluentDOM($packageXmlPath)
->namespaces(array('p' => 'http://pear.php.net/dtd/package-2.0'));
- $this->getUser()->setAttribute('distribution',
$this->updateCheckData['distribution'] =
$fd->find('/*/p:name')->item(0)->textContent);
+ $this->context->user->setAttribute('distribution',
$this->updateCheckData['distribution'] =
$fd->find('/*/p:name')->item(0)->textContent);
}
}
@@ -62,7 +62,7 @@
if (!$request->getCookie('has_js'))
{
- if (null === ($this->lastVersion =
$this->getUser()->getAttribute('last_version')))
+ if (null === ($this->lastVersion =
$this->context->user->getAttribute('last_version')))
{
try
{
@@ -74,7 +74,7 @@
$this->lastVersion = 0;
}
- $this->getUser()->setAttribute('last_version', $this->lastVersion);
+ $this->context->user->setAttribute('last_version', $this->lastVersion);
}
if (0 == $this->lastVersion || 1 > version_compare($this->lastVersion,
qubitConfiguration::VERSION))
Modified: trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/function/actions/autocompleteAction.class.php
Sun Oct 24 11:30:29 2010 (r8415)
@@ -42,7 +42,7 @@
{
$criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
$request->query.'%', Criteria::LIKE);
}
- $criteria->add(QubitFunctionI18n::CULTURE, $this->getUser()->getCulture(),
Criteria::EQUAL);
+ $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture(), Criteria::EQUAL);
// Exclude the calling function from the list
$params =
$this->context->routing->parse(Qubit::pathInfo($request->getHttpHeader('Referer')));
Modified: trunk/apps/qubit/modules/function/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/function/actions/listAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -42,7 +42,7 @@
{
$criteria->addJoin(QubitFunction::ID, QubitFunctionI18n::ID,
Criteria::INNER_JOIN);
$criteria->add(QubitFunctionI18n::AUTHORIZED_FORM_OF_NAME,
'%'.$request->subquery.'%', Criteria::LIKE);
- $criteria->add(QubitFunctionI18n::CULTURE,
$this->getUser()->getCulture(), Criteria::EQUAL);
+ $criteria->add(QubitFunctionI18n::CULTURE,
$this->context->user->getCulture(), Criteria::EQUAL);
}
// Page results
Modified: trunk/apps/qubit/modules/i18n/actions/updateAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/i18n/actions/updateAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/i18n/actions/updateAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -22,7 +22,7 @@
public function execute($request)
{
//make sure user doesn't overwrite default 'en' values
- if ($this->getUser()->getCulture() != 'en')
+ if ($this->context->user->getCulture() != 'en')
{
switch ($this->request->fieldset)
{
Modified: trunk/apps/qubit/modules/map/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/map/actions/indexAction.class.php Sun Oct 24
10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/map/actions/indexAction.class.php Sun Oct 24
11:30:29 2010 (r8415)
@@ -64,13 +64,13 @@
//determine if user has edit priviliges
$this->editCredentials = false;
- if ($this->getUser()->hasCredential(array('contributor', 'editor',
'administrator'), false))
+ if ($this->context->user->hasCredential(array('contributor', 'editor',
'administrator'), false))
{
$this->editCredentials = true;
}
//set back navigation
- $this->getUser()->setAttribute('nav_context_back',
$this->getRequest()->getURI());
+ $this->context->user->setAttribute('nav_context_back',
$this->getRequest()->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/object/actions/importAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/object/actions/importAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/object/actions/importAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -37,7 +37,7 @@
}
catch (sfException $e)
{
- $this->getUser()->setFlash('error', $e->getMessage());
+ $this->context->user->setFlash('error', $e->getMessage());
$this->redirect(array('module' => 'object', 'action' => 'importSelect'));
}
Modified:
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
Sun Oct 24 10:53:01 2010 (r8414)
+++
trunk/apps/qubit/modules/physicalobject/actions/autocompleteAction.class.php
Sun Oct 24 11:30:29 2010 (r8415)
@@ -34,7 +34,7 @@
$criteria = new Criteria;
$criteria->addJoin(QubitPhysicalObject::ID, QubitPhysicalObjectI18n::ID,
Criteria::INNER_JOIN);
- $criteria->add(QubitPhysicalObjectI18n::CULTURE,
$this->getUser()->getCulture(), Criteria::EQUAL);
+ $criteria->add(QubitPhysicalObjectI18n::CULTURE,
$this->context->user->getCulture(), Criteria::EQUAL);
$criteria->add(QubitPhysicalObjectI18n::NAME, $request->query.'%',
Criteria::LIKE);
$criteria->addAscendingOrderByColumn(QubitPhysicalObjectI18n::NAME);
Modified: trunk/apps/qubit/modules/place/actions/actions.class.php
==============================================================================
--- trunk/apps/qubit/modules/place/actions/actions.class.php Sun Oct 24
10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/place/actions/actions.class.php Sun Oct 24
11:30:29 2010 (r8415)
@@ -33,12 +33,12 @@
//determine if user has edit priviliges
$this->editCredentials = false;
- if ($this->getUser()->hasCredential(array('contributor', 'editor',
'administrator'), false))
+ if ($this->context->user->hasCredential(array('contributor', 'editor',
'administrator'), false))
{
$this->editCredentials = true;
}
- $this->nav_context_back =
$this->getUser()->getAttribute('nav_context_back');
+ $this->nav_context_back =
$this->context->user->getAttribute('nav_context_back');
}
public function executeCreate()
Modified: trunk/apps/qubit/modules/search/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/indexAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/search/actions/indexAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -58,7 +58,7 @@
return;
}
- $culture = $this->getUser()->getCulture();
+ $culture = $this->context->user->getCulture();
$query->addSubquery(new Zend_Search_Lucene_Search_Query_Term(new
Zend_Search_Lucene_Index_Term($culture, 'culture')), true);
$query = QubitAcl::searchFilterByRepository($query, 'read');
Modified: trunk/apps/qubit/modules/settings/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/listAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -56,7 +56,7 @@
{
$this->form = new sfForm;
- $this->culture = $this->getUser()->getCulture();
+ $this->culture = $this->context->user->getCulture();
$this->globalForm = new SettingsGlobalForm;
$this->siteInformationForm = new SettingsSiteInformationForm;
Modified: trunk/apps/qubit/modules/term/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/editAction.class.php Sun Oct 24
10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/term/actions/editAction.class.php Sun Oct 24
11:30:29 2010 (r8415)
@@ -310,7 +310,7 @@
$criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID,
Criteria::INNER_JOIN);
$criteria->add(QubitTerm::TAXONOMY_ID, $this->term->taxonomyId);
$criteria->add(QubitTermI18n::NAME, $thisName);
- $criteria->add(QubitTermI18n::CULTURE,
$this->getContext()->getUser()->getCulture());
+ $criteria->add(QubitTermI18n::CULTURE,
$this->context->user->getCulture());
if (0 < count(QubitTermI18n::get($criteria)))
{
continue;
Modified: trunk/apps/qubit/modules/user/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/editAction.class.php Sun Oct 24
10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/editAction.class.php Sun Oct 24
11:30:29 2010 (r8415)
@@ -79,7 +79,7 @@
break;
case 'translate':
- $c =
sfCultureInfo::getInstance($this->getContext()->getUser()->getCulture());
+ $c = sfCultureInfo::getInstance($this->context->user->getCulture());
$languages = $c->getLanguages();
$choices = array();
Modified:
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
Sun Oct 24 10:53:01 2010 (r8414)
+++
trunk/apps/qubit/modules/user/actions/editInformationObjectAclAction.class.php
Sun Oct 24 11:30:29 2010 (r8415)
@@ -81,7 +81,7 @@
unset($this->basicActions['translate']);
$this->isAdministrator = false;
- if ($this->getUser()->hasGroup(QubitAclGroup::ADMIN_ID))
+ if ($this->context->user->hasGroup(QubitAclGroup::ADMIN_ID))
{
$this->isAdministrator = true;
}
Modified: trunk/apps/qubit/modules/user/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/indexAction.class.php Sun Oct 24
10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/indexAction.class.php Sun Oct 24
11:30:29 2010 (r8415)
@@ -25,9 +25,9 @@
$this->forward404Unless($this->user);
//except for administrators, only allow users to see their own profile
- if (!$this->getUser()->hasCredential('administrator'))
+ if (!$this->context->user->hasCredential('administrator'))
{
- if ($this->request->id != $this->getUser()->getAttribute('user_id'))
+ if ($this->request->id != $this->context->user->getAttribute('user_id'))
{
$this->redirect('admin/secure');
}
Modified: trunk/apps/qubit/modules/user/actions/indexActorAclAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/indexActorAclAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/indexActorAclAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -25,9 +25,9 @@
$this->forward404Unless($this->user);
//except for administrators, only allow users to see their own profile
- if (!$this->getUser()->hasCredential('administrator'))
+ if (!$this->context->user->hasCredential('administrator'))
{
- if ($this->request->id != $this->getUser()->getAttribute('user_id'))
+ if ($this->request->id != $this->context->user->getAttribute('user_id'))
{
$this->redirect('admin/secure');
}
Modified:
trunk/apps/qubit/modules/user/actions/indexInformationObjectAclAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/user/actions/indexInformationObjectAclAction.class.php
Sun Oct 24 10:53:01 2010 (r8414)
+++
trunk/apps/qubit/modules/user/actions/indexInformationObjectAclAction.class.php
Sun Oct 24 11:30:29 2010 (r8415)
@@ -25,9 +25,9 @@
$this->forward404Unless($this->user);
//except for administrators, only allow users to see their own profile
- if (!$this->getUser()->hasCredential('administrator'))
+ if (!$this->context->user->hasCredential('administrator'))
{
- if ($this->request->id != $this->getUser()->getAttribute('user_id'))
+ if ($this->request->id != $this->context->user->getAttribute('user_id'))
{
$this->redirect('admin/secure');
}
Modified: trunk/apps/qubit/modules/user/actions/indexTermAclAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/indexTermAclAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/indexTermAclAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -25,9 +25,9 @@
$this->forward404Unless($this->user);
//except for administrators, only allow users to see their own profile
- if (!$this->getUser()->hasCredential('administrator'))
+ if (!$this->context->user->hasCredential('administrator'))
{
- if ($this->request->id != $this->getUser()->getAttribute('user_id'))
+ if ($this->request->id != $this->context->user->getAttribute('user_id'))
{
$this->redirect('admin/secure');
}
Modified: trunk/apps/qubit/modules/user/actions/loginAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/loginAction.class.php Sun Oct 24
10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/loginAction.class.php Sun Oct 24
11:30:29 2010 (r8415)
@@ -50,7 +50,7 @@
$this->form->bind($request->getPostParameters());
if ($this->form->isValid())
{
- if ($this->getUser()->authenticate($this->form->getValue('email'),
$this->form->getValue('password')))
+ if ($this->context->user->authenticate($this->form->getValue('email'),
$this->form->getValue('password')))
{
if (null !== $next = $this->form->getValue('next'))
{
Modified: trunk/apps/qubit/modules/user/actions/logoutAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/logoutAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/logoutAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -21,7 +21,7 @@
{
public function execute($request)
{
- $this->getUser()->signOut();
+ $this->context->user->signOut();
$this->redirect('@homepage');
}
Modified: trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/apps/qubit/modules/user/actions/passwordEditAction.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -53,7 +53,7 @@
$this->form->setWidget('confirmPassword', new sfWidgetFormInputPassword);
$this->isAdministrator = false;
- if ($this->getUser()->hasCredential('administrator'))
+ if ($this->context->user->hasCredential('administrator'))
{
$this->isAdministrator = true;
}
@@ -61,7 +61,7 @@
//except for administrators, only allow users to reset their own password
if (!$this->isAdministrator)
{
- if ($this->request->id != $this->getUser()->getAttribute('user_id'))
+ if ($this->request->id != $this->context->user->getAttribute('user_id'))
{
QubitAcl::forwardToSecureAction();
}
Modified: trunk/lib/QubitCultureFallback.class.php
==============================================================================
--- trunk/lib/QubitCultureFallback.class.php Sun Oct 24 10:53:01 2010
(r8414)
+++ trunk/lib/QubitCultureFallback.class.php Sun Oct 24 11:30:29 2010
(r8415)
@@ -77,7 +77,7 @@
}
else
{
- $culture = sfContext::getInstance()->getUser()->getCulture();
+ $culture = sfContext::getInstance()->user->getCulture();
}
// Expose class constants so we can call them using a dynamic class name
Modified: trunk/lib/QubitXmlImport.class.php
==============================================================================
--- trunk/lib/QubitXmlImport.class.php Sun Oct 24 10:53:01 2010 (r8414)
+++ trunk/lib/QubitXmlImport.class.php Sun Oct 24 11:30:29 2010 (r8415)
@@ -199,7 +199,7 @@
{
if (is_object($langusage =
$importDOM->xpath->query('//eadheader/profiledesc/langusage/language/@langcode')))
{
- $sf_user = sfContext::getInstance()->getUser();
+ $sf_user = sfContext::getInstance()->user;
$currentCulture = $sf_user->getCulture();
$langCodeConvertor = new fbISO639_Map;
foreach ($langusage as $language)
Modified: trunk/lib/helper/QubitHelper.php
==============================================================================
--- trunk/lib/helper/QubitHelper.php Sun Oct 24 10:53:01 2010 (r8414)
+++ trunk/lib/helper/QubitHelper.php Sun Oct 24 11:30:29 2010 (r8415)
@@ -19,7 +19,7 @@
function format_script($script_iso, $culture = null)
{
- $c = sfCultureInfo::getInstance($culture === null ?
sfContext::getInstance()->getUser()->getCulture() : $culture);
+ $c = sfCultureInfo::getInstance($culture === null ?
sfContext::getInstance()->user->getCulture() : $culture);
$scripts = $c->getScripts();
if (!isset($scripts[$script_iso]))
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Sun Oct 24 10:53:01 2010
(r8414)
+++ trunk/lib/model/QubitInformationObject.php Sun Oct 24 11:30:29 2010
(r8415)
@@ -513,7 +513,7 @@
try
{
- $criteria->add(QubitEventI18n::CULTURE,
sfContext::getInstance()->getUser()->getCulture());
+ $criteria->add(QubitEventI18n::CULTURE,
sfContext::getInstance()->user->getCulture());
}
catch (sfException $e)
{
@@ -763,7 +763,7 @@
{
if ($this->getCreators())
{
- $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->getUser()->getCulture();
+ $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->user->getCulture();
$creatorNameString = '';
$creators = $this->getCreators();
foreach ($creators as $creator)
@@ -787,7 +787,7 @@
{
if ($this->getCreators())
{
- $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->getUser()->getCulture();
+ $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->user->getCulture();
$creatorHistoryString = '';
$creators = $this->getCreators();
foreach ($creators as $creator)
@@ -807,7 +807,7 @@
{
if ($this->getDates())
{
- $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->getUser()->getCulture();
+ $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->user->getCulture();
$datesString = '';
$dates = $this->getDates();
foreach ($dates as $date)
@@ -831,7 +831,7 @@
if ($accessPoints)
{
$list = array();
- $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->getUser()->getCulture();
+ $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->user->getCulture();
foreach ($accessPoints as $accessPoint)
{
@@ -860,7 +860,7 @@
$names = $this->getActors();
if ($names)
{
- $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->getUser()->getCulture();
+ $culture = (isset($options['culture'])) ? $options['culture'] :
sfContext::getInstance()->user->getCulture();
foreach ($names as $name)
{
Modified: trunk/lib/model/QubitMenu.php
==============================================================================
--- trunk/lib/model/QubitMenu.php Sun Oct 24 10:53:01 2010 (r8414)
+++ trunk/lib/model/QubitMenu.php Sun Oct 24 11:30:29 2010 (r8415)
@@ -47,7 +47,7 @@
public function getPath($options = array())
{
$aliases = array(
- '%profile%' => sfContext::getInstance()->routing->generate(null,
array('module' => 'user', 'id' =>
sfContext::getInstance()->getUser()->getUserId())),
+ '%profile%' => sfContext::getInstance()->routing->generate(null,
array('module' => 'user', 'id' => sfContext::getInstance()->user->getUserId())),
'%currentId%' => sfContext::getInstance()->getRequest()->id
);
Modified: trunk/lib/model/QubitSetting.php
==============================================================================
--- trunk/lib/model/QubitSetting.php Sun Oct 24 10:53:01 2010 (r8414)
+++ trunk/lib/model/QubitSetting.php Sun Oct 24 11:30:29 2010 (r8415)
@@ -69,7 +69,7 @@
public function getCulture(array $options = array())
{
// get culture based on i18n fallback criteria
- if ($settingI18n = QubitSettingI18n::getByIdAndCulture($this->getId(),
sfContext::getInstance()->getUser()->getCulture()))
+ if ($settingI18n = QubitSettingI18n::getByIdAndCulture($this->getId(),
sfContext::getInstance()->user->getCulture()))
{
return $settingI18n->getCulture();
}
Modified: trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php
==============================================================================
--- trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Sun Oct 24 10:53:01
2010 (r8414)
+++ trunk/plugins/qbAclPlugin/lib/QubitAcl.class.php Sun Oct 24 11:30:29
2010 (r8415)
@@ -53,7 +53,7 @@
{
if (null === $user)
{
- $this->_user = sfContext::getInstance()->getUser();
+ $this->_user = sfContext::getInstance()->user;
}
else
{
@@ -93,7 +93,7 @@
$actions = array($actions);
}
- $user = sfContext::getInstance()->getUser();
+ $user = sfContext::getInstance()->user;
if (isset($options['user']))
{
$user = $options['user'];
@@ -451,9 +451,9 @@
$userGroupIds = array();
// If user is logged in
- if (sfContext::getInstance()->getUser()->isAuthenticated())
+ if (sfContext::getInstance()->user->isAuthenticated())
{
- $userId = sfContext::getInstance()->getUser()->getUserID();
+ $userId = sfContext::getInstance()->user->getUserID();
// Test user permissions
$criteria = new Criteria;
@@ -484,7 +484,7 @@
if (0 == count($repositoryAccess) || '*' !=
$repositoryAccess[count($repositoryAccess) - 1]['id'])
{
// Test user group permissions
- foreach (sfContext::getInstance()->getUser()->listGroups() as $group)
+ foreach (sfContext::getInstance()->user->listGroups() as $group)
{
$userGroupIds[] = $group->id;
}
@@ -531,7 +531,7 @@
public static function forwardUnauthorized()
{
- if (!sfContext::getInstance()->getUser()->isAuthenticated())
+ if (!sfContext::getInstance()->user->isAuthenticated())
{
self::forwardToLoginAction();
}
@@ -724,7 +724,7 @@
*/
public static function searchFilterByResource($query, $root)
{
- $user = sfContext::getInstance()->getUser();
+ $user = sfContext::getInstance()->user;
$permissions = self::getUserPermissionsByAction($user, get_class($root),
'read');
@@ -820,7 +820,7 @@
*/
public static function getFilterCriterion($criteria, $root, $action)
{
- $user = sfContext::getInstance()->getUser();
+ $user = sfContext::getInstance()->user;
$rootClass = get_class($root);
if ('createTerm' != $action)
@@ -992,20 +992,20 @@
if ('translate' == $privilege)
{
// If source language is the current language, then we aren't translating
- if (method_exists($resource, 'getSourceCulture') &&
$resource->sourceCulture == sfContext::getInstance()->getUser()->getCulture())
+ if (method_exists($resource, 'getSourceCulture') &&
$resource->sourceCulture == sfContext::getInstance()->user->getCulture())
{
return false;
}
// Test that user can translate into current language
- if (!$this->permission->evaluateConditional(array('language' =>
sfContext::getInstance()->getUser()->getCulture())))
+ if (!$this->permission->evaluateConditional(array('language' =>
sfContext::getInstance()->user->getCulture())))
{
return false;
}
}
// No update if source language != current language (requires translate)
- else if ('update' == $privilege && $resource->sourceCulture !=
sfContext::getInstance()->getUser()->getCulture())
+ else if ('update' == $privilege && $resource->sourceCulture !=
sfContext::getInstance()->user->getCulture())
{
return false;
}
Modified: trunk/plugins/sfHistoryPlugin/lib/sfHistoryPluginFilter.class.php
==============================================================================
--- trunk/plugins/sfHistoryPlugin/lib/sfHistoryPluginFilter.class.php Sun Oct
24 10:53:01 2010 (r8414)
+++ trunk/plugins/sfHistoryPlugin/lib/sfHistoryPluginFilter.class.php Sun Oct
24 11:30:29 2010 (r8415)
@@ -17,7 +17,7 @@
{
$filterChain->execute();
- $user = $this->getContext()->getUser();
+ $user = $this->context->user;
$user->setAttribute('moduleName', $this->getContext()->getModuleName(),
'sfHistoryPlugin');
$user->setAttribute('actionName', $this->getContext()->getActionName(),
'sfHistoryPlugin');
$user->setAttribute('currentInternalUri',
$this->getContext()->getRouting()->getCurrentInternalUri(), 'sfHistoryPlugin');
Modified:
trunk/plugins/sfTranslatePlugin/modules/sfTranslatePlugin/actions/translateAction.class.php
==============================================================================
---
trunk/plugins/sfTranslatePlugin/modules/sfTranslatePlugin/actions/translateAction.class.php
Sun Oct 24 10:53:01 2010 (r8414)
+++
trunk/plugins/sfTranslatePlugin/modules/sfTranslatePlugin/actions/translateAction.class.php
Sun Oct 24 11:30:29 2010 (r8415)
@@ -29,7 +29,7 @@
QubitAcl::forwardUnauthorized();
}
- $user = $this->getUser();
+ $user = $this->context->user;
$error = array();
$status = array();
--
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.
