From 9e191ab0be69f296ae3cd2f079aafa80210f6928 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 3 Oct 2013 16:51:13 +1000
Subject: [PATCH] Added Object(), fixed some ajax handling

---
 classes/Object.php                           | 32 ++++++++++++++++++++
 classes/lnApp/Controller/TemplateDefault.php |  3 +-
 config/pagination.php                        |  1 -
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 classes/Object.php

diff --git a/classes/Object.php b/classes/Object.php
new file mode 100644
index 0000000..ac5feb2
--- /dev/null
+++ b/classes/Object.php
@@ -0,0 +1,32 @@
+<?php defined('SYSPATH') or die('No direct access allowed.');
+
+/**
+ * This is class is for manupulating objects in general
+ *
+ * @package    lnApp
+ * @category   Helpers
+ * @author     Deon George
+ * @copyright  (c) 2009-2013 Open Source Billing
+ * @license    http://dev.osbill.net/license.html
+ */
+class Object {
+	/**
+	 * Provide an in_array capability for an array of Objects
+	 *
+	 * @param string Object Key that we are evaluating
+	 * @param string Value for that Key
+	 * @param array The array of objects
+	 * @return boolean
+	 */
+	public static function in_array($key,$value,array $objects) {
+		if (! count($objects))
+			return FALSE;
+
+		foreach ($objects as $object)
+			if (isset($object->$key) AND $object->$key == $value)
+				return TRUE;
+
+		return FALSE;
+	}
+}
+?>
diff --git a/classes/lnApp/Controller/TemplateDefault.php b/classes/lnApp/Controller/TemplateDefault.php
index e5ea60f..28a6b2a 100644
--- a/classes/lnApp/Controller/TemplateDefault.php
+++ b/classes/lnApp/Controller/TemplateDefault.php
@@ -97,8 +97,9 @@ abstract class lnApp_Controller_TemplateDefault extends Kohana_Controller_Templa
 			return;
 
 		// For AJAX calls, we dont need to render the complete page.
-		if ($this->request->is_ajax()) {
+		if ($this->request->is_ajax() OR (Kohana::$config->load('debug')->ajax AND preg_match('/^ajax/',Request::current()->action()))) {
 			$this->auto_render = FALSE;
+
 			return;
 		}
 
diff --git a/config/pagination.php b/config/pagination.php
index f40ca48..598faf1 100644
--- a/config/pagination.php
+++ b/config/pagination.php
@@ -4,7 +4,6 @@
  * OSB Configuration - Pagination Driver
  *
  * @package    OSB
- * @subpackage Pagination
  * @category   Configuration
  * @author     Deon George
  * @copyright  (c) 2010 Open Source Billing