diff options
Diffstat (limited to 'protected/controllers')
| -rw-r--r-- | protected/controllers/MyVereinController.php | 2 | ||||
| -rw-r--r-- | protected/controllers/UserController.php | 5 | ||||
| -rw-r--r-- | protected/controllers/VeranstaltungController.php | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/protected/controllers/MyVereinController.php b/protected/controllers/MyVereinController.php index e0e5b47..9812bff 100644 --- a/protected/controllers/MyVereinController.php +++ b/protected/controllers/MyVereinController.php @@ -1,6 +1,6 @@ <?php -class MyvereinController extends Controller +class MyVereinController extends Controller { /** * @var string the default layout for the views. Defaults to '//layouts/column2', meaning diff --git a/protected/controllers/UserController.php b/protected/controllers/UserController.php index 3c28e7b..f4fe415 100644 --- a/protected/controllers/UserController.php +++ b/protected/controllers/UserController.php @@ -77,7 +77,12 @@ class UserController extends Controller { // $this->performAjaxValidation($model); if (isset($_POST['User'])) { + $change = false; + if ($_POST['User']['password'] != "" && $_POST['User']['password'] != $model->password) { $change = true;} $model->attributes = $_POST['User']; + if($change) { + $model->password = $model->encryptPassword($_POST['User']['password']); + } if ($model->save()) { $this->redirect(array('view', 'id'=>$model->id)); } diff --git a/protected/controllers/VeranstaltungController.php b/protected/controllers/VeranstaltungController.php index 49ec10a..acac0be 100644 --- a/protected/controllers/VeranstaltungController.php +++ b/protected/controllers/VeranstaltungController.php @@ -66,7 +66,7 @@ class VeranstaltungController extends Controller $this->redirect(array('view','id'=>$model->id)); } - $standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Bühne'")); + $standorte = Standort::model()->findAll(array("condition"=>"published=1")); $vereine = Verein::model()->findAll(array("condition"=>"published=1")); $this->render('create',array( @@ -96,7 +96,7 @@ class VeranstaltungController extends Controller $this->redirect(array('view','id'=>$model->id)); } - $standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Bühne'")); + $standorte = Standort::model()->findAll(array("condition"=>"published=1 order by type, name")); $vereine = Verein::model()->findAll(array("condition"=>"published=1")); $this->render('update',array( |