Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.de

Conflicts:
	protected/runtime/application.log

1 files changed, 11 insertions, 0 deletions

diff --git a/protected/controllers/VereinController.php b/protected/controllers/VereinController.php
index aad8776..7d2da81 100644
--- a/protected/controllers/VereinController.php
+++ b/protected/controllers/VereinController.php
@@ -62,9 +62,11 @@ class VereinController extends Controller
 		{
 			$model->attributes=$_POST['Verein'];
 			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			$model->uploadedHintergrund = CUploadedFile::getInstance($model, 'uploadedHintergrund');
 			if($model->save()) {
 				Yii::trace("Verein gespeichert", "admin.astaf.verein");
 				Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
+				Yii::trace("Hintergrund: ".$model->uploadedHintergrund, "admin.astaf.verein");
 			    $this->saveImage($model);
 				$this->redirect(array('view','id'=>$model->id));
 			}
@@ -95,6 +97,7 @@ class VereinController extends Controller
 		{
 			$model->attributes=$_POST['Verein'];
 			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			$model->uploadedHintergrund = CUploadedFile::getInstance($model, 'uploadedHintergrund');
 			if($model->save()) {
 			    $this->saveImage($model);
 				$this->redirect(array('view','id'=>$model->id));
@@ -119,6 +122,14 @@ class VereinController extends Controller
 	        $model->bild = "/".$filename;

 	        $model->save();

 	    }
+	    if (null !== $model->uploadedHintergrund)  {

+	    	$filename = VereinImageFunctions::resizeAndSaveBG($model->uploadedHintergrund, $model->slug);

+	    	if (null === $filename) {

+	    		throw new CHttpException(500, 'Error while saving image.');

+	    	}

+	    	$model->hintergrund = "/".$filename;

+	    	$model->save();

+	    }
 	}
 	
 	/**