Changeset 16

Timestamp:

12/06/05 09:28:05 (3 years ago)

Author:

fabien

Message:

day 6 modifications

Files:

• trunk/config/schema.xml (modified) (1 diff)
• trunk/data/fixtures/test_data.yml (modified) (2 diffs)
• trunk/data/sql/schema.sql (modified) (1 diff)
• trunk/frontend/lib/myLoginValidator.class.php (added)
• trunk/frontend/lib/myUser.class.php (modified) (1 diff)
• trunk/frontend/modules/question/config (added)
• trunk/frontend/modules/question/config/security.yml (added)
• trunk/frontend/modules/user/actions/actions.class.php (modified) (2 diffs)
• trunk/frontend/modules/user/templates/loginSuccess.php (modified) (2 diffs)
• trunk/frontend/modules/user/validate/login.yml (added)
• trunk/lib/model/User.php (modified) (1 diff)
• trunk/lib/model/map/UserMapBuilder.php (modified) (1 diff)
• trunk/lib/model/om/BaseAnswer.php (modified) (1 diff)
• trunk/lib/model/om/BaseAnswerPeer.php (modified) (1 diff)
• trunk/lib/model/om/BaseInterest.php (modified) (1 diff)
• trunk/lib/model/om/BaseInterestPeer.php (modified) (1 diff)
• trunk/lib/model/om/BaseQuestion.php (modified) (1 diff)
• trunk/lib/model/om/BaseQuestionPeer.php (modified) (1 diff)
• trunk/lib/model/om/BaseRelevancy.php (modified) (1 diff)
• trunk/lib/model/om/BaseRelevancyPeer.php (modified) (1 diff)
• trunk/lib/model/om/BaseUser.php (modified) (12 diffs)
• trunk/lib/model/om/BaseUserPeer.php (modified) (6 diffs)
• trunk/web/css/main.css (modified) (1 diff)

trunk/config/schema.xml

@@ -36 +36 @@
-     <column name="first_name" type="varchar" size="100" />
-     <column name="last_name" type="varchar" size="100" />
+     <column name="email" type="varchar" size="100" />
+     <column name="sha1_password" type="varchar" size="40" />
+     <column name="salt" type="varchar" size="32" />
-     <column name="created_at" type="timestamp" />
-   </table>

trunk/data/fixtures/test_data.yml

@@ -9 +9 @@
-    first_name: Fabien
-    last_name:  Potencier
+    password:   symfony
+    email:      fp@example.com
-
-  francois:
@@ -14 +16 @@
-    first_name: François
-    last_name:  Zaninotto
+    password:   adventcal
+    email:      fz@example.com
-
-Question:

trunk/data/sql/schema.sql

@@ -59 +59 @@
-    `first_name` VARCHAR(100) , 
-    `last_name` VARCHAR(100) , 
+    `email` VARCHAR(100) , 
+    `sha1_password` VARCHAR(40) , 
+    `salt` VARCHAR(32) , 
-    `created_at` DATETIME ,  
-    PRIMARY KEY(`id`))

trunk/frontend/lib/myUser.class.php

@@ -3 +3 @@
-class myUser extends sfBasicSecurityUser
-{
+  public function signIn($user)
+  {
+    $this->setAttribute('subscriber_id', $user->getId(), 'subscriber');
+    $this->setAuthenticated(true);
+
+    $this->addCredential('subscriber');
+    $this->setAttribute('nickname', $user->getNickname(), 'subscriber');
+  }
+
+  public function signOut()
+  {
+    $this->getAttributeHolder()->removeNamespace('subscriber');
+
+    $this->setAuthenticated(false);
+    $this->clearCredentials();
+  }
+
+  public function getSubscriberId()
+  {
+    return $this->getAttribute('subscriber_id', '', 'subscriber');
+  }
+
+  public function getSubscriber()
+  {
+    return UserPeer::retrieveByPk($this->getSubscriberId());
+  }
+
+  public function getNickname()
+  {
+    return $this->getAttribute('nickname', '', 'subscriber');
+  }
-}
-

trunk/frontend/modules/user/actions/actions.class.php

@@ -20 +20 @@
-    {
-      // display the form
-
+
+
-    }
-    else
-    {
-      // handle the form submission
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-  }
@@ -52 +33 @@
-  public function executeLogout()
-  {
-
-
+
-
-
+
+
-
-
+
+
+
-  }
-}

trunk/frontend/modules/user/templates/loginSuccess.php

@@ +1 @@
+<?php use_helper('Validation') ?>
-<?php echo form_tag('user/login') ?>
- 
@@ -4 +5 @@
-
-  <div class="form-row">
+    <?php echo form_error('nickname') ?>
-    <label for="nickname">nickname:</label>
-    <?php echo input_tag('nickname', $params->get('nickname')) ?>
-  </div>
-
+
-  <div class="form-row">
+    <?php echo form_error('password') ?>
-    <label for="password">password:</label>
-    <?php echo input_password_tag('password') ?>

trunk/lib/model/User.php

@@ -21 +21 @@
-    return $this->getFirstName().' '.$this->getLastName();
-  }
+
+  public function setPassword($password)
+  {
+    $salt = md5(rand(100000, 999999).$this->getNickname().$this->getEmail());
+    $this->setSalt($salt);
+    $this->setSha1Password(sha1($salt.$password));
+  }
-}
-

trunk/lib/model/map/UserMapBuilder.php

@@ -73 +73 @@
-        $tMap->addColumn('LAST_NAME', 'LastName', 'string', CreoleTypes::VARCHAR, false);
-
+        $tMap->addColumn('EMAIL', 'Email', 'string', CreoleTypes::VARCHAR, false);
+
+        $tMap->addColumn('SHA1_PASSWORD', 'Sha1Password', 'string', CreoleTypes::VARCHAR, false);
+
+        $tMap->addColumn('SALT', 'Salt', 'string', CreoleTypes::VARCHAR, false);
+
-        $tMap->addColumn('CREATED_AT', 'CreatedAt', 'int', CreoleTypes::TIMESTAMP, false);
-                

trunk/lib/model/om/BaseAnswer.php

@@ -4 +4 @@
-
-require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'model/AnswerPeer.php';
-
-/**

trunk/lib/model/om/BaseAnswerPeer.php

@@ -2 +2 @@
-
-require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by AnswerPeer::getOMClass()
+include_once 'model/Answer.php';
-
-/**

trunk/lib/model/om/BaseInterest.php

@@ -4 +4 @@
-
-require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'model/InterestPeer.php';
-
-/**

trunk/lib/model/om/BaseInterestPeer.php

@@ -2 +2 @@
-
-require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by InterestPeer::getOMClass()
+include_once 'model/Interest.php';
-
-/**

trunk/lib/model/om/BaseQuestion.php

@@ -4 +4 @@
-
-require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'model/QuestionPeer.php';
-
-/**

trunk/lib/model/om/BaseQuestionPeer.php

@@ -2 +2 @@
-
-require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by QuestionPeer::getOMClass()
+include_once 'model/Question.php';
-
-/**

trunk/lib/model/om/BaseRelevancy.php

@@ -4 +4 @@
-
-require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'model/RelevancyPeer.php';
-
-/**

trunk/lib/model/om/BaseRelevancyPeer.php

@@ -2 +2 @@
-
-require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by RelevancyPeer::getOMClass()
+include_once 'model/Relevancy.php';
-
-/**

trunk/lib/model/om/BaseUser.php

@@ -4 +4 @@
-
-require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'model/UserPeer.php';
-
-/**
@@ -53 +58 @@
-
-    /**
+     * The value for the email field.
+     * @var string
+     */
+    protected $email;
+
+
+    /**
+     * The value for the sha1_password field.
+     * @var string
+     */
+    protected $sha1_password;
+
+
+    /**
+     * The value for the salt field.
+     * @var string
+     */
+    protected $salt;
+
+
+    /**
-     * The value for the created_at field.
-     * @var int
@@ -162 +188 @@
-
-        return $this->last_name;
+    }
+
+    /**
+     * Get the [email] column value.
+     * 
+     * @return string
+     */
+    public function getEmail()
+    {
+
+        return $this->email;
+    }
+
+    /**
+     * Get the [sha1_password] column value.
+     * 
+     * @return string
+     */
+    public function getSha1Password()
+    {
+
+        return $this->sha1_password;
+    }
+
+    /**
+     * Get the [salt] column value.
+     * 
+     * @return string
+     */
+    public function getSalt()
+    {
+
+        return $this->salt;
-    }
-
@@ -260 +319 @@
-
-    /**
+     * Set the value of [email] column.
+     * 
+     * @param string $v new value
+     * @return void
+     */
+    public function setEmail($v)
+    {
+
+        if ($this->email !== $v) {
+            $this->email = $v;
+            $this->modifiedColumns[] = UserPeer::EMAIL;
+        }
+
+    } // setEmail()
+
+    /**
+     * Set the value of [sha1_password] column.
+     * 
+     * @param string $v new value
+     * @return void
+     */
+    public function setSha1Password($v)
+    {
+
+        if ($this->sha1_password !== $v) {
+            $this->sha1_password = $v;
+            $this->modifiedColumns[] = UserPeer::SHA1_PASSWORD;
+        }
+
+    } // setSha1Password()
+
+    /**
+     * Set the value of [salt] column.
+     * 
+     * @param string $v new value
+     * @return void
+     */
+    public function setSalt($v)
+    {
+
+        if ($this->salt !== $v) {
+            $this->salt = $v;
+            $this->modifiedColumns[] = UserPeer::SALT;
+        }
+
+    } // setSalt()
+
+    /**
-     * Set the value of [created_at] column.
-     * 
@@ -308 +415 @@
-            $this->last_name = $rs->getString($startcol + 3);
-
-
+
+
+
+
+
+
+
-
-            $this->resetModified();
@@ -315 +428 @@
-
-            // FIXME - using NUM_COLUMNS may be clearer.
-5; // 5
+8; // 8
-
-        } catch (Exception $e) {
@@ -581 +694 @@
-                break;
-            case 4:
+                return $this->getEmail();
+                break;
+            case 5:
+                return $this->getSha1Password();
+                break;
+            case 6:
+                return $this->getSalt();
+                break;
+            case 7:
-                return $this->getCreatedAt();
-                break;
@@ -607 +729 @@
-            $keys[2] => $this->getFirstName(),
-            $keys[3] => $this->getLastName(),
-
+
+
+
+
-        );
-        return $result;
@@ -653 +778 @@
-                break;
-            case 4:
+                $this->setEmail($value);
+                break;
+            case 5:
+                $this->setSha1Password($value);
+                break;
+            case 6:
+                $this->setSalt($value);
+                break;
+            case 7:
-                $this->setCreatedAt($value);
-                break;
@@ -682 +816 @@
-        if (array_key_exists($keys[2], $arr)) $this->setFirstName($arr[$keys[2]]);
-        if (array_key_exists($keys[3], $arr)) $this->setLastName($arr[$keys[3]]);
-
+
+
+
+
-    }
-
@@ -698 +835 @@
-        if ($this->isColumnModified(UserPeer::FIRST_NAME)) $criteria->add(UserPeer::FIRST_NAME, $this->first_name);
-        if ($this->isColumnModified(UserPeer::LAST_NAME)) $criteria->add(UserPeer::LAST_NAME, $this->last_name);
+        if ($this->isColumnModified(UserPeer::EMAIL)) $criteria->add(UserPeer::EMAIL, $this->email);
+        if ($this->isColumnModified(UserPeer::SHA1_PASSWORD)) $criteria->add(UserPeer::SHA1_PASSWORD, $this->sha1_password);
+        if ($this->isColumnModified(UserPeer::SALT)) $criteria->add(UserPeer::SALT, $this->salt);
-        if ($this->isColumnModified(UserPeer::CREATED_AT)) $criteria->add(UserPeer::CREATED_AT, $this->created_at);
-
@@ -758 +898 @@
-
-        $copyObj->setLastName($this->last_name);
+
+        $copyObj->setEmail($this->email);
+
+        $copyObj->setSha1Password($this->sha1_password);
+
+        $copyObj->setSalt($this->salt);
-
-        $copyObj->setCreatedAt($this->created_at);

trunk/lib/model/om/BaseUserPeer.php

@@ -2 +2 @@
-
-require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by UserPeer::getOMClass()
+include_once 'model/User.php';
-
-/**
@@ -22 +25 @@
-
-    /** The total number of columns. */
-5
+8
-
-    /** The number of lazy-loaded columns. */
@@ -40 +43 @@
-    const LAST_NAME = 'ask_user.LAST_NAME';
-
+    /** the column name for the EMAIL field */
+    const EMAIL = 'ask_user.EMAIL';
+
+    /** the column name for the SHA1_PASSWORD field */
+    const SHA1_PASSWORD = 'ask_user.SHA1_PASSWORD';
+
+    /** the column name for the SALT field */
+    const SALT = 'ask_user.SALT';
+
-    /** the column name for the CREATED_AT field */
-    const CREATED_AT = 'ask_user.CREATED_AT';
@@ -54 +66 @@
-     */
-    private static $fieldNames = array (
-
-
-
-
+Email', 'Sha1Password', 'Salt', '
+EMAIL, UserPeer::SHA1_PASSWORD, UserPeer::SALT, UserPeer::
+email', 'sha1_password', 'salt', '
+5, 6, 7, 
-    );
-
@@ -67 +79 @@
-     */
-    private static $fieldKeys = array (
-CreatedAt' => 4
-CREATED_AT => 4
-created_at' => 4
-
+Email' => 4, 'Sha1Password' => 5, 'Salt' => 6, 'CreatedAt' => 7
+EMAIL => 4, UserPeer::SHA1_PASSWORD => 5, UserPeer::SALT => 6, UserPeer::CREATED_AT => 7
+email' => 4, 'sha1_password' => 5, 'salt' => 6, 'created_at' => 7
+5, 6, 7, 
-    );
-
@@ -178 +190 @@
-
-        $criteria->addSelectColumn(UserPeer::LAST_NAME);
+
+        $criteria->addSelectColumn(UserPeer::EMAIL);
+
+        $criteria->addSelectColumn(UserPeer::SHA1_PASSWORD);
+
+        $criteria->addSelectColumn(UserPeer::SALT);
-
-        $criteria->addSelectColumn(UserPeer::CREATED_AT);

trunk/web/css/main.css

@@ -142 +142 @@
-  background-color: #bbb;
-}
+
+.form_error
+{
+  color: #f00;
+}