From f01bf8759bbddbd672a54f46f204168d64b41d02 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Fri, 22 Apr 2011 01:51:36 +0200
Subject: [PATCH] Change reference to session-field 'id' to 'user_id'

---
 application/controllers/jobs.php | 4 ++--
 application/models/project.php   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/jobs.php b/application/controllers/jobs.php
index 03dad37..f488e03 100644
--- a/application/controllers/jobs.php
+++ b/application/controllers/jobs.php
@@ -4,7 +4,7 @@ class Jobs extends CI_Controller {
 	
 	public function getOwn() {
 		$query = $this->db->order_by('progress', 'desc')
-			->get_where('jobs', array('started_by' => $this->session->user_data('id')));
+			->get_where('jobs', array('started_by' => $this->session->user_data('user_id')));
 		$count = $query->num_rows();
 		$jobs = $query->result_array();
 		
@@ -39,7 +39,7 @@ class Jobs extends CI_Controller {
 	
 	public function listResultsNotSeen() {
 		$query = $this->db->order_by('started_at', 'asc')
-			->get_where('jobs', array('started_by' => $this->session->user_data('id'), 'seen' => '0'));
+			->get_where('jobs', array('started_by' => $this->session->user_data('user_id'), 'seen' => '0'));
 		$count = $query->num_rows();
 		$jobs = $query->result_array();
 		
diff --git a/application/models/project.php b/application/models/project.php
index 9c1a817..fb267e5 100644
--- a/application/models/project.php
+++ b/application/models/project.php
@@ -14,7 +14,7 @@ class Project extends CI_Model {
 	 * @return array The user's projects.
 	 */
 	public function getOwn() {
-		$query = $this->db->where(array('owner' => $this->session->user_data('id')))
+		$query = $this->db->where(array('owner' => $this->session->user_data('user_id')))
 				->order_by('lastaccess', 'desc')
 				->get('projects');
 		$projects = $query->result_array();
@@ -38,7 +38,7 @@ class Project extends CI_Model {
 	 * @return array The shared projects.
 	 */
 	public function getShared() {
-		$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->user_data('id')));
+		$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->user_data('user_id')));
 		$this->db->join('projects', 'projects.id = shares.project_id');
 		$query = $this->db->get();
 
@@ -119,14 +119,14 @@ class Project extends CI_Model {
 		$public_results = $query->result_array();
 
 		// or belong directly to the user
-		$query = $this->db->query("SELECT * FROM `projects` WHERE `owner`=".$this->db->escape($this->session->userdata('id'))
+		$query = $this->db->query("SELECT * FROM `projects` WHERE `owner`=".$this->db->escape($this->session->userdata('user_id'))
 				." AND `name` LIKE ".$this->db->escape('%'.$needle.'%'));
 		$own_results = $query->result_array();
 
 
 		// get matching projects that are shared to the user
 		$this->db->select('*')->from('shares')
-				->where(array('user_id' => $this->session->userdata('id')))
+				->where(array('user_id' => $this->session->userdata('user_id')))
 				->like('name', $needle);
 		$this->db->join('projects', 'projects.id = shares.project_id');
 		$query = $this->db->get();