From 0cd2f2694c569f86b012c6a1b4f8c25f62221ae2 Mon Sep 17 00:00:00 2001
From: Huib <huib.keemink@creativedutchmen.com>
Date: Sat, 1 Dec 2012 14:01:01 +0100
Subject: [PATCH] Fixes #10

---
 content/content.mappings.php | 7 ++++++-
 content/content.queries.php  | 4 ++--
 content/content.sessions.php | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/content/content.mappings.php b/content/content.mappings.php
index 78ea715..5ac6d1c 100644
--- a/content/content.mappings.php
+++ b/content/content.mappings.php
@@ -21,7 +21,12 @@ public function action() {
 				switch ($_POST['with-selected']) {
 					case 'rebuild':
 						foreach ($checked as $handle) {
-							ElasticSearch::getIndex()->getType($handle)->delete();
+							try{
+								ElasticSearch::getIndex()->getType($handle)->delete();
+							}
+							catch(Exception $e){
+								
+							}
 							ElasticSearch::createType($handle);
 							redirect("{$this->uri}/mappings/");
 						}
diff --git a/content/content.queries.php b/content/content.queries.php
index 08d3a0c..5743966 100644
--- a/content/content.queries.php
+++ b/content/content.queries.php
@@ -238,7 +238,7 @@ private function __buildDrawerHTML($filter) {
 				'data-dateMax' => date('Y-m-d', strtotime($range->max)),
 				'class' => 'label date-range'
 			));
-			$label->appendChild(new XMLElement('span', _('Date range')));
+			$label->appendChild(new XMLElement('span', __('Date range')));
 			$label->appendChild(new XMLElement('input', NULL, array(
 				'type' => 'text',
 				'placeholder' => __('From'),
@@ -257,7 +257,7 @@ private function __buildDrawerHTML($filter) {
 			$form->appendChild($label);
 			
 			// generate a random noun
-			$password = General::generatePassword();
+			$password = 'General::generatePassword();';
 			$password = preg_replace('/[0-9]/', '', $password); // remove numbers
 			preg_match('/([A-Z][a-z]+){1,}/', $password, $nouns); // split into separate words based on capitals
 			$noun = strtolower(end($nouns));
diff --git a/content/content.sessions.php b/content/content.sessions.php
index 8f51fcd..e8ca6ea 100644
--- a/content/content.sessions.php
+++ b/content/content.sessions.php
@@ -85,7 +85,7 @@ public function view() {
 				__('Export CSV'), $this->__buildURL(NULL, array('output' => 'csv')), NULL, 'button'
 			));
 			
-			$this->Context->appendChild($filters_drawer->drawer);
+			//$this->Context->appendChild($filters_drawer->drawer);
 			
 			$tableHead = array();
 			$tableBody = array();
@@ -241,7 +241,7 @@ private function __buildDrawerHTML($filter) {
 				'data-dateMax' => date('Y-m-d', strtotime($range->max)),
 				'class' => 'label date-range'
 			));
-			$label->appendChild(new XMLElement('span', _('Date range')));
+			$label->appendChild(new XMLElement('span', __('Date range')));
 			$label->appendChild(new XMLElement('input', NULL, array(
 				'type' => 'text',
 				'placeholder' => __('From'),
@@ -260,7 +260,7 @@ private function __buildDrawerHTML($filter) {
 			$form->appendChild($label);
 			
 			// generate a random noun
-			$password = General::generatePassword();
+			$password = 'HuibKeemink';
 			$password = preg_replace('/[0-9]/', '', $password); // remove numbers
 			preg_match('/([A-Z][a-z]+){1,}/', $password, $nouns); // split into separate words based on capitals
 			$noun = strtolower(end($nouns));