Changeset 19

Timestamp:

03/26/08 22:19:47

Author:

nperriault

Message:

Renamed local PluginsfGuardUser* to sfGuardUser*

Files:

• trunk/lib/model/sfGuardUser.php (moved) (moved from trunk/lib/model/PluginsfGuardUser.php) (3 diffs)
• trunk/lib/model/sfGuardUserPeer.php (moved) (moved from trunk/lib/model/PluginsfGuardUserPeer.php) (1 diff)

trunk/lib/model/sfGuardUser.php

@@ -6 +6 @@
- * @subpackage plugin
- */
-PluginsfGuardUser extends Base
+sfGuardUser extends Plugin
-{
-protected
-  $profile        = null,
- $groups         = null,
- $permissions    = null,
- $allPermissions = null,
-  $justKarma     
+
+/**
+* Are we just updating current user karma
+* @var boolean
+*/
+protected $justKarma
-
-  /**
@@ -330 +330 @@
-  }
-
-  /**
-   * Set user passord
-   *
-   * @param string $password
-   */
-  public function setPassword($password)
-  {
-    if (!$password)
-    {
-      return;
-    }
-
-    $salt = md5(rand(100000, 999999).$this->getUsername());
-    $this->setSalt($salt);
-    $algorithm = sfConfig::get('app_sf_guard_plugin_algorithm_callable', 'sha1');
-    $algorithmAsStr = is_array($algorithm) ? $algorithm[0].'::'.$algorithm[1] : $algorithm;
-    if (!is_callable($algorithm))
-    {
-      throw new sfException(sprintf('The algorithm callable "%s" is not callable.', $algorithmAsStr));
-    }
-    $this->setAlgorithm($algorithmAsStr);
-
-    parent::setPassword(call_user_func_array($algorithm, array($salt.$password)));
-  }
-
-  public function setPasswordBis($password)
-  {
-  }
-
-  /**
-   * Checks if given password matches current user one
-   *
-   * @param string $password
-   * @return boolean
-   */
-  public function checkPassword($password)
-  {
-    if ($callable = sfConfig::get('app_sf_guard_plugin_check_password_callable'))
-    {
-      return call_user_func_array($callable, array($this->getUsername(), $password));
-    }
-    else
-    {
-      return $this->checkPasswordByGuard($password);
-    }
-  }
-
-  /**
-   * Checks password
-   *
-   * @param string $password
-   * @return boolean
-   */
-  public function checkPasswordByGuard($password)
-  {
-    $algorithm = $this->getAlgorithm();
-    if (false !== $pos = strpos($algorithm, '::'))
-    {
-      $algorithm = array(substr($algorithm, 0, $pos), substr($algorithm, $pos + 2));
-    }
-    if (!is_callable($algorithm))
-    {
-      throw new sfException(sprintf('The algorithm callable "%s" is not callable.', $algorithm));
-    }
-
-    return $this->getPassword() == call_user_func_array($algorithm, array($this->getSalt().$password));
-  }
-
-  public function getProfile()
-  {
-    if (!is_null($this->profile))
-    {
-      return $this->profile;
-    }
-
-    $profileClass = sfConfig::get('app_sf_guard_plugin_profile_class', 'sfGuardUserProfile');
-    if (!class_exists($profileClass))
-    {
-      throw new sfException(sprintf('The user profile class "%s" does not exist.', $profileClass));
-    }
-
-    $fieldName = sfConfig::get('app_sf_guard_plugin_profile_field_name', 'user_id');
-    $profilePeerClass =  $profileClass.'Peer';
-
-    // to avoid php segmentation fault
-    class_exists($profilePeerClass);
-
-    $foreignKeyColumn = call_user_func_array(array($profilePeerClass, 'translateFieldName'), array($fieldName, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_COLNAME));
-
-    if (!$foreignKeyColumn)
-    {
-      throw new sfException(sprintf('The user profile class "%s" does not contain a "%s" column.', $profileClass, $fieldName));
-    }
-
-    $c = new Criteria();
-    $c->add($foreignKeyColumn, $this->getId());
-
-    $this->profile = call_user_func_array(array($profileClass.'Peer', 'doSelectOne'), array($c));
-
-    if (!$this->profile)
-    {
-      $this->profile = new $profileClass();
-      if (method_exists($this->profile, 'setsfGuardUser'))
-      {
-        $this->profile->setsfGuardUser($this);
-      }
-      else
-      {
-        $method = 'set'.call_user_func_array(array($profilePeerClass, 'translateFieldName'), array($fieldName, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME));
-        $this->profile->$method($this->getId());
-      }
-    }
-
-    return $this->profile;
-  }
-
-  public function getPlace()
-  {
@@ -512 +396 @@
-  {
-    return implode($separator, $this->getSkills());
-  }
-
-  public function addGroupByName($name, $con = null)
-  {
-    $group = sfGuardGroupPeer::retrieveByName($name);
-    if (!$group)
-    {
-      throw new Exception(sprintf('The group "%s" does not exist.', $name));
-    }
-
-    $ug = new sfGuardUserGroup();
-    $ug->setsfGuardUser($this);
-    $ug->setGroupId($group->getId());
-
-    $ug->save($con);
-  }
-
-  public function addPermissionByName($name, $con = null)
-  {
-    $permission = sfGuardPermissionPeer::retrieveByName($name);
-    if (!$permission)
-    {
-      throw new Exception(sprintf('The permission "%s" does not exist.', $name));
-    }
-
-    $up = new sfGuardUserPermission();
-    $up->setsfGuardUser($this);
-    $up->setPermissionId($permission->getId());
-
-    $up->save($con);
-  }
-
-  public function hasGroup($name)
-  {
-    if (!$this->groups)
-    {
-      $this->getGroups();
-    }
-
-    return isset($this->groups[$name]);
-  }
-
-  public function getGroups()
-  {
-    if (!$this->groups)
-    {
-      $this->groups = array();
-
-      $c = new Criteria();
-      $c->add(sfGuardUserGroupPeer::USER_ID, $this->getId());
-      $ugs = sfGuardUserGroupPeer::doSelectJoinsfGuardGroup($c);
-
-      foreach ($ugs as $ug)
-      {
-        $group = $ug->getsfGuardGroup();
-        $this->groups[$group->getName()] = $group;
-      }
-    }
-
-    return $this->groups;
-  }
-
-  public function getGroupNames()
-  {
-    return array_keys($this->getGroups());
-  }
-
-  public function hasPermission($name)
-  {
-    if (!$this->permissions)
-    {
-      $this->getPermissions();
-    }
-
-    return isset($this->permissions[$name]);
-  }
-
-  public function getPermissions()
-  {
-    if (!$this->permissions)
-    {
-      $this->permissions = array();
-
-      $c = new Criteria();
-      $c->add(sfGuardUserPermissionPeer::USER_ID, $this->getId());
-      $ups = sfGuardUserPermissionPeer::doSelectJoinsfGuardPermission($c);
-
-      foreach ($ups as $up)
-      {
-        $permission = $up->getsfGuardPermission();
-        $this->permissions[$permission->getName()] = $permission;
-      }
-    }
-
-    return $this->permissions;
-  }
-
-  public function getPermissionNames()
-  {
-    return array_keys($this->getPermissions());
-  }
-
-  // merge of permission in a group + permissions
-  public function getAllPermissions()
-  {
-    if (!$this->allPermissions)
-    {
-      $this->allPermissions = $this->getPermissions();
-
-      foreach ($this->getGroups() as $group)
-      {
-        foreach ($group->getsfGuardGroupPermissions() as $gp)
-        {
-          $permission = $gp->getsfGuardPermission();
-
-          $this->allPermissions[$permission->getName()] = $permission;
-        }
-      }
-    }
-
-    return $this->allPermissions;
-  }
-
-  public function getAllPermissionNames()
-  {
-    return array_keys($this->getAllPermissions());
-  }
-
-  public function reloadGroupsAndPermissions()
-  {
-    $this->groups         = null;
-    $this->permissions    = null;
-    $this->allPermissions = null;
-  }
-

trunk/lib/model/sfGuardUserPeer.php

@@ -1 +1 @@
-<?php
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
-
+
+
- * @package    symfony
- * @subpackage plugin
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGuardUserPeer.php 3810 2007-04-17 19:37:51Z davedash $
- */
-Plugin
+
-{
-