From 206cd90b8a1b042517b0c8086dee8290e4a3f431 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@infinity.(none)>
Date: Thu, 5 Nov 2009 12:40:24 +1100
Subject: [PATCH] Tidied up code base for work on the new Mac. Going to remote
 ProductCategories since they seem useless and I have forgotten why I made
 them.

---
 .gitignore                                |  2 +-
 config/core.php                           | 10 +++++-----
 controllers/quote_products_controller.php |  4 ++--
 tmp/.gitignore                            |  1 -
 views/quotes/pdf.ctp                      |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100755 tmp/.gitignore

diff --git a/.gitignore b/.gitignore
index bfb2a49c..982831fd 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ tmp/cache/persistent/*
 tmp/cache/views/*
 tmp/sessions/*
 tmp/tests/*
+tmp/*
 *.tar.gz
 *.swp
 *.swo
-vapourama/*
diff --git a/config/core.php b/config/core.php
index d5d83b55..f9e41500 100755
--- a/config/core.php
+++ b/config/core.php
@@ -179,7 +179,7 @@
  *
 * File storage engine.
 */
- Cache::config('default', array(
+ /*Cache::config('default', array(
 		'engine' => 'File', //[required]
 		'duration'=> 3600, //[optional]
 		'probability'=> 100, //[optional]
@@ -188,7 +188,7 @@
  		'lock' => false, //[optional]  use file locking
  		'serialize' => true,
 	));
-
+*/
     
  /*
   * 
@@ -198,13 +198,13 @@
  */
  //APC (http://pecl.php.net/package/APC)
  
-  	/* Cache::config('default', array(
+  	 Cache::config('default', array(
  		'engine' => 'Apc', //[required]
  		'duration'=> 3600, //[optional]
  		'probability'=> 100, //[optional]
   		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
- 	)); */
- /*ß
+ 	)); 
+ /*
   *
   *
  // Xcache (http://xcache.lighttpd.net/)
diff --git a/controllers/quote_products_controller.php b/controllers/quote_products_controller.php
index b3068c8f..92571b12 100755
--- a/controllers/quote_products_controller.php
+++ b/controllers/quote_products_controller.php
@@ -45,9 +45,9 @@ class QuoteProductsController extends AppController {
 
 		
 		$principles = $this->QuoteProduct->Product->Principle->find('list');
-		$currencies = $this->QuoteProduct->Currency->find('list');
+		
 		$quote = $this->QuoteProduct->Quote->read(null, $quoteid);
-		$this->set(compact('principles', 'currencies', 'quote', 'products'));
+		$this->set(compact('principles','quote', 'products'));
                 
 	}
 
diff --git a/tmp/.gitignore b/tmp/.gitignore
deleted file mode 100755
index 8b137891..00000000
--- a/tmp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/views/quotes/pdf.ctp b/views/quotes/pdf.ctp
index 3e7d6463..8c7e63b9 100755
--- a/views/quotes/pdf.ctp
+++ b/views/quotes/pdf.ctp
@@ -93,7 +93,7 @@ $tcpdf->AliasNbPages();
 $tcpdf->lastPage();
 
 
-$output_dir = '/var/www/cake/app/webroot/pdf/';
+$output_dir = '/Users/karlcordes/Sites/quotenik/app/webroot/pdf/';
 
 if($quote['Quote']['revision'] > 0) {
     $filename = $enquiry['Enquiry']['title'].'rev'.$quote['Quote']['revision'].'.pdf';