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

5 files changed, 340 insertions, 18 deletions

diff --git a/protected/controllers/MyAngebotController.php b/protected/controllers/MyAngebotController.php
index c53da98..b85846e 100644
--- a/protected/controllers/MyAngebotController.php
+++ b/protected/controllers/MyAngebotController.php
@@ -2,12 +2,16 @@
 
 class MyAngebotController extends Controller
 {
+	/**
+	 * @var string the default layout for the views. Defaults to '//layouts/column2', meaning
+	 * using two-column layout. See 'protected/views/layouts/column2.php'.
+	 */
+	public $layout = '//layouts/column2';
 
 	/**
 	 * @return array action filters
 	 */
-	public function filters()
-	{
+	public function filters() {
 		return array(
 			'accessControl', // perform access control for CRUD operations
 		);
@@ -18,11 +22,10 @@ class MyAngebotController extends Controller
 	 * This method is used by the 'accessControl' filter.
 	 * @return array access control rules
 	 */
-	public function accessRules()
-	{
+	public function accessRules() {
 		return array(
 			array('allow', // // allow authenticated user
-				'actions'=>array('create','index','delete','update','view'),
+				'actions'=>array('create', 'createAngebot', 'index', 'delete', 'update', 'view'),
 				'users'=>array('@'),
 			),
 			array('deny',  // deny all users
@@ -30,8 +33,38 @@ class MyAngebotController extends Controller
 			),
 		);
 	}
-	public function actionIndex()
-	{
+
+    /**
+     * Creates a new model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     */
+    public function actionCreate() {
+        $model = new AngebotVerein();
+        $model->published = true;
+
+        // Uncomment the following line if AJAX validation is needed
+        // $this->performAjaxValidation($model);
+
+        if (isset($_POST['AngebotVerein'])) {
+            $model->attributes = $_POST['AngebotVerein'];
+            $model->verein_id = Yii::app()->user->vereinId;
+            if($model->save()) {
+                $this->redirect(array('index'));
+            } else {
+                if (0 < $model->angebot_id) {
+                    $model->angebot = Angebot::model()->findByPk($model->angebot_id);
+                }
+            }
+        }
+        
+        $this->render('create',array(
+            'model'=>$model,
+        	'angebote'=>$this->loadAllAngeboteForAutoComplete(),
+        	'einheiten'=>(null != $model->angebot) ? $model->angebot->kategorie->einheiten : ''
+        ));
+    }
+    
+	public function actionIndex() {
 		$model = new AngebotVerein('search');
 		$model->unsetAttributes();  // clear any default values
 		if (isset($_GET['AngebotVerein'])) {
@@ -44,6 +77,87 @@ class MyAngebotController extends Controller
 		));
 	}
 	
+	public function actionUpdate($id) {
+		$model = $this->loadModel($id);
+
+        // Uncomment the following line if AJAX validation is needed
+        // $this->performAjaxValidation($model);
+
+        if (isset($_POST['AngebotVerein'])){
+            $model->attributes = $_POST['AngebotVerein'];
+            if ($model->verein_id != Yii::app()->user->vereinId) {
+                $model->verein_id = Yii::app()->user->vereinId;
+            }
+            if ($model->save()) {
+                $this->redirect(array('index'));
+            }
+        }
+		
+        $this->render('update',array(
+            'model'=>$model,
+        	'angebote'=>$this->loadAllAngeboteForAutoComplete(),
+        	'einheiten'=>$model->angebot->kategorie->einheiten
+        ));
+	}
+	
+	public function actionCreateAngebot() {
+	    $model = new Angebot();
+	    $model->published = true;

+	    

+	    if (Yii::app()->request->isAjaxRequest) {
+	        if (isset($_POST['angebot_name'])) {
+	            $model->name = $_POST['angebot_name'];
+	        } else if (isset($_POST['Angebot'])) {

+	            $model->attributes = $_POST['Angebot'];
+	            if ($model->save()) {
+	                echo CJSON::encode(array(

+	                            'status'=>'success',

+	                            'div'=>"Angebot erfolgreich erstellt",
+	                            'label'=>$model->name,
+                                'value'=>$model->id,
+                                'einheiten'=>$model->kategorie->einheiten

+    	            ));
+    	            exit;
+	            }
+	        } else {
+                throw new CHttpException(400);
+	        }
+	        
+	        $kategorien = Kategorie::model()->findAll(array("condition"=>"published=1"));

+	        echo CJSON::encode(array(

+	                        'status'=>'failure',

+	                        'div'=>$this->renderPartial('_angebot_form', array('model'=>$model, 'kategorien'=>$kategorien), true)));

+	    } else {
+	        throw new CHttpException(400);
+	    }
+	}
+
+    /**
+     * Returns the data model based on the primary key given in the GET variable.
+     * If the data model is not found, an HTTP exception will be raised.
+     * @param integer the ID of the model to be loaded
+     */
+    protected function loadModel($id) {
+        $model = AngebotVerein::model()->findByPk($id);
+        if ($model === null) {
+            throw new CHttpException(404, 'The requested page does not exist.');
+        }
+        return $model;
+    }
+    
+    private function loadAllAngeboteForAutoComplete() {
+        $angebot = Angebot::model()->findAll();

+        $angebote = array();

+        foreach ($angebot as $a) {

+            $an = array();

+            $an["label"] = $a->name;

+            $an["value"] = $a->id;

+            $an["einheiten"] = $a->kategorie->einheiten;

+            array_push($angebote, $an);

+        }
+        return $angebote;
+    }
+
 	// Uncomment the following methods and override them if needed
 	/*
 	public function filters()
diff --git a/protected/controllers/MyVeranstaltungController.php b/protected/controllers/MyVeranstaltungController.php
new file mode 100644
index 0000000..568a93d
--- /dev/null
+++ b/protected/controllers/MyVeranstaltungController.php
@@ -0,0 +1,179 @@
+<?php
+
+class MyVeranstaltungController extends Controller
+{
+	/**
+	 * @var string the default layout for the views. Defaults to '//layouts/column2', meaning
+	 * using two-column layout. See 'protected/views/layouts/column2.php'.
+	 */
+	public $layout='//layouts/column2';
+
+	/**
+	 * @return array action filters
+	 */
+	public function filters()
+	{
+		return array(
+			'accessControl', // perform access control for CRUD operations
+		);
+	}
+
+	/**
+	 * Specifies the access control rules.
+	 * This method is used by the 'accessControl' filter.
+	 * @return array access control rules
+	 */
+	public function accessRules()
+	{
+		return array(
+			array('allow',  // allow all users to perform 'index' and 'view' actions
+				'actions'=>array('index','view'),
+				'users'=>array('*'),
+			),
+			array('allow', // allow authenticated user to perform 'create' and 'update' actions
+				'actions'=>array('create','update','delete'),
+				'users'=>array('@'),
+			),
+			array('deny',  // deny all users
+				'users'=>array('*'),
+			),
+		);
+	}
+
+	/**
+	 * Displays a particular model.
+	 * @param integer $id the ID of the model to be displayed
+	 */
+	public function actionView($id)
+	{
+		$this->render('view',array(
+			'model'=>$this->loadModel($id),
+		));
+	}
+
+	/**
+	 * Creates a new model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 */
+	public function actionCreate()
+	{
+		$model=new Veranstaltung;
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['Veranstaltung']))
+		{
+			$model->attributes=$_POST['Veranstaltung'];
+			$model->verein_id = Yii::app()->user->vereinId;
+			if($model->save())
+				$this->redirect(array('view','id'=>$model->id));
+		}
+
+		$standorte = Standort::model()->findAll(array("condition"=>"published = 1 AND (type = 'Bühne' OR (type = 'Stand' AND id = (SELECT standort_id FROM vereine WHERE id = ".Yii::app()->user->vereinId.")))"));
+		$this->render('create',array(
+			'model'=>$model,
+			'standorte'=>$standorte,
+		));
+	}
+
+	/**
+	 * Updates a particular model.
+	 * If update is successful, the browser will be redirected to the 'view' page.
+	 * @param integer $id the ID of the model to be updated
+	 */
+	public function actionUpdate($id)
+	{
+		$model=$this->loadModel($id);
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['Veranstaltung']))
+		{
+			$model->attributes=$_POST['Veranstaltung'];
+			if($model->save())
+				$this->redirect(array('view','id'=>$model->id));
+		}
+
+		$standorte = Standort::model()->findAll(array("condition"=>"published = 1 AND (type = 'Bühne' OR (type = 'Stand' AND id = (SELECT standort_id FROM vereine WHERE id = ".Yii::app()->user->vereinId.")))"));
+		$this->render('update',array(
+			'model'=>$model,
+			'standorte'=>$standorte,
+		));
+	}
+
+	/**
+	 * Deletes a particular model.
+	 * If deletion is successful, the browser will be redirected to the 'admin' page.
+	 * @param integer $id the ID of the model to be deleted
+	 */
+	public function actionDelete($id)
+	{
+		if(Yii::app()->request->isPostRequest)
+		{
+			// we only allow deletion via POST request
+			$this->loadModel($id)->delete();
+
+			// if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser
+			if(!isset($_GET['ajax']))
+				$this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('index'));
+		}
+		else
+			throw new CHttpException(400,'Invalid request. Please do not repeat this request again.');
+	}
+
+	/**
+	 * Lists all models.
+	 */
+	/*public function actionIndex()
+	{
+		$dataProvider=new CActiveDataProvider('Veranstaltung');
+		$this->render('index',array(
+			'dataProvider'=>$dataProvider,
+		));
+	}*/
+
+	/**
+	 * Manages all models.
+	 */
+	public function actionIndex()
+	{
+		$model=new Veranstaltung('search');
+		$model->unsetAttributes();  // clear any default values
+		if(isset($_GET['Veranstaltung']))
+			$model->attributes=$_GET['Veranstaltung'];
+		$model->verein_id = Yii::app()->user->vereinId;
+
+		$this->render('index',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Returns the data model based on the primary key given in the GET variable.
+	 * If the data model is not found, an HTTP exception will be raised.
+	 * @param integer the ID of the model to be loaded
+	 */
+	public function loadModel($id)
+	{
+		$attributes = array("verein_id"=>Yii::app()->user->vereinId, "id"=>$id);
+		$model=Veranstaltung::model()->findByAttributes($attributes);
+		if($model===null)
+			throw new CHttpException(404,'The requested page does not exist.');
+		return $model;
+	}
+
+	/**
+	 * Performs the AJAX validation.
+	 * @param CModel the model to be validated
+	 */
+	protected function performAjaxValidation($model)
+	{
+		if(isset($_POST['ajax']) && $_POST['ajax']==='veranstaltung-form')
+		{
+			echo CActiveForm::validate($model);
+			Yii::app()->end();
+		}
+	}
+}
diff --git a/protected/controllers/MyvereinController.php b/protected/controllers/MyVereinController.php
index fd7428d..e0e5b47 100644
--- a/protected/controllers/MyvereinController.php
+++ b/protected/controllers/MyVereinController.php
@@ -68,14 +68,11 @@ class MyvereinController extends Controller
 		{
 			$model->attributes = $_POST['Verein'];
 			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
 			if($model->save()) {
-				if (null !== $model->uploadedImage)  {
-					$suffix = substr($model->uploadedImage->getName(), strrpos($model->uploadedImage->getName(), "."));
-					$filename = "images/uploaded/".time()."-".$model->slug.$suffix;
-					$model->bild = $filename;
-					$model->uploadedImage->saveAs($filename);
-					$model->save();
-				}
+				Yii::trace("Verein gespeichert", "admin.astaf.verein");
+				Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
+				$this->saveImage($model);
 				
 				$this->redirect(array('view','id'=>$model->id));
 			}
@@ -86,6 +83,17 @@ class MyvereinController extends Controller
 		));
 	}
 
+	private function saveImage($model) {
+	    if (null !== $model->uploadedImage)  {
+	        $filename = VereinImageFunctions::resizeAndSave($model->uploadedImage, $model->slug);
+	        if (null === $filename) {
+	            throw new CHttpException(500, 'Error while saving image.');
+	        }
+	        $model->bild = $filename;
+	        $model->save();
+	    }
+	}
+
 	/**
 	 * Lists all models.
 	 */
diff --git a/protected/controllers/SiteController.php b/protected/controllers/SiteController.php
index 2ee57b9..cfb6c3c 100644
--- a/protected/controllers/SiteController.php
+++ b/protected/controllers/SiteController.php
@@ -30,7 +30,7 @@ class SiteController extends Controller
 		if (!Yii::app()->user->isGuest && Yii::app()->user->isAdmin) {
 			$this->redirect(array("/verein/index"));
 		}
-		$this->redirect(array("/myverein/"));
+		$this->redirect(array("/myVerein/"));
 	}
 
 	/**
diff --git a/protected/controllers/VereinController.php b/protected/controllers/VereinController.php
index aa18245..445488b 100644
--- a/protected/controllers/VereinController.php
+++ b/protected/controllers/VereinController.php
@@ -61,14 +61,21 @@ class VereinController extends Controller
 		if(isset($_POST['Verein']))
 		{
 			$model->attributes=$_POST['Verein'];
-			if($model->save())
+			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			if($model->save()) {
+				Yii::trace("Verein gespeichert", "admin.astaf.verein");
+				Yii::trace("Bild: ".$model->uploadedImage, "admin.astaf.verein");
+			    $this->saveImage($model);
 				$this->redirect(array('view','id'=>$model->id));
 			}
+		}
 		
 		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
+		$slugs = User::model()->findAll();
 		$this->render('create',array(
 			'model'=>$model,
-			'standorte'=>$standorte
+			'standorte'=>$standorte,
+			'slugs'=>$slugs
 		));
 	}
 
@@ -87,9 +94,12 @@ class VereinController extends Controller
 		if(isset($_POST['Verein']))
 		{
 			$model->attributes=$_POST['Verein'];
-			if($model->save())
+			$model->uploadedImage = CUploadedFile::getInstance($model, 'uploadedImage');
+			if($model->save()) {
+			    $this->saveImage($model);
 				$this->redirect(array('view','id'=>$model->id));
 			}
+		}
 
 		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
 		$slugs = User::model()->findAll();
@@ -100,6 +110,17 @@ class VereinController extends Controller
 		));
 	}
 
+	private function saveImage($model) {

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

+	        $filename = VereinImageFunctions::resizeAndSave($model->uploadedImage, $model->slug);

+	        if (null === $filename) {

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

+	        }

+	        $model->bild = $filename;

+	        $model->save();

+	    }
+	}
+	
 	/**
 	 * Deletes a particular model.
 	 * If deletion is successful, the browser will be redirected to the 'admin' page.