karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change reference to session-field 'id' to 'user_id'

Browse Source
This commit is contained in:
Karsten Heiken
2011-04-22 01:51:36 +02:00
parent 18d502ac46
commit f01bf8759b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/jobs.php
View File

@@ -4,7 +4,7 @@ class Jobs extends CI_Controller {
public function getOwn() { public function getOwn() {
$query = $this->db->order_by('progress', 'desc') $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(); $count = $query->num_rows();
$jobs = $query->result_array(); $jobs = $query->result_array();
@@ -39,7 +39,7 @@ class Jobs extends CI_Controller {
public function listResultsNotSeen() { public function listResultsNotSeen() {
$query = $this->db->order_by('started_at', 'asc') $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(); $count = $query->num_rows();
$jobs = $query->result_array(); $jobs = $query->result_array();

8
application/models/project.php
View File

@@ -14,7 +14,7 @@ class Project extends CI_Model {
* @return array The user's projects. * @return array The user's projects.
*/ */
public function getOwn() { 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') ->order_by('lastaccess', 'desc')
->get('projects'); ->get('projects');
$projects = $query->result_array(); $projects = $query->result_array();
@@ -38,7 +38,7 @@ class Project extends CI_Model {
* @return array The shared projects. * @return array The shared projects.
*/ */
public function getShared() { 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'); $this->db->join('projects', 'projects.id = shares.project_id');
$query = $this->db->get(); $query = $this->db->get();
@@ -119,14 +119,14 @@ class Project extends CI_Model {
$public_results = $query->result_array(); $public_results = $query->result_array();
// or belong directly to the user // 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.'%')); ." AND `name` LIKE ".$this->db->escape('%'.$needle.'%'));
$own_results = $query->result_array(); $own_results = $query->result_array();
// get matching projects that are shared to the user // get matching projects that are shared to the user
$this->db->select('*')->from('shares') $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); ->like('name', $needle);
$this->db->join('projects', 'projects.id = shares.project_id'); $this->db->join('projects', 'projects.id = shares.project_id');
$query = $this->db->get(); $query = $this->db->get();