master: Adding the last changes made

Author: stygiansabyss

app/config/app.php

@@ -131,6 +131,7 @@
 		'Intervention\Image\ImageServiceProvider',
 		'anlutro\cURL\Laravel\cURLServiceProvider',
 		'McCool\LaravelAutoPresenter\LaravelAutoPresenterServiceProvider',
+		'Menu\MenuServiceProvider',
 		'Syntax\Core\CoreServiceProvider',
 		'Syntax\Core\View\ViewServiceProvider',
 		'Syntax\Core\Forum\ForumServiceProvider',
@@ -200,7 +201,8 @@
 		'Str'                         => 'Illuminate\Support\Str',
 		'URL'                         => 'Illuminate\Support\Facades\URL',
 		'Image'                       => 'Intervention\Image\Facades\Image',
-		'cURL'                        => 'anlutro\cURL\Laravel\cURL'
+		'cURL'                        => 'anlutro\cURL\Laravel\cURL',
+		'Menu'                        => 'Menu\Menu',
 	),
 
 );

app/config/packages/syntax/core/config.php

@@ -110,7 +110,8 @@
 	|
 	*/
 	'nonCoreAliases' => array(
-		'User'
+		'User',
+		'Menu'
 	),
 
 );

app/config/session.php

@@ -15,7 +15,7 @@
 	|            "memcached", "redis", "array"
 	|
 	*/
-	'driver' => 'database',
+	'driver' => 'native',
 
 	/*
 	|--------------------------------------------------------------------------

app/controllers/ActorController.php

@@ -2,4 +2,29 @@
 
 class ActorController extends BaseController {
 
+	public function getIndex()
+	{
+		$actors = Actor::orderByNameAsc()->get();
+
+		$ahActors = clone $actors;
+		$ahActors = $ahActors->filter(function ($actor) {
+			if ($actor->checkType('AH_ACTOR')) return true;
+		});
+
+		$actors = $actors->filter(function ($actor) {
+			if (!$actor->checkType('AH_ACTOR')) return true;
+		});
+
+		$this->setViewData('actors', $actors);
+		$this->setViewData('ahActors', $ahActors);
+	}
+
+	public function getView($actorId)
+	{
+		$actor  = Actor::find($actorId);
+		$actors = Actor::where('uniqueId', '!=', $actorId)->orderByNameAsc()->get();
+
+		$this->setViewData('actor', $actor);
+		$this->setViewData('actors', $actors);
+	}
 }

app/controllers/AdminController.php

@@ -49,6 +49,8 @@ public function getIndex()
 				->addTab('Teams',            'teams')
 				->addTab('Team Actors',      'teamactors')
 				->addTab('Actors',           'actors')
+				->addTab('Actor Types',      'actortypes')
+				->addTab('Characters',       'characters')
 				->buildPanel()
 			->addPanel()
 				->setId('ADMIN_TYPES')
@@ -322,6 +324,69 @@ public function getActordelete($actorId)
 		return Redirect::to('/admin#actors');
 	}
 
+	public function getCharacters()
+	{
+		$characters = Character::orderByNameAsc()->paginate(20);
+
+		// Set up the one page crud main details
+		Crud::setTitle('Characters')
+				 ->setSortProperty('firstName')
+				 ->setDeleteLink('/admin/characterdelete/')
+				 ->setDeleteProperty('id')
+				 ->setPaginationFlag(true)
+				 ->setResources($characters);
+
+		// Add the display columns
+		Crud::addDisplayField('name', '/characters/view/', 'id')
+				 ->addDisplayField('actor_name');
+
+		// Add the form fields
+		Crud::addFormField('name', 'text')
+				 ->addFormField('keyName', 'text')
+				 ->addFormField('actor_id', 'select', Actor::orderByNameAsc()->get()->toSelectArray('Select an actor'));
+
+		// Set the view data
+		Crud::make();
+	}
+
+	public function postCharacters()
+	{
+		$this->skipView();
+
+		// Set the input data
+		$input = e_array(Input::all());
+
+		if ($input != null) {
+			// Get the object
+			$character           = (isset($input['id']) && strlen($input['id']) == 10 ? Character::find($input['id']) : new Character);
+			$character->name     = $input['name'];
+			$character->keyName  = $input['keyName'];
+			$character->actor_id = $input['actor_id'] != '0' ? $input['actor_id'] : null;
+
+			// Attempt to save the object
+			$this->save($character);
+
+			// Handle errors
+			if ($this->errorCount() > 0) {
+				Ajax::addErrors($this->getErrors());
+			} else {
+				Ajax::setStatus('success')->addData('resource', $character->toArray());
+			}
+
+			// Send the response
+			return Ajax::sendResponse();
+		}
+	}
+
+	public function getCharacterdelete($characterId)
+	{
+		$this->skipView();
+
+		Character::find($characterId)->delete();
+
+		return Redirect::to('/admin#characters');
+	}
+
 	public function getTeamactors()
 	{
 		$teams        = Team::orderByNameAsc()->paginate(10);
@@ -395,6 +460,79 @@ public function postTeamactors()
 		}
 	}
 
+	public function getActortypes()
+	{
+		$actors       = Actor::orderByNameAsc()->paginate(10);
+		$types        = Type::orderByNameAsc()->get();
+		$typesArray   = $this->arrayToSelect($types, 'id', 'name', 'None');
+		$actorsArray  = $this->arrayToSelect($actors, 'id', 'fullName', 'Select an actor');
+
+		// Set up the one page crud
+		Crud::setTitle('Actor Types')
+				 ->setSortProperty('fullName')
+				 ->setPaginationFlag(true)
+				 ->setDeleteFlag(false)
+				 ->setMulti($actors, 'types')
+				 ->setMultiColumns(array('Actors', 'Types'))
+				 ->setMultiDetails(array('name' => 'fullName', 'field' => 'actor_id'))
+				 ->setMultiPropertyDetails(array('name' => 'name', 'field' => 'type_id'));
+
+		// Add the form fields
+		Crud::addFormField('actor_id', 'select', $actorsArray)
+				 ->addFormField('type_id', 'multiselect', $typesArray);
+
+		Crud::make();
+	}
+
+	public function postActortypes()
+	{
+		$this->skipView();
+
+		// Set the input data
+		$input = e_array(Input::all());
+
+		if ($input != null) {
+			// Remove all existing roles
+			$actorTypes = Actor_Type::where('actor_id', $input['actor_id'])->get();
+
+			if ($actorTypes->count() > 0) {
+				foreach ($actorTypes as $actorType) {
+					$actorType->delete();
+				}
+			}
+
+			// Add any new roles
+			if (count($input['type_id']) > 0) {
+				foreach ($input['type_id'] as $type_id) {
+					if ($type_id == '0') continue;
+
+					$actorType            = new Actor_Type;
+					$actorType->actor_id   = $input['actor_id'];
+					$actorType->type_id  = $type_id;
+
+					$this->save($actorType);
+				}
+			}
+
+			// Handle errors
+			if ($this->errorCount() > 0) {
+				Ajax::addErrors($this->getErrors());
+			} else {
+				$actor = Actor::find($input['actor_id']);
+
+				$main = $actor->toArray();
+				$main['multi'] = $actor->types->id->toJson();
+
+				Ajax::setStatus('success')
+									->addData('resource', $actor->types->toArray())
+									->addData('main', $main);
+			}
+
+			// Send the response
+			return Ajax::sendResponse();
+		}
+	}
+
 	public function getTypes()
 	{
 		$types = Type::orderByNameAsc()->get();