diff options
Diffstat (limited to 'protected/models')
| -rw-r--r-- | protected/models/User.php | 7 | ||||
| -rw-r--r-- | protected/models/Verein.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/protected/models/User.php b/protected/models/User.php index e601042..76cffe7 100644 --- a/protected/models/User.php +++ b/protected/models/User.php @@ -90,12 +90,13 @@ class User extends CActiveRecord $this->created_at = new CDbExpression("NOW()"); $this->salt = $this->generateRandomKey(); $this->admin_pw_reset = true; - } + if (!$this->checkPassword($this->password)) { $this->password = $this->encryptPassword($this->password); - } + } + } return parent::beforeSave(); } @@ -148,7 +149,7 @@ class User extends CActiveRecord return $pw; } - protected function encryptPassword($password) { + public function encryptPassword($password) { return sha1($this->salt.$password); } diff --git a/protected/models/Verein.php b/protected/models/Verein.php index 83fc21f..8556f48 100644 --- a/protected/models/Verein.php +++ b/protected/models/Verein.php @@ -106,7 +106,7 @@ class Verein extends CActiveRecord $criteria->compare('url',$this->url,true); $criteria->compare('bild',$this->bild,true); $criteria->compare('email',$this->email,true); - $criteria->compare('slug',$this->slug,true); + $criteria->compare('slug',$this->slug); $criteria->compare('kontaktdaten',$this->kontaktdaten,true); $criteria->compare('beschreibung',$this->beschreibung,true); $criteria->compare('standort_id',$this->standort_id); |