Author: allyb
Date: 2010-02-18 22:21:31 +0100 (Thu, 18 Feb 2010)
New Revision: 28123
Added:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserCredentialFormFilter.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserFormFilter.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php.propel
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php.propel
Removed:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php
Log:
Renamed propel filters and generated doctrine ones
Added:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserCredentialFormFilter.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserCredentialFormFilter.class.php
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserCredentialFormFilter.class.php
2010-02-18 21:21:31 UTC (rev 28123)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * PluginsfEasyAuthUserCredential form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginsfEasyAuthUserCredentialFormFilter extends
BasesfEasyAuthUserCredentialFormFilter
+{
+}
Added:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserFormFilter.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserFormFilter.class.php
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/doctrine/PluginsfEasyAuthUserFormFilter.class.php
2010-02-18 21:21:31 UTC (rev 28123)
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * PluginsfEasyAuthUser form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
+ */
+abstract class PluginsfEasyAuthUserFormFilter extends
BasesfEasyAuthUserFormFilter
+{
+ public function configure()
+ {
+ sfEasyAuthFilterHelper::userFormConfigure($this);
+ }
+
+ /**
+ * Support filtering by credential
+ *
+ * @param Doctrine_Query $query
+ * @param <type> $field
+ * @param <type> $values
+ * @return <type>
+ */
+ protected function addCredentialColumnQuery(Doctrine_Query $query, $field,
$values)
+ {
+ $fieldName = $this->getFieldName($field);
+
+ if (is_array($values) && isset($values['text']) && '' != $values['text'])
+ {
+ $query->innerJoin(sprintf('%s.sfEasyAuthUserCredential c',
$query->getRootAlias()));
+ $query->addWhere('c.credential = ?', $values['text']);
+ }
+ }
+
+ /**
+ * Trims whitespace from the email address
+ */
+ public function convertEmailValue($value)
+ {
+ return sfEasyAuthFilterHelper::trimValue($value);
+ }
+
+ /**
+ * Trims whitespace from the user name
+ */
+ public function convertUsernameValue($value)
+ {
+ return sfEasyAuthFilterHelper::trimValue($value);
+ }
+}
Added:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthFilterHelper.class.php
2010-02-18 21:21:31 UTC (rev 28123)
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Contains methods common to filters for both ORMs
+ *
+ * @author al
+ */
+class sfEasyAuthFilterHelper
+{
+ /**
+ * The configure method
+ *
+ * @param sfForm $form
+ */
+ public static function userFormConfigure(sfForm &$form)
+ {
+ $form->useFields(array('username', 'email', 'locked_by_admins'));
+
+ $credentials = array_merge(array('' => 'Any'),
sfEasyAuthUserCredentialPeer::getAllCredentialsAsArray());
+
+ $form->widgetSchema['credential'] = new sfWidgetFormChoice(
+ array(
+ 'choices' => $credentials,
+ 'expanded' => false
+ )
+ );
+
+ $form->validatorSchema['credential'] = new sfValidatorChoice(
+ array(
+ 'choices' => $credentials,
+ 'required' => false
+ )
+ );
+ }
+
+ /**
+ * Trims whitespace from values of an array
+ *
+ * @param array $array
+ * @return array
+ */
+ public static function trimValue($array)
+ {
+ foreach ($array as $k => $v)
+ {
+ $array[$k] = trim($v);
+ }
+
+ return $array;
+ }
+}
+
Deleted:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php
2010-02-18 21:18:06 UTC (rev 28122)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php
2010-02-18 21:21:31 UTC (rev 28123)
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * SfEasyAuthUserCredential filter form.
- *
- * @package ##PROJECT_NAME##
- * @subpackage filter
- * @author ##AUTHOR_NAME##
- * @version SVN: $Id: sfPropelFormFilterTemplate.php 11675 2008-09-19
15:21:38Z fabien $
- */
-class sfEasyAuthUserCredentialFormFilter extends
BasesfEasyAuthUserCredentialFormFilter
-{
- public function configure()
- {
- }
-}
Copied:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php.propel
(from rev 28119,
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php)
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php.propel
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php.propel
2010-02-18 21:21:31 UTC (rev 28123)
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * SfEasyAuthUserCredential filter form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfPropelFormFilterTemplate.php 11675 2008-09-19
15:21:38Z fabien $
+ */
+class sfEasyAuthUserCredentialFormFilter extends
BasesfEasyAuthUserCredentialFormFilter
+{
+ public function configure()
+ {
+ }
+}
Property changes on:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserCredentialFormFilter.class.php.propel
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php
2010-02-18 21:18:06 UTC (rev 28122)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php
2010-02-18 21:21:31 UTC (rev 28123)
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * sfEasyAuthUser filter form.
- *
- * @package ##PROJECT_NAME##
- * @subpackage filter
- * @author ##AUTHOR_NAME##
- * @version SVN: $Id: sfPropelFormFilterTemplate.php 11675 2008-09-19
15:21:38Z fabien $
- */
-class sfEasyAuthUserFormFilter extends BasesfEasyAuthUserFormFilter
-{
- public function configure()
- {
- sfEasyAuthFilterHelper::userFormConfigure($this);
- }
-
- /**
- * Support filtering by credential
- *
- * @param Criteria $criteria
- * @param <type> $field
- * @param <type> $values
- */
- public function addCredentialColumnCriteria(Criteria $criteria, $field,
$values)
- {
- if (empty($values))
- {
- return $criteria;
- }
-
- $criteria->addJoin(sfEasyAuthUserPeer::ID,
sfEasyAuthUserCredentialPeer::USER_ID);
-
- $criteria->add(sfEasyAuthUserCredentialPeer::CREDENTIAL, $values);
-
- return $criteria;
- }
-
- /**
- * Trims whitespace from the email address
- */
- public function convertEmailValue($value)
- {
- return sfEasyAuthFilterHelper::trimValue($value);
- }
-
- /**
- * Trims whitespace from the user name
- */
- public function convertUsernameValue($value)
- {
- return sfEasyAuthFilterHelper::trimValue($value);
- }
-}
Copied:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php.propel
(from rev 28122,
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php)
===================================================================
---
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php.propel
(rev 0)
+++
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php.propel
2010-02-18 21:21:31 UTC (rev 28123)
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * sfEasyAuthUser filter form.
+ *
+ * @package ##PROJECT_NAME##
+ * @subpackage filter
+ * @author ##AUTHOR_NAME##
+ * @version SVN: $Id: sfPropelFormFilterTemplate.php 11675 2008-09-19
15:21:38Z fabien $
+ */
+class sfEasyAuthUserFormFilter extends BasesfEasyAuthUserFormFilter
+{
+ public function configure()
+ {
+ sfEasyAuthFilterHelper::userFormConfigure($this);
+ }
+
+ /**
+ * Support filtering by credential
+ *
+ * @param Criteria $criteria
+ * @param <type> $field
+ * @param <type> $values
+ */
+ public function addCredentialColumnCriteria(Criteria $criteria, $field,
$values)
+ {
+ if (empty($values))
+ {
+ return $criteria;
+ }
+
+ $criteria->addJoin(sfEasyAuthUserPeer::ID,
sfEasyAuthUserCredentialPeer::USER_ID);
+
+ $criteria->add(sfEasyAuthUserCredentialPeer::CREDENTIAL, $values);
+
+ return $criteria;
+ }
+
+ /**
+ * Trims whitespace from the email address
+ */
+ public function convertEmailValue($value)
+ {
+ return sfEasyAuthFilterHelper::trimValue($value);
+ }
+
+ /**
+ * Trims whitespace from the user name
+ */
+ public function convertUsernameValue($value)
+ {
+ return sfEasyAuthFilterHelper::trimValue($value);
+ }
+}
Property changes on:
plugins/sfEasyAuthPlugin/branches/2010-02-18_integration-of-doctrine/lib/filter/sfEasyAuthUserFormFilter.class.php.propel
___________________________________________________________________
Added: svn:mergeinfo
+
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
