Author: Nathan.Vonnahme
Date: 2010-05-05 22:17:05 +0200 (Wed, 05 May 2010)
New Revision: 29365

Removed:
   plugins/bhLDAPAuthPlugin/trunk/bhLDAPAuthPlugin-0.0.5.tgz
Modified:
   plugins/bhLDAPAuthPlugin/trunk/README
   plugins/bhLDAPAuthPlugin/trunk/config/LDAPAuth.yml
   plugins/bhLDAPAuthPlugin/trunk/lib/
   plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAP.php
   plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAPAuthRouting.class.php
   plugins/bhLDAPAuthPlugin/trunk/lib/user/bhLDAPAuthSecurityUser.class.php
   plugins/bhLDAPAuthPlugin/trunk/lib/validator/bhLDAPUserValidator.php
   plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/actions/actions.class.php
   plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/templates/signinSuccess.php
   plugins/bhLDAPAuthPlugin/trunk/package.xml
Log:
Merged changes r18558:29363 (1_2_Doctrine and 1_4 branches) into trunk.

Modified: plugins/bhLDAPAuthPlugin/trunk/README
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/README       2010-05-05 20:04:02 UTC (rev 
29364)
+++ plugins/bhLDAPAuthPlugin/trunk/README       2010-05-05 20:17:05 UTC (rev 
29365)
@@ -3,10 +3,11 @@
 # bhLDAPAuthPlugin #
 
 `bhLDAPAuthPlugin` allows you to use users and groups from an LDAP
-directory (Only Microsoft Active Directory® for now but you're
-welcome to add others) for your symfony app's authentication and
-authorization.
+directory (Microsoft Active Directory® and possibly others) for
+your symfony app's authentication and authorization.
 
+This version supports Symfony 1.4 with Doctrine.
+
 ## Revision ##
 
 $Id$
@@ -17,22 +18,22 @@
 
 `bhLDAPAuthPlugin` does:
 
-   * give your app a web login form similar to sfGuard's
-   * let you allow parts of your app to users based on their membership in AD 
groups
+   * give your app a web login form similar to sfGuard's, with LDAP password 
authentication
+   * let you authorize parts of your app to users based on their membership in 
LDAP groups
    * work with Apache on Windows ([XAMPP](http://www.apachefriends.org) rocks; 
you will need the Devel package) or Linux (probably also other Unix family OSes 
including Mac OS X).
+   * work with Microsoft Active Directory® and possibly other LDAP servers.
 
 It does *NOT*: 
 
-   * provide single sign on/seamless authentication/NTLM/GSSAPI.  For that, 
you can try [some of these 
alternatives](http://adldap.sourceforge.net/wiki/doku.php?id=seamless_authentication).
  I would start by trying (again) to get symfony to run on IIS (Windows).
-   * currently work with LDAP servers other than Microsoft Active 
Directory®
-   * necessarily keep your app from transmitting AD passwords over the network 
in plain text (use HTTPS for the login!)
+   * provide single sign on/seamless authentication/NTLM/GSSAPI.  For that, 
you can try [some of these 
alternatives](http://adldap.sourceforge.net/wiki/doku.php?id=seamless_authentication).
  I would try to [run symfony on 
IIS](http://www.symfony-project.org/more-with-symfony/1_4/en/11-Windows-and-Symfony),
 or try [Likewise](http://www.likewise.com/).
+   * necessarily keep your app from transmitting AD passwords over the network 
in plain text (use HTTPS for the login; instructions below!)
    * suck as much as having Yet Another user/group database to maintain
 
 ## Requirements ##
 
-  * [`sfGuardPlugin`](http://www.symfony-project.com/plugins/sfGuardPlugin).  
Why reinvent the wheel?
+  * 
[sfDoctrineGuardPlugin](http://www.symfony-project.org/plugins/sfDoctrineGuardPlugin).
  Why reinvent the wheel?
   * Your PHP must have OpenLDAP support enabled
-  * Microsoft Active Directory®
+  * Microsoft Active Directory® (again, it might work with other LDAP 
servers)
   * `sfSslRequirementPlugin` is a good idea but not strictly required (see 
"enable SSL" below).
 
 ## Installation ##
@@ -43,9 +44,9 @@
 
 For production use, you can install the plugins the standard way:
 
-Install the `sfGuardPlugin`
+Install the `sfDoctrineGuardPlugin`
 
-    ./symfony plugin:install sfGuardPlugin
+    ./symfony plugin:install sfDoctrineGuardPlugin
 
 Install the `bhLDAPAuthPlugin`
 
@@ -61,11 +62,12 @@
     svn propedit svn:externals ./plugins
 
 And here are the correct URLs for downloading the latest from each
-plugin's symfony 1.1 branch:
+plugin's symfony 1.4 (or compatible) branch:
 
-    bhLDAPAuthPlugin/     
http://svn.symfony-project.com/plugins/bhLDAPAuthPlugin/branches/1.1/
-    sfGuardPlugin/        
http://svn.symfony-project.com/plugins/sfGuardPlugin/branches/1.1/
-    sfSslRequirementPlugin/ 
http://svn.symfony-project.com/plugins/sfSslRequirementPlugin/branches/1.1/
+    $ svn propget svn:externals plugins/
+    bhLDAPAuthPlugin/         
http://svn.symfony-project.com/plugins/bhLDAPAuthPlugin/branches/1.4/
+    sfDoctrineGuardPlugin/    
http://svn.symfony-project.com/plugins/sfDoctrineGuardPlugin/branches/1.3/
+    sfSslRequirementPlugin/ 
http://svn.symfony-project.com/plugins/sfSslRequirementPlugin/branches/1.2/
 
 
 ## Configuration
@@ -89,74 +91,96 @@
   - 10.41.16.3
 </pre>
 
-### 2. Rebuild your model.  
 
-This adds the Propel object models for tables that `sfGuardPlugin`
+### 2. Activate the plugins
+
+Turn on the plugins in `config/ProjectConfiguration.class.php`
+  
+        [php]
+        class ProjectConfiguration extends sfProjectConfiguration
+        {
+          public function setup()
+          {
+            $this-&gt;enablePlugins(array(
+              'sfDoctrinePlugin', 
+              'sfDoctrineGuardPlugin',
+              'sfSslRequirementPlugin',
+             'bhLDAPAuthPlugin',
+              '...'
+            ));
+          }
+        }
+
+
+### 3. Rebuild your model.  
+
+This adds the Propel object models for tables that `sfDoctrineGuardPlugin`
 needs to your database, even though we won't be using most of them.
 
-    symfony propel-build-model
-    symfony propel-build-sql
+    ./symfony  doctrine:build --model --sql
 
 Update you database tables by starting from scratch (it will delete all
 the existing tables, then re-create them):
   
-    symfony propel-insert-sql
+    ./symfony doctrine:insert-sql
 
-*or*, you can just create the new tables by using the generated SQL
-statements in `data/sql/plugins.sfGuardAuth.lib.model.schema.sql`
+*or*, you can create the new tables manually using the generated SQL
+statements that have been appended to `data/sql/schema.sql`.
 
-With MySQL, that would be like this:
+(Don't load the default sfDoctrineGuardPlugin fixtures)
 
-    mysql -uroot -ppassword database < 
data/sql/plugins.sfGuardPlugin.lib.model.schema.sql
+### 4.  Clear your cache
 
-
-(Don't load the default sfGuardPlugin fixtures)
-
-### 3.  Clear your cache
-
     symfony cc
 
 
-### 4. Enable "Remember Me" (optional)
+### 5. Enable "Remember Me" (optional)
 
-Optionally enable the "Remember Me" filter in
-`apps/frontend/config/filters.yml` (great for Intranet apps)
+Optionally enable the "Remember Me" filter above the security filter in 
`apps/frontend/config/filters.yml` 
 
-    security:
-      class: sfGuardBasicSecurityFilter
+    remember_me:
+      class: sfGuardRememberMeFilter
 
+    security: ~
 
 
-### 5. Edit your application's config files
+### 6. Edit your application's config files 
 
 #### a. settings.yml
 
-Enable the module `sfGuardAuth` under `.settings` in
+Enable the `sfGuardAuth` and `bhLDAPAuth` modules under `.settings` in
 `apps/frontend/config/settings.yml`
 
     all:
       .settings:
-        enabled_modules: [..., sfGuardAuth, bhLDAPAuth]
+        enabled_modules: [default, ..., sfGuardAuth, bhLDAPAuth]
 
-Change the default login and secure modules under `.actions` in
+***NOTE:*** at this time, it's also necessary to turn off CSRF protection 
here.  I think it is because we mix the bhLDAPAuth module's forms with the 
forms from sfGuardAuth.  Any help or patches are appreciated!
+
+        csrf_secret:            false
+
+
+Change the default login and secure modules under `all:``.actions` in
 `apps/frontend/config/settings.yml`
 
-    login_module:           bhLDAPAuth
-    login_action:           signin
+    all:
+      .actions:
+       login_module:           bhLDAPAuth
+       login_action:           signin
 
-    secure_module:          sfGuardAuth
-    secure_action:          secure
+       secure_module:          sfGuardAuth
+       secure_action:          secure
 
 #### b. app.yml
 
-Tell `sfGuard` to use the password checker in `bhLDAPAuth` in
-`apps/frontend/config/app.yml`.
+Tell `sfDoctrineGuard` to use the password checker in `bhLDAPAuth` in
+`apps/frontend/config/app.yml`, and set `routes:register` false so the bhLDAP 
routes will override.
   
     all:
       sf_guard_plugin:
        check_password_callable:   [bhLDAP, checkPassword]
+       routes_register: false
 
-
 #### c. `myUser` class
 
 Change the parent class to bhLDAPAuthSecurityUser in
@@ -168,7 +192,7 @@
     }
 
 
-### 6. Apply security to some modules or the whole app
+### 7. Apply security to some modules or the whole app
  
 Secure some modules or your entire application in
 `apps/frontend/config/security.yml`.  Read more about security in
@@ -177,6 +201,20 @@
 
 To require users to log in to access *any* module of the application,
 
+    # don't secure login or error pages or you'll make a loop.
+    login:
+      is_secure: off
+      require_ssl: true
+
+    error404:
+      is_secure: off
+      require_ssl: false
+
+    disabled:
+      is_secure: off
+      require_ssl: false
+
+    # require authnz for everything else
     default:
       is_secure: on
 
@@ -191,16 +229,16 @@
 users who can supply valid AD credentials.
 
 
-#### 7. enable SSL protection of login form
+#### 8. enable SSL protection of login form
 
 You don't want your AD credentials flying around the network in clear text, 
right?  
 
-a. Install the 
[sfSslRequirementPlugin](http://trac.symfony-project.org/wiki/sfSslRequirementPlugin)
 into your project's plugin dir (or use the `svn:externals` method, above).  
+a. Install the 
[sfSslRequirementPlugin](http://www.symfony-project.org/plugins/sfSslRequirementPlugin)
 into your project's plugin dir (or use the `svn:externals` method, above).  
   
     ./symfony plugin:install sfSslRequirementPlugin
 
 b. Complete the installation (editing `filters.yml` and clearing
-cache) according to the plugin's README
+cache) according to [sfSslRequirementPlugin's 
README](http://www.symfony-project.org/plugins/sfSslRequirementPlugin/2_0_0?tab=plugin_readme)
 
 c. The bhLDAPAuthPlugin `security.yml` file already turns SSL on for
 the signin and login action.
@@ -279,7 +317,7 @@
 
 This is all on the shoulders of giants.  Besides
 [symfony](http://symfony-project.com) and
-[sfGuardPlugin](http://www.symfony-project.com/plugins/sfGuardPlugin),
+[sfDoctrineGuardPlugin](http://www.symfony-project.com/plugins/sfDoctrineGuardPlugin),
 it includes code from 
 [the `adLDAP` PHP library](http://adldap.sourceforge.net/).
 
@@ -291,12 +329,16 @@
 
 ## TODO ##
 
-* make it also work with non-AD LDAP servers
+* test and document non-AD LDAP servers
 
 ## Changelog ##
 
-### 1.0
+### 5.0
 
+* nathan: release for symfony 1.4 with Doctrine.
+
+### 1.0 - 4.0
+
 * nathan: out of "alpha", releases for symfony 1.0, 1.1, 1.2 and 1.2 with 
Doctrine.
 
 ### 0.2, 0.3, 0.4, 0.5 ###


Property changes on: plugins/bhLDAPAuthPlugin/trunk/README
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Deleted: plugins/bhLDAPAuthPlugin/trunk/bhLDAPAuthPlugin-0.0.5.tgz
===================================================================
(Binary files differ)

Modified: plugins/bhLDAPAuthPlugin/trunk/config/LDAPAuth.yml
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/config/LDAPAuth.yml  2010-05-05 20:04:02 UTC 
(rev 29364)
+++ plugins/bhLDAPAuthPlugin/trunk/config/LDAPAuth.yml  2010-05-05 20:17:05 UTC 
(rev 29365)
@@ -23,12 +23,12 @@
   # intensive.  Setting to false will fudge "Domain Users" and is much
   # faster. Keep in mind though that if someone's primary group is NOT
   # domain users, this is obviously going to bollocks the results
-  real_primarygroup  : TRUE
+  real_primarygroup  : true
 
 
   # Use SSL, but your server needs to be setup.
   #  see http://adldap.sourceforge.net/ldap_ssl.php
-  use_ssl            : FALSE
+  use_ssl            : false
 
 
   # When querying group memberships, do it recursively
@@ -45,7 +45,7 @@
   # make the login much slower and in some cases even hang PHP
   # (especially when encountering very large groups)
 
-  recursive_groups      : FALSE;
+  recursive_groups      : false
 
 
 


Property changes on: plugins/bhLDAPAuthPlugin/trunk/lib
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAP.php
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAP.php       2010-05-05 20:04:02 UTC 
(rev 29364)
+++ plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAP.php       2010-05-05 20:17:05 UTC 
(rev 29365)
@@ -99,7 +99,7 @@
   public static function getUserCredentials($user)
   {
     $credentials = array();
-    self::debugDump($user, "user");
+    //    self::debugDump($user, "user");
     $username = $user->getUsername();
 
     $ldap = self::getLDAP();

Modified: plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAPAuthRouting.class.php
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAPAuthRouting.class.php      
2010-05-05 20:04:02 UTC (rev 29364)
+++ plugins/bhLDAPAuthPlugin/trunk/lib/bhLDAPAuthRouting.class.php      
2010-05-05 20:17:05 UTC (rev 29365)
@@ -23,8 +23,8 @@
   {
     $r = $event->getSubject();   
 
-    $r->prependRoute('bh_ldap_signin', '/login', array('module' => 
'bhLDAPAuth', 'action' => 'signin'));
-    $r->prependRoute('sf_guard_signin', '/login', array('module' => 
'bhLDAPAuth', 'action' => 'signin'));
+    $r->prependRoute('bh_ldap_signin', new sfRoute('/login', array('module' => 
'bhLDAPAuth', 'action' => 'signin')));
+    $r->prependRoute('sf_guard_signin', new sfRoute('/login', array('module' 
=> 'bhLDAPAuth', 'action' => 'signin')));
 
     parent::listenToRoutingLoadConfigurationEvent($event);
 

Modified: 
plugins/bhLDAPAuthPlugin/trunk/lib/user/bhLDAPAuthSecurityUser.class.php
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/lib/user/bhLDAPAuthSecurityUser.class.php    
2010-05-05 20:04:02 UTC (rev 29364)
+++ plugins/bhLDAPAuthPlugin/trunk/lib/user/bhLDAPAuthSecurityUser.class.php    
2010-05-05 20:17:05 UTC (rev 29365)
@@ -11,26 +11,33 @@
 
 */ 
 
-
-//require_once(sfConfig::get('sf_plugins_dir').'/bhLDAPAuth/lib/bhLDAP.php');
-
-
 class bhLDAPAuthSecurityUser extends sfGuardSecurityUser
 {
-
 public function signIn($user, $remember = false, $con = null)
   {
-    $return = parent::signIn($user, $remember);
+    $return = parent::signIn($user, $remember, $con);
     bhLDAP::debug("########  hello bhLDAPAuthSecurityUser.class.php 
signIn()!");
 
-    $this->clearCredentials();
+    // signin
+    # This either sets or overrides the parent::signIn function above
+    #$this->setAttribute('user_id', $user->getId(), 'sfGuardSecurityUser');
+    #$this->setAuthenticated(true);
+    #$this->clearCredentials();
+    #$this->addCredentials($user->getAllPermissionNames());
 
+    bhLDAP::debug("######## bhLDAPAuthSecurityUser id: " . $user->getID());
 
+    bhLDAP::debug("######## bhLDAPAuthSecurityUser Clearing Credentials...");
+    $this->clearCredentials();
 
+    bhLDAP::debug("######## bhLDAPAuthSecurityUser Fetching Credentials...");
+    //bhLDAP::debugDump($user, "######## $user");
     $credentials = bhLDAP::getUserCredentials($user);
 
+    bhLDAP::debug("######## bhLDAPAuthSecurityUser Adding Credentials...");
     $this->addCredentials($credentials);
 
+    bhLDAP::debug("######## bhLDAPAuthSecurityUser return...");
     return($return);
   }
 

Modified: plugins/bhLDAPAuthPlugin/trunk/lib/validator/bhLDAPUserValidator.php
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/lib/validator/bhLDAPUserValidator.php        
2010-05-05 20:04:02 UTC (rev 29364)
+++ plugins/bhLDAPAuthPlugin/trunk/lib/validator/bhLDAPUserValidator.php        
2010-05-05 20:17:05 UTC (rev 29365)
@@ -1,48 +1,50 @@
 <?php
 
-/* require_once 'lib/bhLDAP.php'; */
-/* require_once 'lib/adLDAP.php'; */
+/* $Id$ */
+/* $URL$ */
 
-class bhLDAPUserValidator extends sfGuardValidatorUser
+class bhLDAPUserValidator extends sfValidatorBase
 {
+  public function configure($options = array(), $messages = array())
+  {
+    $this->addOption('username_field', 'username');
+    $this->addOption('password_field', 'password');
+    $this->addOption('throw_global_error', false);
 
+    $this->setMessage('invalid', 'The username and/or password is invalid.');
+  }
 
   protected function doClean($values)
   {
     $username = isset($values[$this->getOption('username_field')]) ? 
$values[$this->getOption('username_field')] : '';
+    bhLDAP::debug ('######## Username: ' . $username);
     $password = isset($values[$this->getOption('password_field')]) ? 
$values[$this->getOption('password_field')] : '';
-    $remember = isset($values[$this->getOption('remember_checkbox')]) ? 
$values[$this->getOption('remember_checkbox')] : '';
 
-    bhLDAP::debug("########  hello bhLDAPUserValidator::doClean()!");
-    $user = sfGuardUserPeer::retrieveByUsername($username);
+    bhLDAP::debug ('######## User exists?');
 
-    if (! $user) { // pretend the user exists, then check AD password
+    $user = Doctrine::getTable('sfGuardUser')->findOneByUsername($username);
+    
+    bhLDAP::debugDump($user, "user:");
+
+    if (! $user) 
+    { 
+      // pretend the user exists, then check AD password
+      bhLDAP::debug ('######## User does not exist. Creating dummy user.');
       $user = new sfGuardUser;
       $user->setUsername($username);
       $user->setSalt('unused');
       $user->setPassword('unused');
     }
 
-    bhLDAP::debug("########  checking AD password...");
-
-    // user exists?
-    if ($user)
+    // password is ok?
+    bhLDAP::debug ('######## Checking Password...');
+    if ($user->checkPassword($password))
     {
-      // password is ok?
-      if ($user->checkPassword($password))
-      {
-       bhLDAP::debug("########  Good password!");
-
-       if ($user->isNew()) {
-         $user->save();
-         $user = sfGuardUserPeer::retrieveByUsername($username);
-       }
-        return array_merge($values, array('user' => $user));
-      }
-      else {
-       bhLDAP::debug("########  Password FAIL!");
-       $user->delete();
-      }
+      bhLDAP::debug ('######## Check Password successful...');
+      return array_merge($values, array('user' => $user));
+    } else
+    {
+      bhLDAP::debug ('######## Check Password failed...');
     }
 
     if ($this->getOption('throw_global_error'))
@@ -54,5 +56,10 @@
   }
 
 
+  protected function getTable()
+  {
+    return Doctrine::getTable('sfGuardUser');
+  }
 }
+
 //sfeof

Modified: 
plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/actions/actions.class.php
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/actions/actions.class.php 
2010-05-05 20:04:02 UTC (rev 29364)
+++ plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/actions/actions.class.php 
2010-05-05 20:17:05 UTC (rev 29365)
@@ -1,10 +1,11 @@
 <?php
 
+/*  $URL$ */
 
-require_once(sfConfig::get('sf_plugins_dir').'/sfGuardPlugin/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php');
+  // Doctrine-specifics here
+require_once(sfConfig::get('sf_plugins_dir').'/sfDoctrineGuardPlugin/modules/sfGuardAuth/lib/BasesfGuardAuthActions.class.php');
 
 
-
 /**
  *
  * @package    bhLDAPAuthPlugin
@@ -32,7 +33,7 @@
     $class = sfConfig::get('app_sf_guard_plugin_signin_form', 
'bhLDAPAuthFormSignin');
     $this->form = new $class();
 
-    bhLDAP::debug("########  Request Method = " . $request->getMethodName());
+    bhLDAP::debug("########  Request Method = " . $request->getMethod());
 
 
     if ($request->isMethod('post'))
@@ -40,11 +41,12 @@
       bhLDAP::debug("########  a login attempt!  signing in (if validation 
passed) and redirectifying to homepage or wherever");
 
 
+      $this->form->bind($request->getParameter('signin'));
+      bhLDAP::debug("### form bound");
 
-
-      $this->form->bind($request->getParameter('signin'));
       if ($this->form->isValid())
       {
+       bhLDAP::debug("##### signin form is valid");
         $values = $this->form->getValues();
         $this->getUser()->signIn($values['user'], array_key_exists('remember', 
$values) ? $values['remember'] : false);
 
@@ -55,6 +57,9 @@
 
         return $this->redirect($signinUrl);
       }
+      else {
+       bhLDAP::debug("##### what??  signin form is NOT valid");
+      }        
     
     }
     else

Modified: 
plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/templates/signinSuccess.php
===================================================================
--- 
plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/templates/signinSuccess.php   
    2010-05-05 20:04:02 UTC (rev 29364)
+++ 
plugins/bhLDAPAuthPlugin/trunk/modules/bhLDAPAuth/templates/signinSuccess.php   
    2010-05-05 20:17:05 UTC (rev 29365)
@@ -1,4 +1,4 @@
-<?php use_helper('Validation', 'I18N', 'Form') ?>
+<?php use_helper('I18N') ?>
 <?php $LDAP_config = bhLDAP::getConfig(); ?>
 <div id="sf_admin_container">
 
@@ -15,7 +15,7 @@
       <td>
 <?php echo $form['username']->renderError()  ?>
 <?php echo $form['username']->render() ?>
-<?php echo $LDAP_config['adLDAP']['account_suffix'] ;  ?></td>
+             <?php echo $LDAP_config['adLDAP']['account_suffix'] ;  ?></td>
              </tr>
     <?php echo $form['password']->renderRow() ?>
     <?php echo $form['remember']->renderRow() ?>
@@ -27,7 +27,7 @@
 
       <ul class="sf_admin_actions">
        <li class="float-right">
-         <?php echo submit_tag('Log In', 'class="sf_admin_action_save"'); ?>
+         <input type="submit" value="<?php echo __('Log In') ?>" 
class="sf_admin_action_save" />
        </li>
       </ul>
 

Modified: plugins/bhLDAPAuthPlugin/trunk/package.xml
===================================================================
--- plugins/bhLDAPAuthPlugin/trunk/package.xml  2010-05-05 20:04:02 UTC (rev 
29364)
+++ plugins/bhLDAPAuthPlugin/trunk/package.xml  2010-05-05 20:17:05 UTC (rev 
29365)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package packagerversion="1.4.6" version="2.0" 
xmlns="http://pear.php.net/dtd/package-2.0"; 
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 
http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 
http://pear.php.net/dtd/package-2.0.xsd";>
  <name>bhLDAPAuthPlugin</name>
- <channel>plugins.symfony-project.org</channel>
+ <channel>pear.symfony-project.com</channel>
  <summary>LDAP authentication plugin for symfony</summary>
- <description>`bhLDAPAuthPlugin` allows you to use users and groups from an 
LDAP directory (Only Microsoft Active Directory (R) for now) for your symfony 
app's authentication and authorization.
+ <description>`bhLDAPAuthPlugin` allows you to use users and groups from an 
LDAP directory (such as Microsoft Active Directory (R)) for your symfony app's 
authentication and authorization.
 </description>
  <lead>
   <name>Nathan Vonnahme</name>
@@ -11,11 +11,11 @@
   <email>nathan dawt vonnahme at banner health dawt commercial</email>
   <active>yes</active>
  </lead>
- <date>2009-06-10</date>
- <time>11:52:35</time>
+ <date>2010-05-05</date>
+ <time>16:59:35</time>
  <version>
-  <release>2.0.3</release>
-  <api>1.1.0</api>
+  <release>5.0.0</release>
+  <api>1.4.0Doctrine</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,8 +23,7 @@
  </stability>
  <license uri="http://www.symfony-project.com/license";>MIT license</license>
   <notes>
-- hopefully fixed packaging
-- bhLDAPAuth for symfony 1.1
+- bhLDAPAuth 5.0 release for symfony 1.4 with Doctrine
   </notes>
  <contents>
   <dir name="/">
@@ -70,7 +69,7 @@
  <dependencies>
   <required>
    <php>
-    <min>5.1.0</min>
+    <min>5.0.0</min>
    </php>
    <pearinstaller>
     <min>1.4.1</min>
@@ -78,23 +77,21 @@
    <package>
     <name>symfony</name>
     <channel>pear.symfony-project.com</channel>
-    <min>1.1.0</min>
-    <max>1.2.0</max>
-    <exclude>1.2.0</exclude>
+    <min>1.3.0</min>
+    <max>1.4.9</max>
+<!--     <exclude>1.3.0</exclude> -->
    </package>
    <package>
-    <name>sfGuardPlugin</name>
-    <channel>plugins.symfony-project.org</channel>
-    <min>2.0.0</min>
-    <max>3.0.0</max>
+    <name>sfDoctrineGuardPlugin</name>
+    <channel>pear.symfony-project.com</channel>
+<!--     <min>3.0.0</min> -->
    </package>
   </required>
   <optional>
    <package>
     <name>sfSslRequirementPlugin</name>
-    <channel>plugins.symfony-project.org</channel>
-    <min>2.0.0</min>
-    <max>3.0.0</max>
+    <channel>pear.symfony-project.com</channel>
+<!--     <min>2.0.0</min> -->
    </package>
   </optional>
  </dependencies>
@@ -103,38 +100,54 @@
  <changelog>
    <release>
      <version>
-       <release>2.0.3</release>
-       <api>1.1.0</api>
+       <release>5.0.0</release>
+       <api>1.4.0Doctrine</api>
      </version>
      <stability>
       <release>stable</release>
       <api>stable</api>
      </stability>
      <license uri="http://www.symfony-project.org/license";>MIT 
license</license>
-     <date>2009-06-10</date>
+     <date>2010-05-05</date>
      <license>MIT</license>
      <notes>
-       * Nathan: changed packaging of DEPENDENCIES to also use 
plugins.symfony-project.org channel
+       * Nathan: Release for symfony 1.4 with Doctrine
      </notes>
    </release>
    <release>
      <version>
-       <release>2.0.2</release>
-       <api>1.1.0</api>
+       <release>4.0.0</release>
+       <api>1.2.0Doctrine</api>
      </version>
      <stability>
       <release>stable</release>
       <api>stable</api>
      </stability>
      <license uri="http://www.symfony-project.org/license";>MIT 
license</license>
-     <date>2009-06-10</date>
+     <date>2009-06-09</date>
      <license>MIT</license>
      <notes>
-       * Nathan: changed packaging to use plugins.symfony-project.org channel, 
hopefully works?
+       * Nathan: Release for symfony 1.2 with Doctrine
      </notes>
    </release>
    <release>
      <version>
+       <release>3.0.0</release>
+       <api>1.2.0</api>
+     </version>
+     <stability>
+      <release>stable</release>
+      <api>stable</api>
+     </stability>
+     <license uri="http://www.symfony-project.org/license";>MIT 
license</license>
+     <date>2009-06-09</date>
+     <license>MIT</license>
+     <notes>
+       * Nathan: Release for symfony 1.2 with Propel
+     </notes>
+   </release>
+   <release>
+     <version>
        <release>2.0.1</release>
        <api>1.1.0</api>
      </version>

-- 
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.

Reply via email to