Merge branch '47-security'

.gitignore

@@ -1,5 +1,6 @@
 application/config/database.php
 application/logs/*.php
+application/controllers/test.php
 .DS_Store
 .buildpath
 .project

application/config/config.php

@@ -319,7 +319,7 @@
 | by the output class.  Do not 'echo' any values with compression enabled.
 |
 */
-$config['compress_output'] = TRUE;
+$config['compress_output'] = false;
 
 /*
 |--------------------------------------------------------------------------

application/config/migration.php

@@ -4,11 +4,11 @@
 | Enable/Disable Migrations
 |--------------------------------------------------------------------------
 |
-| Migrations are disabled by default but should be enabled 
+| Migrations are disabled by default but should be enabled
 | whenever you intend to do a schema migration.
 |
 */
-$config['migration_enabled'] = TRUE;
+$config['migration_enabled'] = true;
 
 
 /*
@@ -21,7 +21,7 @@
 | be upgraded / downgraded to.
 |
 */
-$config['migration_version'] = 2;
+$config['migration_version'] = 3;
 
 
 /*

application/controllers/groups.php

@@ -323,8 +323,7 @@ public function members() {
 
 			$data['group']['member_count'] = $this->Groups_model->get_group_members_count($group[0]['id']);
 			$data['group']['members'] = $this->Groups_model->get_group_members($group[0]['id']);
-
-			$invites = $this->db->query("SELECT * FROM groups_invites WHERE groupid = '".$group[0]['id']."' AND status = ''");
+			$invites = $this->db->query("SELECT * FROM groups_invites WHERE groupid = '".$group[0]['id']."' AND status IS NULL");
 			if ($invites->num_rows() > 0) {
 				$data['group']['invites'] = $invites->result_array();
 			}
@@ -338,7 +337,6 @@ public function members() {
 		if ($data['group']['owner'] != $this->session->userdata('userid')) {
 			show_404($this->uri->uri_string());
 		}
-
 		$this->load->view('groups_members',$data);
 	}
 

application/controllers/install.php

@@ -1,20 +1,20 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Install extends CI_Controller {
-  
+
   public function __construct() {
     parent::__construct();
-    
+
     $this->load->helper(array('url','form'));
     $this->load->library('session');
 
     $this->load->database(); // Load Database for all methods
-    
+
   }
 
   public function index()
   {
-  	
+
     // Step one: See if there is a database
   	$data['install_complete'] = $this->database_install();
 
@@ -24,11 +24,11 @@ public function index()
 
   public function database_install()
   {
-    
+
     // See if there is a users table
     // Also, be sure there _are_ users.
     if ( !$this->db->table_exists('users') ) { // No user table
-        
+
         // There is no users table, run migrations to make
         // sure that database is up-to-date.
         $this->load->library('migration');
@@ -38,9 +38,9 @@ public function database_install()
           show_error($this->migration->error_string());
           exit;
         }
-        
+
     }
-    
+
     // Make sure there is at least one user
     $this->db->from('users');
     $number_of_users = $this->db->count_all_results();
@@ -49,13 +49,13 @@ public function database_install()
         return true;
     } else {
         return false;
-    } 
-    
+    }
+
     return false;
   }
 
   // Used to update from one version to another.
-  public function upgrade() 
+  public function upgrade()
   {
     // There is no users table, run migrations to make
         // sure that database is up-to-date.